# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1278416213 -10800
# Node ID 923ff622b8b906f5a5c85b7db0e2ea80376ccb6e
# Parent  c3690ec91ef8e4cf9aab213f338ed746d633e37a
Revision: 201025
Kit: 2010127

diff -r c3690ec91ef8 -r 923ff622b8b9 config.tests/all/openvg/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.tests/all/openvg/main.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the Config module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include <QtCore/qglobal.h>
+#include <QApplication>
+#include <QPixmap>
+
+#if defined(QT_LOWER_CASE_VG_INCLUDES)
+#include <vg/openvg.h>
+#else
+#include <VG/openvg.h>
+#endif
+
+Q_DECL_IMPORT VGImage qPixmapToVGImage(const QPixmap &pixmap); // see qpixmapdata_vg.cpp in qt/src/openvg
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    VGPaint paint = vgCreatePaint();
+    Q_UNUSED(paint);
+    QPixmap pm(100, 200);
+    VGImage img = qPixmapToVGImage(pm);
+    Q_UNUSED(img);
+    return 0;
+}
diff -r c3690ec91ef8 -r 923ff622b8b9 config.tests/all/openvg/openvg.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.tests/all/openvg/openvg.pro	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,45 @@
+#
+#############################################################################
+##
+## Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (developer.feedback@nokia.com)
+##
+## This file is part of the UI Extensions for Mobile.
+##
+## GNU Lesser General Public License Usage
+## This file may be used under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation and
+## appearing in the file LICENSE.LGPL included in the packaging of this file.
+## Please review the following information to ensure the GNU Lesser General
+## Public License version 2.1 requirements will be met:
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain additional
+## rights.  These rights are described in the Nokia Qt LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at developer.feedback@nokia.com.
+##
+#############################################################################
+#
+
+TEMPLATE = app
+TARGET = hbconftest_openvg
+DEPENDPATH += .
+INCLUDEPATH += .
+CONFIG += openvg
+
+# Input
+SOURCES += main.cpp
+
+# OpenVG libraries, the same way hbcore uses them
+QT *= openvg
+!isEmpty(QMAKE_LIBS_OPENVG) {
+    LIBS += $$QMAKE_LIBS_OPENVG
+} else {
+    symbian: LIBS += -llibopenvg -llibopenvgu
+    else:win32-msvc*: LIBS += -llibopenvg
+    else: LIBS += -lopenvg
+}
diff -r c3690ec91ef8 -r 923ff622b8b9 configure.py
--- a/configure.py	Wed Jun 23 18:33:25 2010 +0300
+++ b/configure.py	Tue Jul 06 14:36:53 2010 +0300
@@ -257,6 +257,7 @@
                          help="Specify the host qmake tool.")
         group.add_option("--host-make-bin", dest="hostmakebin", metavar="path",
                          help="Specify the host make tool (make, nmake, mingw32-make, gmake...).")
+        self.add_option_group(group)
         self.set_defaults(hostqmakebin=None)
         self.set_defaults(hostmakebin=None)
 
@@ -299,8 +300,13 @@
                          help="Assumes that MeeGoTouch UI is available without performing a compilation test.")
         group.add_option("--no-meegotouch", action="store_false", dest="meegotouch",
                          help="Assumes that MeeGoTouch UI is not available without performing a compilation test.")
+        group.add_option("--qt-openvg", action="store_true", dest="qtopenvg",
+                         help="Assumes that OpenVG is available without performing a compilation test.")
+        group.add_option("--no-qt-openvg", action="store_false", dest="qtopenvg",
+                         help="Assumes that OpenVG is not available without performing a compilation test.")
         self.add_option_group(group)
         self.set_defaults(qtmobility=None)
+        self.set_defaults(qtopenvg=None)
 
         group = optparse.OptionGroup(self, "Developer options")
         group.add_option("--developer", action="store_true", dest="developer",
@@ -603,11 +609,16 @@
                         code = -1
             else:
                 # on other platforms, check that the resulting executable exists
-                executable = os.path.join(builddir, "hbconftest_" + basename)
                 if os.name == "nt":
-                    executable.append(".exe")
-                if not os.path.exists(executable) or not os.access(executable, os.X_OK):
-                    code = -1
+                    executable = os.path.join(os.path.join(builddir, "debug"), "hbconftest_" + basename + ".exe")
+                    if not os.path.exists(executable) or not os.access(executable, os.X_OK):
+                        executable = os.path.join(os.path.join(builddir, "release"), "hbconftest_" + basename + ".exe")
+                        if not os.path.exists(executable) or not os.access(executable, os.X_OK):
+                            code = -1
+                else:
+                    executable = os.path.join(builddir, "hbconftest_" + basename)
+                    if not os.path.exists(executable) or not os.access(executable, os.X_OK):
+                        code = -1
 
             # clean
             run_process(MAKE.command("clean"))
@@ -709,6 +720,12 @@
     if options.qtmobility:
         config.add_value("DEFINES", "HB_HAVE_QT_MOBILITY")
     print("INFO: Qt Mobility:\t\t\t%s" % options.qtmobility)
+    if options.qtopenvg == None:
+        options.qtopenvg = test.compile("config.tests/all/openvg")
+    if options.qtopenvg:
+        config.add_value("DEFINES", "HB_EFFECTS_OPENVG")
+        config.add_value("DEFINES", "HB_FILTER_EFFECTS")
+    print("INFO: OpenVG:\t\t\t\t%s" % options.qtopenvg)
     if QMAKE.platform() == "symbian":
         sgimagelite_result = test.compile("config.tests/symbian/sgimagelite")
         if sgimagelite_result:
diff -r c3690ec91ef8 -r 923ff622b8b9 hb.prf
--- a/hb.prf	Wed Jun 23 18:33:25 2010 +0300
+++ b/hb.prf	Tue Jul 06 14:36:53 2010 +0300
@@ -30,7 +30,7 @@
 symbian:CONFIG += symbian_i18n skin_icon
 
 include(hb_install.prf)
-#include(docml2bin.prf)
+include(docml2bin.prf)
 
 CONFIG(debug, debug|release) {
     win32:SUFFIX = d
diff -r c3690ec91ef8 -r 923ff622b8b9 hb.pro
--- a/hb.pro	Wed Jun 23 18:33:25 2010 +0300
+++ b/hb.pro	Tue Jul 06 14:36:53 2010 +0300
@@ -55,19 +55,10 @@
 QMAKE_DISTCLEAN += $$hbNativePath($$HB_BUILD_DIR/.qmake.cache)
 QMAKE_DISTCLEAN += $$hbNativePath($$HB_BUILD_DIR/hb_install.prf)
 
-hbvar.path = .
-hbvar.commands += $(QMAKE) -set HB \"hbcore hbwidgets hbutils\"
-QMAKE_EXTRA_TARGETS += hbvar
-INSTALLS += hbvar
 
 symbian {
     exists(rom):include(rom/rom.pri)
-    install.depends += hbvar
     install.depends += cssbinary
-    install.commands += $$QMAKE_COPY $$hbNativePath($$HB_SOURCE_DIR/hb.prf) $$hbNativePath($$[QMAKE_MKSPECS]/features)
-    install.commands += && $$QMAKE_COPY $$hbNativePath($$HB_BUILD_DIR/hb_install.prf) $$hbNativePath($$[QMAKE_MKSPECS]/features)
-    install.commands += && $$QMAKE_COPY $$hbNativePath($$HB_SOURCE_DIR/mkspecs/hb_functions.prf) $$hbNativePath($$[QMAKE_MKSPECS]/features)
-    install.commands += && $$QMAKE_COPY $$hbNativePath($$HB_BUILD_DIR/mkspecs/docml2bin.prf) $$hbNativePath($$[QMAKE_MKSPECS]/features)
     QMAKE_EXTRA_TARGETS += install
 }
 
@@ -81,6 +72,7 @@
 cssbinary.depends = cssbinmaker
 cssbinary.path = $$HB_RESOURCES_DIR/themes
 cssbinary.files = $$cssbinmaker.output
+cssbinary.CONFIG += no_check_exist
 INSTALLS += cssbinary
 
 symbian {
@@ -103,3 +95,4 @@
 
 exists(doc):include(doc/doc.pri)
 include(src/hbcommon.pri)
+#include(src/symbian_installs/symbian_deployment.pri)
diff -r c3690ec91ef8 -r 923ff622b8b9 layers.sysdef.xml
--- a/layers.sysdef.xml	Wed Jun 23 18:33:25 2010 +0300
+++ b/layers.sysdef.xml	Tue Jul 06 14:36:53 2010 +0300
@@ -7,13 +7,16 @@
     <systemModel>
         <layer name="tools_layer">
             <module name="hbconf">
-                <unit unitID="qtdo.hb.hbconf" mrp="" bldFile="&layer_real_source_path;/src/symbian_installs" name="hbconf" />
+                <unit unitID="qtdo.hb.hbconf" mrp="" bldFile="&layer_real_source_path;/src/platforms/symbian/configurations" name="hbconf" />
             </module>
         </layer>
         <layer name="mw_layer">
             <module name="qtdo.hb">
                 <unit name="qtdo.hb" unitID="qtdo.hb" bldFile="&layer_real_source_path;" mrp=""/>
             </module>
+             <module name="qtdo.hb.install">
+                <unit unitID="qtdo.hb.install" mrp="" bldFile="&layer_real_source_path;/src/platforms/symbian/installs" name="hbinstall"/>
+            </module>
         </layer>
         <layer name="app_layer">
             <module name="qtdo.hb.test_resources">
diff -r c3690ec91ef8 -r 923ff622b8b9 mkspecs/docml2bin.prf
--- a/mkspecs/docml2bin.prf	Wed Jun 23 18:33:25 2010 +0300
+++ b/mkspecs/docml2bin.prf	Tue Jul 06 14:36:53 2010 +0300
@@ -10,11 +10,17 @@
 docml2bin.name = DOCML2BIN ${QMAKE_FILE_IN}
 docml2bin.CONFIG = no_link
 
-rcc.depends += compiler_docml2bin_make_all
+for(DOCMLFILE, $$list($$unique(DOCML))) {
+    DOCMLFILE_PWD = $${_PRO_FILE_PWD_}/$${DOCMLFILE}
+    rcc.depends += $${DOCMLFILE_PWD}.bin
 
-## how to add ".bin" for each variable?
-#rcc.depends += for(DOCMLFILE, $$list(DOCML)) { DOCMLFILE }
-#rcc.depends += $${first(DOCML)}.bin
-#rcc.depends += $${last(DOCML)}.bin
+    DOCML2BINEXTENSION = \
+        "START EXTENSION qt/qmake_extra_pre_targetdep.export" \
+        "OPTION PREDEP_TARGET $${DOCMLFILE_PWD}.bin" \
+        "OPTION DEPS $${DOCMLFILE_PWD}" \
+        "OPTION COMMAND $${QMAKE_DOCML2BIN} -s $${DOCMLFILE_PWD} -t $${DOCMLFILE_PWD}.bin" \
+        "END"    
+    BLD_INF_RULES.prj_extensions += DOCML2BINEXTENSION
+}
 
 QMAKE_EXTRA_COMPILERS += docml2bin
diff -r c3690ec91ef8 -r 923ff622b8b9 mkspecs/hb_functions.prf
--- a/mkspecs/hb_functions.prf	Wed Jun 23 18:33:25 2010 +0300
+++ b/mkspecs/hb_functions.prf	Tue Jul 06 14:36:53 2010 +0300
@@ -91,9 +91,7 @@
 # params: -
 # eg. $$hbUnixStyle():CMD=/path/to/cmd else:CMD=\path\to\cmd
 defineTest(hbUnixStyle) {
-    symbian|win32:!win32-g++ {
-        unixstyle = false
-    } else:win32-g++:isEmpty(QMAKE_SH) {
+    contains(QMAKE_HOST.os, Windows):isEmpty(QMAKE_SH) {
         unixstyle = false
     } else {
         unixstyle = true
@@ -104,29 +102,46 @@
 # params: <path>
 # eg. features.path = $$hbNativePath($$[QMAKE_MKSPECS]/features)
 defineReplace(hbNativePath) {
-    hbUnixStyle() {
-        return($$quote(\"$$replace(1, "\\", "/")\"))
+    contains(QMAKE_HOST.os, Windows) {
+        isEmpty(QMAKE_SH) {
+            1 = $$replace(1, \\\\, $$QMAKE_DIR_SEP)
+            1 = $$replace(1, /, $$QMAKE_DIR_SEP)
+        } else {
+            1 = $$replace(1, \\\\, /)
+            1 = $$replace(1, /, /)
+        }
     } else {
-        return($$quote(\"$$replace(1, "/", "\\")\"))
+        1 = $$replace(1, \\\\, $$QMAKE_DIR_SEP)
+        1 = $$replace(1, /, $$QMAKE_DIR_SEP)
     }
+    
+    return($$quote(\"$$1\"))
 }
 
 # params: <tool name>
 # eg. hbfoo.command = $$hbToolCommand(hbfoo)
 defineReplace(hbToolCommand) {
-    # tool in PATH?
-    hbUnixStyle():DEVNULL = /dev/null
-    else:DEVNULL = nul
-    system($$1 > $$DEVNULL 2>&1):return($$1)
+    symbian {
+        # tool in PATH?
+        exists(/dev/null) {
+            DEVNULL = /dev/null
+        } else {
+            DEVNULL = nul
+        }
+        system($$1 > $$DEVNULL 2>&1):return($$1)
 
-    # host build is runnable?
-    hbtoolcmd = $$hbNativePath($$HB_BUILD_DIR/bin/$$1)
-    system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd)
+        # host build is runnable?
+        hbtoolcmd = $$hbNativePath($$HB_BUILD_DIR/bin/$$1)
+        system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd)
 
-    # pre-built tool is runnable?
-    hbtoolcmd = $$hbNativePath($$sprintf("%1%2", $$HB_SOURCE_DIR/bin/$$1, "_symbian.exe"))
-    system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd)
+        # tool in HB_BIN_DIR?
+        hbtoolcmd = $$hbNativePath($$HB_BIN_DIR/$$1)
+        system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd)
 
+        # pre-built tool is runnable?
+        hbtoolcmd = $$hbNativePath($$sprintf("%1%2", $$HB_SOURCE_DIR/bin/$$1, "_symbian.exe"))
+        system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd)
+    }
     # fall back to <builddir>/bin
     return($$hbNativePath($$HB_BUILD_DIR/bin/$$1))
 }
@@ -136,11 +151,17 @@
     file = $$hbNativePath($$1)
     dir = $$hbNativePath($$2)
 
-    chk_dir_exists = $$QMAKE_CHK_DIR_EXISTS $$dir
-    mkdir = $$QMAKE_MKDIR $$dir
-    copy = $$QMAKE_COPY $$file $$dir
+    contains(QMAKE_HOST.os, Windows):isEmpty(QMAKE_SH) {
+        chk_dir_exists = if not exist $$dir
+        mkdir = mkdir $$dir
+        copy = copy /y $$file $$dir
+    } else {
+        chk_dir_exists = test -d $$dir
+        mkdir = mkdir -p $$dir
+        copy = cp $$file $$dir
+    }
 
-    hbUnixStyle():chk_dir_exists_mkdir = $$chk_dir_exists || $$mkdir
+    hbUnixStyle(): chk_dir_exists_mkdir = $$chk_dir_exists || $$mkdir
     else:chk_dir_exists_mkdir = $$chk_dir_exists $$mkdir
 
     return(($$chk_dir_exists_mkdir) && $$copy)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbapps/hbapps.pro
--- a/src/hbapps/hbapps.pro	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbapps/hbapps.pro	Tue Jul 06 14:36:53 2010 +0300
@@ -30,9 +30,5 @@
 SUBDIRS += hbthemechanger
 SUBDIRS += hbfeatureconfigapp
 
-symbian {
-    SUBDIRS += hbiconpreloader
-}
-
 include($${HB_SOURCE_DIR}/src/hbcommon.pri)
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbapps/hbiconpreloader/hbiconpreloader.pro
--- a/src/hbapps/hbiconpreloader/hbiconpreloader.pro	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-SOURCES += main.cpp
-
-symbian {
-    TARGET.CAPABILITY = CAP_APPLICATION
-    TARGET.EPOCALLOWDLLDATA = 1
-    
-    LIBS += -lcone
-    LIBS += -lavkon
-    LIBS += -leikcore
-
-    myrssrules = \
-     "hidden = KAppIsHidden;" \
-     "launch = KAppLaunchInBackground;"
-    
-    RSS_RULES += myrssrules
-}
-
-hbAddLibrary(hbcore/HbCore)
-hbAddLibrary(hbwidgets/HbWidgets)
-hbAddLibrary(hbutils/HbUtils)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbapps/hbiconpreloader/main.cpp
--- a/src/hbapps/hbiconpreloader/main.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbApps module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include <hbapplication.h>
-#include <hbmainwindow.h>
-#include <QMainWindow>
-#include <QDebug>
-
-#ifdef Q_OS_SYMBIAN
-#include <coemain.h>
-#endif
-
-/*
-* This application exists temporarily to preload some time-consuming graphics
-* when theme server is started in order to simulate the real scenario where
-* such graphics get loaded in the boot when first app is shown.
-* It creates more realistic results for the performance tests.
-*/
-int main(int argc, char *argv[])
-{
-    HbApplication app(argc, argv, Hb::NoSplash);
-    // Create a mainwindow so its graphics get cached and next app startup is faster
-    HbMainWindow window;
-    window.show();
-    
-    qDebug() << "HB: HbIconPreloader started";
-    
-    // Render the window in a pixmap painter, it does not get drawn and icons do not get loaded
-    // otherwise because the application runs in background.
-    QImage image(1, 1, QImage::Format_ARGB32);
-    QPainter painter(&image);
-
-    window.render(&painter);
-
-#ifdef Q_OS_SYMBIAN
-    // To avoid crash in app exit
-    CCoeEnv::Static()->DisableExitChecks(true);
-#endif
-
-    QApplication::processEvents(); // to prevent mysterious deadlocks when destroying the mainwindow
-
-    // Exit the application
-    return 0;
-}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbapps/hbthemechanger/hbthemechanger.pro
--- a/src/hbapps/hbthemechanger/hbthemechanger.pro	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbapps/hbthemechanger/hbthemechanger.pro	Tue Jul 06 14:36:53 2010 +0300
@@ -43,12 +43,20 @@
 # Input
 HEADERS += themechangerdefs.h
 HEADERS += themeselectionlist.h
+HEADERS += settingsview.h
+HEADERS += resourceview.h
 SOURCES += themeselectionlist.cpp
 SOURCES += themechangermain.cpp
+SOURCES += settingsview.cpp
+SOURCES += resourceview.cpp
 
 symbian {
     TARGET.CAPABILITY += WriteDeviceData
     SKINICON = qtg_large_personalization
+    
+    myrssrules = \
+    "hidden = KAppIsHidden;"
+    RSS_RULES += myrssrules
 }
 
 # installation
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbapps/hbthemechanger/resourceview.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/resourceview.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,304 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbApps module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include <hbmainwindow.h>
+#include <hbaction.h>
+#include <hbtoolbar.h>
+#include <hbdataform.h>
+#include <hbdataformmodel.h>
+#include <hbdataformmodelitem.h>
+#include <QGraphicsLinearLayout>
+#include <hbthemeutils_p.h>
+#include <hbcombobox.h>
+#include <hbmessagebox.h>
+#include <hbiconitem.h>
+#include <hbthemeutils_p.h>
+#include <QDir>
+#include "resourceview.h"
+#include <hbsearchpanel.h>
+#include <hbtumbleview.h>
+#include <hblabel.h>
+#include <hbcolorscheme.h>
+#include <hbiconanimator.h>
+#include <hbiconanimationmanager.h>
+
+/**
+ * Constructor
+ */
+ResourceView::ResourceView(HbMainWindow *mainWindow, HbView* parent): HbView(parent)
+{
+    mMainWindow = mainWindow;
+    mParentView = parent;
+    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical);
+
+    this->setTitle(tr("Resource lookup"));
+
+    HbAction *act = new HbAction(Hb::BackNaviAction);
+    connect(act, SIGNAL(triggered()), this, SLOT(close()));
+
+    this->setNavigationAction(act);
+
+    act = new HbAction(tr("Icons"));
+        connect(act, SIGNAL(triggered()), this, SLOT(iconModeSelected()));
+        this->toolBar()->addAction(act);
+
+    act = new HbAction(tr("Colors"));
+        connect(act, SIGNAL(triggered()), this, SLOT(colorModeSelected()));
+        this->toolBar()->addAction(act);
+
+    act = new HbAction(tr("Effects"));
+        connect(act, SIGNAL(triggered()), this, SLOT(effectModeSelected()));
+        this->toolBar()->addAction(act);
+
+    act = new HbAction(tr("Animations"));
+        connect(act, SIGNAL(triggered()), this, SLOT(animationModeSelected()));
+        this->toolBar()->addAction(act);
+
+
+    loadThemedIcons();
+    loadThemedColors();
+    loadThemedEffects();
+    loadThemedAnimations();
+    mAnimator = new HbIconAnimator();
+    mResourceItem = new HbLabel(this);
+    mResourceItem->setIcon(HbIcon(mThemedIcons.size()?mThemedIcons[0]:""));
+    mResourceItem->setAlignment(Qt::AlignCenter);
+    mResourceItem->setFontSpec(HbFontSpec(HbFontSpec::Secondary));
+    mResourcesList = new HbTumbleView(mThemedIcons, this);
+
+    layout->addItem(mResourceItem);
+    layout->addItem(mResourcesList);
+
+    mSearchPanel = new HbSearchPanel(this);
+    mSearchPanel->setCancelEnabled(false);
+    mSearchPanel->setPlaceholderText(tr("Search"));
+    layout->addItem(mSearchPanel);
+    this->setLayout(layout);
+
+    connect(mSearchPanel, SIGNAL(criteriaChanged(const QString &)), this, SLOT(criteriaChanged(const QString &)));
+    connect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(iconItemSelected(int)));
+    mMode = iconMode;
+
+    mMainWindow->addView(this);
+}
+
+/**
+ * Destructor
+ */
+ResourceView::~ResourceView()
+{
+    delete mAnimator;
+}
+
+void ResourceView::close()
+{
+    mMainWindow->setCurrentView(mParentView);
+}
+
+void ResourceView::toggleMode(ListMode mode)
+{
+    if (mode == mMode) {
+        return;
+    }
+
+    switch (mMode) {
+    case colorMode:
+        disconnect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(colorItemSelected(int)));
+        break;
+    case iconMode:
+        disconnect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(iconItemSelected(int)));
+        break;
+    case effectMode:
+        mResourcesList->setSelected(0);
+        disconnect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(effectItemSelected(int)));
+        break;
+    case animationMode:
+        mResourcesList->setSelected(0);
+        disconnect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(animationItemSelected(int)));
+        break;
+    default:
+        break;
+    }
+
+    mMode = mode;
+    switch (mode) {
+    case colorMode:
+        connect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(colorItemSelected(int)));
+        mSearchPanel->setCriteria("");
+        mResourcesList->setSelected(0);
+        break;
+    case iconMode:
+        connect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(iconItemSelected(int)));
+        mSearchPanel->setCriteria("");
+        mResourcesList->setSelected(0);
+        break;
+    case effectMode:
+        connect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(effectItemSelected(int)));
+        mSearchPanel->setCriteria("");
+        mResourcesList->setSelected(0);
+        break;
+    case animationMode:
+        connect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(animationItemSelected(int)));
+        mSearchPanel->setCriteria("");
+        mResourcesList->setSelected(0);
+        break;
+    default:
+        break;
+    }
+}
+
+void ResourceView::loadThemedIcons()
+{
+    mThemedIcons.clear();
+    QString basetheme = HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting);
+    QDir scalableIconsDir(basetheme + "/scalable");
+    QDir pixmapIconsDir(basetheme + "/pixmap");
+    QFileInfoList files = scalableIconsDir.entryInfoList(QDir::Files);
+    files += pixmapIconsDir.entryInfoList(QDir::Files);
+    // Strip the file extensions
+    for (int i=0;i<files.count();i++) {
+       mThemedIcons += files[i].baseName();
+    }
+}
+
+void ResourceView::loadThemedEffects()
+{
+    mThemedEffects.clear();
+    QString basetheme = HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting);
+    basetheme = basetheme.replace("/icons/", "/effects/");
+    QDir effectsDir(basetheme);
+    QFileInfoList files = effectsDir.entryInfoList(QDir::Files);
+    // Strip the file extensions
+    for (int i=0;i<files.count();i++) {
+       mThemedEffects += files[i].baseName();
+    }
+}
+
+void ResourceView::loadThemedAnimations()
+{
+    mThemedAnimations.clear();
+    QString basetheme = HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting);
+    basetheme = basetheme.replace("/icons/", "/animations/");
+    QDir animationsDir(basetheme);
+    QFileInfoList files = animationsDir.entryInfoList(QDir::Files);
+    // Add animation definitions and strip the file extensions
+    for (int i=0;i<files.count();i++) {
+       HbIconAnimationManager::global()->addDefinitionFile(files[i].fileName());
+       mThemedAnimations += files[i].baseName();
+    }
+}
+
+void ResourceView::loadThemedColors()
+{
+    mThemedColors.clear();
+    QString basetheme = HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting);
+    basetheme = basetheme.replace("/icons/", "/style/");
+    QFile file(basetheme + "/variables/color/hbcolorgroup.css");
+
+    if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        QTextStream in(&file);
+
+        while(!in.atEnd()) {
+            QString line = in.readLine().trimmed();
+            if (line.startsWith("qtc_")) {
+                // Extract logical name
+                mThemedColors += line.mid(0, line.indexOf(':')).trimmed();
+            }
+        }
+        file.close();
+    }
+}
+
+void ResourceView::iconModeSelected()
+{
+    toggleMode(iconMode);
+}
+
+void ResourceView::colorModeSelected()
+{
+    toggleMode(colorMode);
+}
+
+void ResourceView::effectModeSelected()
+{
+    toggleMode(effectMode);
+}
+
+void ResourceView::animationModeSelected()
+{
+    toggleMode(animationMode);
+}
+
+
+void ResourceView::iconItemSelected(int index)
+{
+    mResourceItem->setIcon(HbIcon(mResourcesList->items()[index]));
+}
+
+void ResourceView::animationItemSelected(int index)
+{
+    mResourceItem->setIcon(HbIcon(mResourcesList->items()[index]));
+    mAnimator->setIcon(mResourceItem->icon());
+    mAnimator->startAnimation();
+}
+
+
+void ResourceView::colorItemSelected(int index)
+{
+    QString rgbValue("#");
+    rgbValue += QString::number(HbColorScheme::color(mResourcesList->items()[index]).red(), 16);
+    rgbValue += QString::number(HbColorScheme::color(mResourcesList->items()[index]).green(), 16);
+    rgbValue += QString::number(HbColorScheme::color(mResourcesList->items()[index]).blue(), 16);
+    mResourceItem->setPlainText(rgbValue.toUpper());
+}
+
+void ResourceView::effectItemSelected(int index)
+{
+    HbEffect::add(mResourceItem,mResourcesList->items()[index],"selected");
+    HbEffect::start(mResourceItem,"selected");
+}
+
+
+void ResourceView::criteriaChanged(const QString &criteria)
+{
+    QStringList filteredItems;
+    switch (mMode) {
+    case iconMode:
+        filteredItems = mThemedIcons.filter(criteria.toLower());
+        break;
+    case colorMode:
+        filteredItems = mThemedColors.filter(criteria.toLower());
+        break;
+    case effectMode:
+        filteredItems = mThemedEffects.filter(criteria.toLower());
+        break;
+    case animationMode:
+        filteredItems = mThemedAnimations.filter(criteria.toLower());
+        break;
+    default:
+        break;
+    }
+    mResourcesList->setItems(filteredItems);
+}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbapps/hbthemechanger/resourceview.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/resourceview.h	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbApps module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+#ifndef RESOURCEVIEW_H
+#define RESOURCEVIEW_H
+
+#include <hbview.h>
+
+class HbMainWindow;
+class HbDataForm;
+class HbDataFormModelItem;
+class HbIconItem;
+class HbTumbleView;
+class HbSearchPanel;
+class HbLabel;
+class HbIconAnimator;
+
+class ResourceView : public HbView
+{
+Q_OBJECT
+public:
+    ResourceView(HbMainWindow *mainWindow, HbView* parent=0);
+    ~ResourceView();
+
+    enum ListMode {
+        iconMode,
+        colorMode,
+        effectMode,
+        animationMode
+    };
+
+public slots:
+    void close();
+    void iconModeSelected();
+    void colorModeSelected();
+    void effectModeSelected();
+    void animationModeSelected();
+    void iconItemSelected(int index);
+    void colorItemSelected(int index);
+    void effectItemSelected(int index);
+    void animationItemSelected(int index);
+    void criteriaChanged(const QString &criteria);
+private:
+    HbMainWindow *mMainWindow;
+    HbView *mParentView;
+
+    QStringList mThemedIcons;
+    QStringList mThemedColors;
+    QStringList mThemedEffects;
+    QStringList mThemedAnimations;
+    HbLabel *mResourceItem;
+    HbTumbleView *mResourcesList;
+    HbSearchPanel *mSearchPanel;
+    HbIconAnimator *mAnimator;
+
+    ListMode mMode;
+    void loadThemedIcons();
+    void loadThemedColors();    
+    void loadThemedEffects();
+    void loadThemedAnimations();
+    void toggleMode(ListMode mode);
+};
+
+
+#endif // RESOURCEVIEW_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbapps/hbthemechanger/settingsview.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/settingsview.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbApps module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include <hbmainwindow.h>
+#include <hbaction.h>
+#include <hbtoolbar.h>
+#include <hbdataform.h>
+#include <hbdataformmodel.h>
+#include <hbdataformmodelitem.h>
+#include <QGraphicsLinearLayout>
+#include <hbthemeutils_p.h>
+#include <hbcombobox.h>
+#include <hbmessagebox.h>
+#include "settingsview.h"
+
+/**
+ * Constructor
+ */
+SettingsView::SettingsView(const QStringList &themes, HbMainWindow *mainWindow, HbView* parent): HbView(parent),
+                                                                                                 mThemes(themes)
+{
+    mMainWindow = mainWindow;
+    mParentView = parent;
+
+    for(int i=0;i<mThemes.count();i++) {
+        mThemeUiNames += QDir(mThemes[i]).dirName();
+    }
+    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical);
+
+    this->setTitle(tr("Settings"));
+
+    mDataForm = new HbDataForm(this);
+    HbDataFormModel *model = new HbDataFormModel(this);
+
+    mBaseThemeSetting = model->appendDataFormItem(HbDataFormModelItem::RadioButtonListItem, tr("Base Theme"));
+    mDefaultThemeSetting = model->appendDataFormItem(HbDataFormModelItem::RadioButtonListItem, tr("Default Theme"));
+    mPriorityThemeSetting = model->appendDataFormItem(HbDataFormModelItem::TextItem, tr("Priority Theme"));
+    mDataForm->setModel(model);
+
+    loadSettings();
+
+    layout->addItem(mDataForm);
+
+    HbAction *act = new HbAction(tr("Save"));
+    connect(act, SIGNAL(triggered()), this, SLOT(saveSettings()));
+    this->toolBar()->addAction(act);
+    act = new HbAction(tr("Cancel"));
+    connect(act, SIGNAL(triggered()), this, SLOT(cancel()));
+    this->toolBar()->addAction(act);
+    act = new HbAction(Hb::BackNaviAction);
+    connect(act, SIGNAL(triggered()), this, SLOT(cancel()));
+    this->setNavigationAction(act);
+
+    this->setLayout(layout);
+
+    mMainWindow->addView(this);
+}
+
+/**
+ * Destructor
+ */
+SettingsView::~SettingsView()
+{
+    delete mDataForm;
+}
+
+void SettingsView::loadSettings()
+{
+    mBaseThemeSetting->setContentWidgetData("items",mThemeUiNames);
+    mBaseThemeSetting->setContentWidgetData("selected", mThemes.indexOf(HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting)));
+    mDefaultThemeSetting->setContentWidgetData("items",mThemeUiNames);
+    mDefaultThemeSetting->setContentWidgetData("selected", mThemes.indexOf(HbThemeUtils::getThemeSetting(HbThemeUtils::DefaultThemeSetting)));
+    mPriorityThemeSetting->setContentWidgetData("text",HbThemeUtils::getThemeSetting(HbThemeUtils::OperatorNameSetting));
+}
+
+void SettingsView::saveSettings()
+{
+    HbThemeUtils::setThemeSetting(HbThemeUtils::BaseThemeSetting, mThemes[mBaseThemeSetting->contentWidgetData("selected").toInt()]);
+    HbThemeUtils::setThemeSetting(HbThemeUtils::DefaultThemeSetting, mThemes[mDefaultThemeSetting->contentWidgetData("selected").toInt()]);
+    HbThemeUtils::setThemeSetting(HbThemeUtils::OperatorNameSetting, mPriorityThemeSetting->contentWidgetData("text").toString());
+    loadSettings();
+#ifdef Q_OS_SYMBIAN
+    HbMessageBox::information(tr("Please reboot the device to apply the changes."));
+#else
+    HbMessageBox::information(tr("Please restart the Hb application to apply the changes."));
+#endif
+    mMainWindow->setCurrentView(mParentView);
+}
+
+void SettingsView::cancel()
+{
+    loadSettings();
+    mMainWindow->setCurrentView(mParentView);
+}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbapps/hbthemechanger/settingsview.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/settingsview.h	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbApps module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+#ifndef SETTINGSVIEW_H
+#define SETTINGSVIEW_H
+
+#include <hbview.h>
+
+class HbMainWindow;
+class HbDataForm;
+class HbDataFormModelItem;
+
+class SettingsView : public HbView
+{
+Q_OBJECT
+public:
+    SettingsView(const QStringList &themes, HbMainWindow *mainWindow, HbView* parent=0);
+    ~SettingsView();
+
+public slots:
+    void saveSettings();
+    void cancel();
+private:
+    const QStringList &mThemes;
+    QStringList mThemeUiNames;
+    HbMainWindow *mMainWindow;
+    HbView *mParentView;
+    HbDataForm *mDataForm;
+    HbDataFormModelItem *mBaseThemeSetting;
+    HbDataFormModelItem *mDefaultThemeSetting;
+    HbDataFormModelItem *mPriorityThemeSetting;
+
+    void loadSettings();
+};
+
+
+#endif // SETTINGSVIEW_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbapps/hbthemechanger/themeselectionlist.cpp
--- a/src/hbapps/hbthemechanger/themeselectionlist.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbapps/hbthemechanger/themeselectionlist.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -43,6 +43,8 @@
 
 #include "themeselectionlist.h"
 #include "themechangerdefs.h"
+#include "settingsview.h"
+#include "resourceview.h"
 
 class PreviewView : public HbView
 {
@@ -121,11 +123,12 @@
  * Constructor
  */
 ThemeSelectionList::ThemeSelectionList(HbMainWindow *mainWindow):
-                        oldItemIndex(-1),
                         themelist(new HbListWidget(this)),
                         rightMark(new HbIcon(QString("qtg_small_tick"))),
                         noMark(new HbIcon(QString(""))),
-                        previewView(0)
+                        previewView(0),
+                        settingsView(0),
+                        resourceView(0)
 {
     mMainWindow = mainWindow;
     connect(themelist, SIGNAL(activated(HbListWidgetItem *)),this, SLOT(setChosen(HbListWidgetItem *)));
@@ -145,10 +148,18 @@
     connect(watcher,SIGNAL(directoryChanged(const QString &)),this,SLOT(updateThemeList(const QString &)));
     QObject::connect(this,SIGNAL(newThemeSelected(QString)),this,SLOT(sendThemeName(QString)));
     grabGesture(Qt::TapAndHoldGesture);
+
+    HbAction *a = this->toolBar()->addAction(HbIcon("qtg_mono_settings"),tr("Settings"));
+    connect(a, SIGNAL(triggered()), this, SLOT(showSettingsView()));
+
+    a = this->toolBar()->addAction(HbIcon("qtg_mono_search"),tr("Resources"));
+    connect(a, SIGNAL(triggered()), this, SLOT(showResourceView()));
+
+    connect(hbInstance->theme(),SIGNAL(changeFinished()), this, SLOT(themeChanged()));
+
 #ifdef THEME_CHANGER_TIMER_LOG
     idleTimer = new QTimer(this);
     connect(idleTimer, SIGNAL(timeout()), this, SLOT(processWhenIdle()));
-    connect(hbInstance->theme(),SIGNAL(changeFinished()), this, SLOT(themeChanged()));
     idleTimer->start(0); // to make a connection to server
 #endif
 }
@@ -159,7 +170,6 @@
 ThemeSelectionList::~ThemeSelectionList()
 {
     // Set the theme to the applied theme before exiting.
-    setChosen(themelist->item(oldItemIndex));
     delete noMark;
     noMark=NULL;
     delete rightMark;
@@ -181,6 +191,7 @@
  */
 void ThemeSelectionList::displayThemes()
 {
+    rootThemes.clear();
     bool entryAdded = false;
     bool themePresent = false;
     foreach(const QString &KThemeRootPath, rootPaths()){
@@ -202,6 +213,14 @@
                     if((hidden == "true") ||( hidden == "")) {
                         iconthemeslist.removeOne(themefolder);
                     }
+#ifdef Q_OS_SYMBIAN
+                    if (KThemeRootPath[0] == 'z') {
+#endif
+                    rootThemes.append(iconThemePath.absolutePath());
+#ifdef Q_OS_SYMBIAN
+                }
+#endif
+
                 }
                 else {
                      iconthemeslist.removeOne(themefolder);
@@ -209,10 +228,11 @@
             
             }
             if(!entryAdded){
+                rootThemes.append(":/themes/icons/hbdefault");
                 //adding one default entry
                 HbListWidgetItem *item = new HbListWidgetItem();
                 item->setText("hbdefault");
-                item->setSecondaryText("hbdefault");
+                item->setSecondaryText(":/themes/icons/hbdefault");
                 QString thumbPath(":/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_thumbnail.svg");                    
                 if (!QFile::exists(thumbPath)) {
                     thumbPath = "qtg_large_corrupted";
@@ -223,8 +243,7 @@
                 if (HbInstance::instance()->theme()->name() == "hbdefault") {
                     item->setSecondaryIcon(*rightMark);
                     themelist->addItem(item);                
-                    oldItemIndex=themelist->count()-1;
-                    themelist->setCurrentRow(oldItemIndex);                    
+                    themelist->setCurrentRow(themelist->count()-1);
                 } else {
                     item->setSecondaryIcon(*noMark);
                     themelist->addItem(item);                
@@ -262,8 +281,7 @@
                 if (QFileInfo(HbThemeServices::themePath()) == QFileInfo(item->secondaryText())) {
                     item->setSecondaryIcon(*rightMark);
                     themelist->addItem(item);
-                    oldItemIndex=themelist->count()-1;
-                    themelist->setCurrentRow(oldItemIndex);
+                    themelist->setCurrentRow(themelist->count()-1);
                 }
                 else {
                     item->setSecondaryIcon(*noMark);
@@ -274,11 +292,11 @@
     }
     //    else{//add a case for no theme ,make hbdefault entry
     if(!themePresent) {
-            QStringList defaultList;
-            defaultList.insert(0,"hbdefault"); //adding one default entry
+            rootThemes.append(":/themes/icons/hbdefault");
+            //adding one default entry
             HbListWidgetItem *item = new HbListWidgetItem();
-            item->setText(defaultList.at(0));
-            item->setSecondaryText(defaultList.at(0));
+            item->setText("hbdefault");
+            item->setSecondaryText(":/themes/icons/hbdefault");
             QString thumbPath(":/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_thumbnail.svg");                    
             if (!QFile::exists(thumbPath)) {
                 thumbPath = "qtg_large_corrupted";
@@ -291,7 +309,7 @@
             QString themeName=HbInstance::instance()->theme()->name();
             if (themeName != "hbdefault")
             {
-                emit newThemeSelected("hbdefault");
+                emit newThemeSelected(":/themes/icons/hbdefault");
             }
         }
 }
@@ -313,27 +331,6 @@
         QThread::currentThread()->setPriority(QThread::HighPriority);
         emit newThemeSelected(item->secondaryText());
     }
-    else
-    {
-        applySelection(); //double tap //put a tick
-    }
-}
-
-
-/**
- * applySelection
- */
-void ThemeSelectionList::applySelection()
-{
-    if(oldItemIndex!=themelist->currentRow()) {
-        HbListWidgetItem *item = themelist->item(themelist->currentRow()); 
-        item->setSecondaryIcon(*rightMark);
-        if(oldItemIndex >= 0) {
-            HbListWidgetItem *olditem = themelist->item(oldItemIndex); 
-            olditem->setSecondaryIcon(*noMark);
-        }
-        oldItemIndex = themelist->currentRow();
-    }
 }
 
 /**
@@ -362,8 +359,8 @@
 {
     QStringList rootDirs;
 #if defined(Q_OS_SYMBIAN)
-    rootDirs << "c:/resource/hb"
-             << "z:/resource/hb"
+    rootDirs << "z:/resource/hb"
+             << "c:/resource/hb"
              << "e:/resource/hb"
              << "f:/resource/hb";
 #else
@@ -387,12 +384,7 @@
         previewView = 0;
     }
     previewItem = listViewItem;
-    QString theme;
-    if (listViewItem->secondaryText() != "hbdefault") {
-        theme = listViewItem->secondaryText();
-    } else {
-        theme = ":/themes/icons/hbdefault";
-    }
+    QString theme = listViewItem->secondaryText();
     previewView = new PreviewView(listViewItem->text(), theme, this);
     mMainWindow->addView(previewView);
 
@@ -400,24 +392,62 @@
     connect(act, SIGNAL(triggered()), this, SLOT(applyTheme()));
     previewView->toolBar()->addAction(act);
     act = new HbAction(tr("Cancel"));
-    connect(act, SIGNAL(triggered()), this, SLOT(cancelTheme()));
+    connect(act, SIGNAL(triggered()), this, SLOT(cancel()));
     previewView->toolBar()->addAction(act);
+    act = new HbAction(Hb::BackNaviAction);
+    connect(act, SIGNAL(triggered()), this, SLOT(cancel()));
+    previewView->setNavigationAction(act);
 
     mMainWindow->setCurrentView(previewView);
 }
 
-void ThemeSelectionList::cancelTheme()
+void ThemeSelectionList::cancel()
 {
-    mMainWindow->removeView(mMainWindow->currentView());
+    mMainWindow->setCurrentView(this);
+    mMainWindow->removeView(previewView);
 }
 
 void ThemeSelectionList::applyTheme()
 {
     if (previewItem) {
         setChosen(previewItem);
-        applySelection();
+    }
+    mMainWindow->setCurrentView(this);
+    mMainWindow->removeView(previewView);
+}
+
+void ThemeSelectionList::showSettingsView()
+{
+    if (!settingsView) {
+        settingsView = new SettingsView(rootThemes, mMainWindow, this);
+    }
+    mMainWindow->setCurrentView(settingsView);
+}
+
+void ThemeSelectionList::showResourceView()
+{
+    if (!resourceView) {
+        resourceView = new ResourceView(mMainWindow, this);
     }
-    mMainWindow->removeView(mMainWindow->currentView());
+    mMainWindow->setCurrentView(resourceView);
+}
+
+
+void ThemeSelectionList::themeChanged()
+{
+    QString currentTheme = HbThemeServices::themePath();
+    for (int i=0;i<themelist->count();i++) {
+        HbListWidgetItem *item = themelist->item(i);
+        if (item->secondaryText() == currentTheme) {
+            item->setSecondaryIcon(*rightMark);
+        } else {
+            item->setSecondaryIcon(*noMark);
+        }
+    }
+
+#ifdef THEME_CHANGER_TIMER_LOG
+    idleTimer->start(0);
+#endif //THEME_CHANGER_TIMER_LOG
 }
 
 #ifdef THEME_CHANGER_TIMER_LOG
@@ -427,9 +457,4 @@
     idleTimer->stop();
     QThread::currentThread()->setPriority(QThread::NormalPriority);    
 }
-
-void ThemeSelectionList::themeChanged()
-{
-    idleTimer->start(0);
-}
 #endif //THEME_CHANGER_TIMER_LOG
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbapps/hbthemechanger/themeselectionlist.h
--- a/src/hbapps/hbthemechanger/themeselectionlist.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbapps/hbthemechanger/themeselectionlist.h	Tue Jul 06 14:36:53 2010 +0300
@@ -50,22 +50,23 @@
     void displayThemes();
     void setChosen(HbListWidgetItem *item);
     void onLongPressed(HbListWidgetItem* listViewItem, const QPointF& coords);
-    void applySelection();
     void updateThemeList(const QString &path);
     void sendThemeName(const QString& name);
-    void cancelTheme();
+    void cancel();
     void applyTheme();
+    void showSettingsView();
+    void showResourceView();
+    void themeChanged();
 #ifdef THEME_CHANGER_TIMER_LOG
     void processWhenIdle();
-    void themeChanged();
 #endif
 
 protected:
     void resizeEvent(QResizeEvent* event);
 private:
     static QStringList rootPaths();
+    QStringList rootThemes;
     QDir dir; 
-    int oldItemIndex;
     HbListWidget *themelist;
     HbIcon* rightMark;
     HbIcon* noMark;
@@ -76,6 +77,8 @@
     HbMainWindow *mMainWindow;
     HbListWidgetItem* previewItem;
     HbView *previewView;
+    HbView *settingsView;
+    HbView *resourceView;
 
     QFileSystemWatcher *watcher;
     QString iCurrentTheme;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/core.pri
--- a/src/hbcore/core/core.pri	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/core.pri	Tue Jul 06 14:36:53 2010 +0300
@@ -69,7 +69,7 @@
 PRIVATE_HEADERS += $$PWD/hbpluginloader_p.h
 PRIVATE_HEADERS += $$PWD/hbpluginloader_p_p.h
 symbian {
-    PRIVATE_HEADERS += $$PWD/hbcorepskeys_p.h
+    RESTRICTED_HEADERS += $$PWD/hbcorepskeys_r.h
     PRIVATE_HEADERS += $$PWD/hbsensornotifyhandler_p.h
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbcorepskeys_p.h
--- a/src/hbcore/core/hbcorepskeys_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HB_COREPSKEYS_P_H
-#define HB_COREPSKEYS_P_H
-
-#ifdef Q_OS_SYMBIAN
-
-#include <e32cmn.h>
-
-/**
- * HbCore orientation PS category UID.
- */
-const TUid KHbPsHardwareCoarseOrientationCategoryUid = {0x20022E82}; // Theme server UID
-
-/**
- * HbCore internal foreground application orientation PS category UID.
- */
-const TUid KHbPsForegroundAppOrientationCategoryUid = {0x20022FC5}; // Device dialog server UID
-
-/**
- * Contains the current orientation value based on the hw sensors and
- * other components.
- *
- * The value is not necessarily based solely on the accelerometer, it
- * may be different than that due to the hw keyboard state, lock
- * switch, etc. In any case this is the suggested orientation for
- * applications and the framework will use this orientation when the
- * automatic orientation management is in use by a Hb application
- * (i.e. by default).
- *
- * The sensors are tracked only while the device is not in sleep
- * mode. This means that the value is not guaranteed to be immediately
- * up-to-date with the current accelerometer orientation after coming
- * out of sleep mode.
- *
- * The value is a Qt::Orientation.
- *
- * Published by theme server. Used by Hb apps themselves (e.g. when
- * showing splash screens) and possibly by wserv.
- */
-const TUint KHbPsHardwareCoarseOrientationKey = 0x4F726965;
-
-/**
- * Current orientation value from the foreground app.
- * Applies only to Hb applications, non-Hb apps are not taken into account.
- *
- * Bits 0-7 contain the Qt::Orientation value.
- * If bit 8 is set then the orientation is a fixed (forced) one.
- * If bit 8 is not set then the orientation is managed automatically by the framework.
- *
- * Published by device dialog server.
- */
-const TUint KHbPsForegroundAppOrientationKey = 0x46676F72;
-
-/**
- * Mask for the bit that indicates HbMainWindow has fixed orientation
- * enabled.
- */
-const TUint KHbFixedOrientationMask = 0x100;
-
-/**
- * Used for masking orientation in PS-key.
- */
-const TUint KHbOrientationMask = 0xFF;
-
-#endif //Q_OS_SYMBIAN
-
-#endif //HB_COREPSKEYS_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbcorepskeys_r.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/core/hbcorepskeys_r.h	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,114 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HB_COREPSKEYS_R_H
+#define HB_COREPSKEYS_R_H
+
+#ifdef Q_OS_SYMBIAN
+
+#include <e32cmn.h>
+
+/**
+ * HbCore orientation PS category UID.
+ */
+const TUid KHbPsHardwareCoarseOrientationCategoryUid = {0x20022E82}; // Theme server UID
+
+/**
+ * HbCore internal foreground application orientation PS category UID.
+ */
+const TUid KHbPsForegroundAppOrientationCategoryUid = {0x20022FC5}; // Device dialog server UID
+
+/**
+ * Contains the current orientation value based on the hw sensors and
+ * other components.
+ *
+ * The value is not necessarily based solely on the accelerometer, it
+ * may be different than that due to the hw keyboard state, lock
+ * switch, etc. In any case this is the suggested orientation for
+ * applications and the framework will use this orientation when the
+ * automatic orientation management is in use by a Hb application
+ * (i.e. by default).
+ *
+ * The sensors are tracked only while the device is not in sleep
+ * mode. This means that the value is not guaranteed to be immediately
+ * up-to-date with the current accelerometer orientation after coming
+ * out of sleep mode.
+ *
+ * The value is a TRenderOrientation.
+ *
+ * Published by theme server. Used by Hb apps themselves (e.g. when
+ * showing splash screens) and possibly by wserv.
+ */
+const TUint KHbPsHardwareCoarseWsOrientationKey = 0x4F726965;
+
+/**
+ * Contains the current orientation value based on the hw sensors and
+ * other components.
+ *
+ * The value is not necessarily based solely on the accelerometer, it
+ * may be different than that due to the hw keyboard state, lock
+ * switch, etc. In any case this is the suggested orientation for
+ * applications and the framework will use this orientation when the
+ * automatic orientation management is in use by a Hb application
+ * (i.e. by default).
+ *
+ * The sensors are tracked only while the device is not in sleep
+ * mode. This means that the value is not guaranteed to be immediately
+ * up-to-date with the current accelerometer orientation after coming
+ * out of sleep mode.
+ *
+ * The value is a Qt::Orientation.
+ *
+ * Published by theme server. Used by Hb apps themselves (e.g. when
+ * showing splash screens) and possibly by wserv.
+ */
+const TUint KHbPsHardwareCoarseQtOrientationKey = 0x4F726966;
+
+/**
+ * Current orientation value from the foreground app.
+ * Applies only to Hb applications, non-Hb apps are not taken into account.
+ *
+ * Bits 0-7 contain the Qt::Orientation value.
+ * If bit 8 is set then the orientation is a fixed (forced) one.
+ * If bit 8 is not set then the orientation is managed automatically by the framework.
+ *
+ * Published by device dialog server.
+ */
+const TUint KHbPsForegroundAppOrientationKey = 0x46676F72;
+
+/**
+ * Mask for the bit that indicates HbMainWindow has fixed orientation
+ * enabled.
+ */
+const TUint KHbFixedOrientationMask = 0x100;
+
+/**
+ * Used for masking orientation in PS-key.
+ */
+const TUint KHbOrientationMask = 0xFF;
+
+#endif //Q_OS_SYMBIAN
+
+#endif //HB_COREPSKEYS_R_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbevent.cpp
--- a/src/hbcore/core/hbevent.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbevent.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -32,6 +32,11 @@
 const int HbEvent::SleepModeEnter = registerEventType();
 const int HbEvent::SleepModeExit = registerEventType();
 const int HbEvent::WindowLayoutDirectionChanged = registerEventType();
+const int HbEvent::InputMethodFocusIn = registerEventType();
+const int HbEvent::InputMethodFocusOut = registerEventType();
+const int HbEvent::WindowObscuredChanged = registerEventType();
+
+
 
 /*!
     @stable
@@ -69,6 +74,20 @@
                            window changes. If your application/component needs to take some
                            action upon this event you can do it in event(QEvent *event) method.
 
+    InputMethodFocusIn - This event is sent by the input framework to an editor when input method
+                         is connected to the given editor.
+                         The event can be caught in event(QEvent *event) method.
+
+    InputMethodFocusOut - This event is sent by the input framework to an editor
+                          when input method is disconnected from the given editor.
+                         The event can be caught in event(QEvent *event) method.
+
+    WindowObscuredChanged - This event is sent by the system when an HbMainWindow is
+                            either obscured from or revealed to the user.  If your
+                            application or component needs to take some action upon this
+                            event you can do it in the event(QEvent *event) method.
+
+
     Example of how to send HbEvent
     \snippet{gui/hbwidget.cpp,1}
 
@@ -124,4 +143,25 @@
     Returns the old device profile.
 */
 
+/*!
+    Constructs a window obscured changed event with a pointer to the HbMainWindow
+    whose obscured state has changed and the obscured state, respectively.
+*/
+HbWindowObscuredChangedEvent::HbWindowObscuredChangedEvent(bool obscuredState)
+    : HbEvent(WindowObscuredChanged), mObscuredState(obscuredState)
+{
+}
 
+/*!
+  \internal
+*/
+HbWindowObscuredChangedEvent::~HbWindowObscuredChangedEvent()
+{
+}
+
+/*!
+    \fn bool HbWindowObscuredChangedEvent::obscuredState() const
+
+    returns the new obscured state for the window.
+*/
+
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbevent.h
--- a/src/hbcore/core/hbevent.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbevent.h	Tue Jul 06 14:36:53 2010 +0300
@@ -46,6 +46,9 @@
     static const int SleepModeEnter;
     static const int SleepModeExit;
     static const int WindowLayoutDirectionChanged;
+    static const int InputMethodFocusIn;
+    static const int InputMethodFocusOut;
+    static const int WindowObscuredChanged;
     HbEvent(int eventType);
 };
 
@@ -66,5 +69,18 @@
     HbDeviceProfile mProfile, mOldProfile;
 };
 
+class HB_CORE_EXPORT HbWindowObscuredChangedEvent: public HbEvent
+{
+public:
+    HbWindowObscuredChangedEvent(bool obscuredState);
+    ~HbWindowObscuredChangedEvent();
+
+    inline bool obscuredState() const {
+        return mObscuredState;
+    }
+protected:
+    bool mObscuredState;
+};
+
 #endif // HB_EVENTS_H
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbglobal.cpp
--- a/src/hbcore/core/hbglobal.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbglobal.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -37,6 +37,32 @@
 */
 
 /*!
+    \macro HB_VERSION
+    \relates <HbGlobal>
+
+    This macro expands a numeric value of the form 0xMMNNPP (MM =
+    major, NN = minor, PP = patch) that specifies Hb's version
+    number. For example, if you compile your application against Hb
+    1.2.3, the HB_VERSION macro will expand to 0x010203.
+
+    You can use HB_VERSION to use the latest Hb features where
+    available.
+
+    \sa hbVersion(), HB_VERSION_STR
+*/
+
+/*!
+    \macro HB_VERSION_STR
+    \relates <HbGlobal>
+
+    This macro expands to a string that specifies Hb's version number
+    (for example, "1.2.3"). This is the version against which the
+    application is compiled.
+
+    \sa hbVersionString(), HB_VERSION
+*/
+
+/*!
     \macro HB_CORE_EXPORT
     \relates <HbGlobal>
 
@@ -60,8 +86,45 @@
 */
 
 /*!
-    Returns the translation text.
-    \sa QCoreApplication::translate
+    \relates <HbGlobal>
+
+    Returns the version number of Hb at run-time (for example, 0x010203).
+    This may be a different version than the version the application was
+    compiled against.
+
+    \sa HB_VERSION, hbVersionString()
+*/
+uint hbVersion()
+{
+    return HB_VERSION;
+}
+
+/*!
+    \relates <HbGlobal>
+
+    Returns the version number of Hb at run-time as a string (for
+    example, "1.2.3"). This may be a different version than the
+    version the application was compiled against.
+
+    \sa HB_VERSION_STR, hbVersion()
+*/
+const char *hbVersionString()
+{
+    return HB_VERSION_STR;
+}
+
+/*!
+    Returns the translation text from QM file.
+    
+    \param id Text ID identifier for translation. Example: txt_common_button_back
+    \param n Defines numeric argument in case of plural strings.
+    Note! As second parameter is only for plural strings in normal cases you shouldn't use it.
+    For non-plural strings use QString::arg() function.
+    Example: QString text = hbTrId("txt_with_value").arg(value);
+    
+    \return Translation if operation was successful, otherwise given \a id.
+
+    \sa QCoreApplication::translate, QString::arg
 */
 QString hbTrId(const char *id, int n)
 {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbglobal.h
--- a/src/hbcore/core/hbglobal.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbglobal.h	Tue Jul 06 14:36:53 2010 +0300
@@ -30,6 +30,11 @@
 
 //#pragma hb_header(HbGlobal)
 
+// HB_VERSION_STR="M.N.P-B" (M=major, N=minor, P=patch, B=build=[dev|tag])
+#define HB_VERSION_STR "0.5.0-dev"
+// HB_VERSION=0xMMNNPP (MM=major, NN=minor, PP=patch)
+#define HB_VERSION 0x000500
+
 #define HB_EXPORT \
     HB_EXPORT_macro_is_obsolete_Please_use_HB_YOURMODULE_EXPORT_instead \
     { &HB_EXPORT_macro_is_obsolete_Please_use_HB_YOURMODULE_EXPORT_instead; }; class
@@ -151,6 +156,8 @@
 
 #endif // HB_TEXT_MEASUREMENT_UTILITY
 
+HB_CORE_EXPORT uint hbVersion();
+HB_CORE_EXPORT const char *hbVersionString();
 HB_CORE_EXPORT QString hbTrId(const char *id, int n = -1);
 
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbgraphicsscene.cpp
--- a/src/hbcore/core/hbgraphicsscene.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbgraphicsscene.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -42,6 +42,7 @@
 #include <QGraphicsView>
 #include <QTime>
 #include <QDebug>
+#include <QMetaMethod>
 
 bool HbGraphicsScenePrivate::fpsCounterEnabled = false; // Fps counter off by default.
 
@@ -76,6 +77,7 @@
       mToolTip(0),
       mInputFocusSet(0),
       mPolishWidgets(false),
+	  mRepolishWidgets(false),
       mDrawCount(0),
       mFPS(0),
       mFPSTime(0),
@@ -191,6 +193,7 @@
     }
 #endif
     setStickyFocus(true);
+    d->mPolishItemsIndex = metaObject()->indexOfSlot("_q_polishItems()");
 }
 
 /*!
@@ -206,6 +209,23 @@
   \reimp
   \sa QGraphicsScene
  */
+QVariant HbGraphicsScene::inputMethodQuery ( Qt::InputMethodQuery query ) const
+{
+    HbInputMethod* inputMethod = HbInputMethod::activeInputMethod();
+    if (inputMethod && inputMethod->focusObject()) {
+        QGraphicsObject *gObject = qobject_cast<QGraphicsObject*>(inputMethod->focusObject()->object());
+        if (gObject){
+            return static_cast<HbGraphicsScenePrivate::GraphicsObject*>(gObject)-> inputMethodQuery(query);
+        }
+    }
+
+    return QGraphicsScene::inputMethodQuery(query);
+}
+
+/*!
+  \reimp
+  \sa QGraphicsScene
+ */
 void HbGraphicsScene::focusInEvent(QFocusEvent *focusEvent)
 {
     QGraphicsScene::focusInEvent(focusEvent);
@@ -226,22 +246,7 @@
  */
 void HbGraphicsScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent)
 {
-    QGraphicsScene::mousePressEvent(mouseEvent);
-
-    // If the focused item is not HbWidget (and not an editor) then we send an event to close the input panel
-    QGraphicsItem *focusedItem = focusItem();
-    if (focusedItem) {
-        QGraphicsObject *focusedObject = focusedItem->toGraphicsObject();
-        if (focusedObject && !focusedObject->inherits("HbWidget") &&
-                ((focusedObject->flags() & QGraphicsItem::ItemAcceptsInputMethod) == 0)) {
-            QInputContext *ic = qApp->inputContext();
-            if (ic) {
-                QEvent *closeEvent = new QEvent(QEvent::CloseSoftwareInputPanel);
-                ic->filterEvent(closeEvent);
-                delete closeEvent;
-            }
-        }
-    }
+    QGraphicsScene::mousePressEvent(mouseEvent);  
 }
 
 /*!
@@ -284,16 +289,36 @@
 void HbGraphicsScene::drawBackground(QPainter *painter, const QRectF &rect)
 {
     Q_D(HbGraphicsScene);
-    if (d->mPolishWidgets) {
+    if (d->mPolishWidgets || d->mRepolishWidgets) {
         // mPolishWidgets is set to true in HbWidget when a widget's scene has
         // changed. We invoke polish slot of qgraphicsscene here so that layout
         // requests resulting from polish can be handled before drawing the
         // widget. This is done more than once because most widgets try to create their
         // primitives in polish event. It will also make sure that we do not
         // have any pending layout requests in event loop.
+        // It also handles the case when widget layout is changing dynamically after it has been polished and
+        //visible on screen.
+        QMetaMethod method = metaObject()->method(d->mPolishItemsIndex);
+        // As we want to handle all the polish events before handling layout requests,
+        // we do this in two seperate loops. We handle all the repolish and polish requests first
+        // and than handle the layout requests.
+        for (int i = 0; i < 2; ++i) {
+            //This is run twice so that we handle all polish and itemChangeNotifications of widget
+            //and if any primitives are created in the polish event.
+
+            //handle any pending repolish requests first.As Widgets could add new child items
+            // in repolish call.
+            if (d->mRepolishWidgets) {
+                d->mRepolishWidgets = false;
+                QApplication::sendPostedEvents(0, QEvent::Polish);
+            }
+            // invoke the slot in graphicsscene.This makes sure we handle the adjustSize()
+            //in itemChange notification sent by qgraphicsscene.These makes sure all layout requests
+            //are handled before paint.
+            method.invoke(this);
+        }
         for (int i = 0; i < 3; ++i) {
-            QMetaObject::invokeMethod(this, "_q_polishItems");
-            QApplication::sendPostedEvents(0, QEvent::LayoutRequest);
+        QApplication::sendPostedEvents(0, QEvent::LayoutRequest);
         }
         d->mPolishWidgets = false;
     }
@@ -349,12 +374,37 @@
 {
     Q_D(HbGraphicsScene);
 
+    if (event->type() == QEvent::InputMethod) {
+        HbInputMethod* inputMethod = HbInputMethod::activeInputMethod();
+        if (inputMethod && inputMethod->focusObject()) {
+            QGraphicsObject *gObject = qobject_cast<QGraphicsObject*>(inputMethod->focusObject()->object());
+            if (gObject){
+                static_cast<HbGraphicsScenePrivate::GraphicsObject*>(gObject)->
+                        inputMethodEvent(static_cast<QInputMethodEvent*>(event));
+                return true;
+            }
+        }
+    } else if (event->type() == QEvent::KeyPress ||
+               event->type() == QEvent::KeyRelease) {
+        HbInputMethod* inputMethod = HbInputMethod::activeInputMethod();
+        if (inputMethod && inputMethod->focusObject()) {
+            QGraphicsObject *gObject = qobject_cast<QGraphicsObject*>(inputMethod->focusObject()->object());
+            if (gObject){
+                bool result = static_cast<HbGraphicsScenePrivate::GraphicsObject*>(gObject)->event(event);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+    }
+
     if (d->mToolTip) {
         d->mToolTip->eventHook(event);
     }
     if (d->mPopupManager) {
         d->mPopupManager->eventHook(event);
     }
+
     bool result = QGraphicsScene::event(event);
 
     if (event->type() == QEvent::KeyPress && !event->isAccepted()) {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbgraphicsscene.h
--- a/src/hbcore/core/hbgraphicsscene.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbgraphicsscene.h	Tue Jul 06 14:36:53 2010 +0300
@@ -42,6 +42,8 @@
     HbGraphicsScene(QObject *parent = 0);
     ~HbGraphicsScene();
 
+    QVariant inputMethodQuery ( Qt::InputMethodQuery query ) const;
+
 protected:
     void focusInEvent(QFocusEvent *focusEvent);
     void focusOutEvent(QFocusEvent *focusEvent);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbgraphicsscene_p.h
--- a/src/hbcore/core/hbgraphicsscene_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbgraphicsscene_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -60,6 +60,8 @@
     HbToolTipLabel *mToolTip;
     bool mInputFocusSet;
     bool mPolishWidgets;
+    bool mRepolishWidgets;
+    int mPolishItemsIndex;
     // fps counter
     static bool fpsCounterEnabled;
     int mDrawCount;
@@ -68,6 +70,14 @@
     qreal mMaxFPS;
 
 private:
+
+    class GraphicsObject: public QGraphicsObject
+    {
+    public:
+        using QGraphicsObject::inputMethodEvent;
+        using QGraphicsObject::inputMethodQuery;
+    };
+
     static HbGraphicsScenePrivate *d_ptr(HbGraphicsScene *scene) {
         Q_ASSERT(scene);
         return scene->d_func();
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbinstance.cpp
--- a/src/hbcore/core/hbinstance.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbinstance.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -108,7 +108,8 @@
     mOrientation(Qt::Vertical),
     mLibraryPaths(0)
 #ifdef Q_OS_SYMBIAN
-    , testabilityEnabled(false)
+    , testabilityEnabled(false),
+    mSts(0)
 #endif //Q_OS_SYMBIAN
     , mLocaleChangeNotifier(0)
 {
@@ -236,6 +237,12 @@
         delete mRepo;
         mRepo = 0;
     }
+    
+    if (mSts) {
+        CSystemToneService::Delete(mSts);
+        mSts=0;
+    }
+
 #endif //Q_OS_SYMBIAN
 
 }
@@ -262,6 +269,25 @@
 /*!
 \internal
 */
+
+/*!
+\internal
+*/
+CSystemToneService* HbInstancePrivate::systemTone()
+{
+	#ifdef Q_OS_SYMBIAN
+	
+	if(mSts == 0) {
+		mSts = CSystemToneService::Create();
+	}
+	return mSts;
+	
+	#else
+		return  0;
+	#endif
+	
+}
+
 bool HbInstancePrivate::removeWindow(HbMainWindow *window)
 {
     bool result = mWindows.removeOne(window);
@@ -406,9 +432,12 @@
  */
 HbInstance *HbInstance::instance()
 {
+#ifndef Q_OS_SYMBIAN
     if (!QCoreApplication::instance()) {
         qWarning("HbInstance: No application instance present.");
     }
+#endif // Q_OS_SYMBIAN
+
     static HbInstance theInstance;
     return &theInstance;
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbinstance_p.h
--- a/src/hbcore/core/hbinstance_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbinstance_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -37,11 +37,14 @@
 
 #ifdef Q_OS_SYMBIAN
 #include <centralrepository.h>
+#include <systemtoneservice.h>
+
 const TUid HBTESTABILITY_CREPO_ID  = {0x2002C3AE};
 const TUint32 HbTestabilityKey  = 0x1;
 #endif
 
 class HbLocaleChangeNotifier;
+class CSystemToneService;
 
 class HbInstancePrivate : public QObject
 {
@@ -54,7 +57,7 @@
     bool removeWindow(HbMainWindow *window);
     void select(const HbDeviceProfile &display);
     HbDeviceProfile profile();
-
+	  CSystemToneService *systemTone();
     void initLibraryPaths();
 
 public slots:
@@ -88,6 +91,7 @@
 #ifdef Q_OS_SYMBIAN
     CRepository *mRepo;
     bool testabilityEnabled;
+	CSystemToneService *mSts;
 #endif //Q_OS_SYMBIAN
 #endif //HB_TESTABILITY
 
@@ -108,6 +112,7 @@
     friend class HbEffectPrivate;
     friend class HbMainWindowOrientation;
     friend class HbWidgetStyleLoader;
+    friend class HbPopupPrivate;
 };
 
 #endif // HBINSTANCE_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbmainwindoworientation.cpp
--- a/src/hbcore/core/hbmainwindoworientation.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbmainwindoworientation.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -84,7 +84,6 @@
 void HbMainWindowOrientation::handleForegroundGained()
 {
     mForeground = true;
-    notifyOrientationChange(false, true);
 }
 
 void HbMainWindowOrientation::handleForegroundLost()
@@ -167,9 +166,7 @@
 
 // Notifies orientation change only if
 // 1) automatic orientation change is enabled
-// 2) application is in foreground
-// 3) application has not set fixed orientation for the main window
-// 4) mainwindow's windowSurface exists
+// 2) application has not set fixed orientation for the main window
 void HbMainWindowOrientation::notifyOrientationChange(bool animate, bool notifyWhenDisabled)
 {
     Qt::Orientation newOrientation = mOrientation;
@@ -178,17 +175,16 @@
         newOrientation = mDefaultOrientation;
     }
     foreach(HbMainWindow * window, mWindowList) {
-        void *surface(0);
-        if (window) {
-            surface = (void *)window->windowSurface();
-        }
         if (!HbMainWindowPrivate::d_ptr(window)->mAutomaticOrientationChangeAnimation) {
             animate = false;
         }
-
-        if ((isEnabled() || notifyWhenDisabled) && (mForeground || surface)
+        if ((isEnabled() || notifyWhenDisabled)
                 && HbMainWindowPrivate::d_ptr(window)->mAutomaticOrientationSwitch) {
-            HbMainWindowPrivate::d_ptr(window)->setTransformedOrientation(newOrientation, animate);
+            if (mForeground){
+                HbMainWindowPrivate::d_ptr(window)->setTransformedOrientation(newOrientation, animate);
+            } else {
+                HbMainWindowPrivate::d_ptr(window)->setTransformedOrientation(newOrientation, false);
+            }
         }
     }
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbmainwindoworientation_p.h
--- a/src/hbcore/core/hbmainwindoworientation_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbmainwindoworientation_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -32,7 +32,6 @@
 
 class HbMainWindow;
 class HbForegroundWatcher;
-class HbSleepModeListener;
 
 class HB_AUTOTEST_EXPORT HbMainWindowOrientation : public QObject,
     public HbSensorListenerObserver
@@ -79,4 +78,3 @@
 };
 
 #endif //HBMAINWINDOWORIENTATION_P_H
-
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbmemoryutils_p.h
--- a/src/hbcore/core/hbmemoryutils_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbmemoryutils_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -127,7 +127,7 @@
     static T * getAddress(HbMemoryManager::MemoryType type, int offset)
     {
         // Do not change the condition to (<0), valid address can be negative.
-        if (offset == -1 || offset == -2) {
+        if (offset == -1) {
             return 0;
         }
         GET_MEMORY_MANAGER(type)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbnamespace.cpp
--- a/src/hbcore/core/hbnamespace.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbnamespace.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -161,11 +161,18 @@
     Indicates whether widget and its children (classes derived from HbWidgetBase) are inside popup.
 */
 
-/*! \var Hb::WidgetAttribute Hb::InputMethodNeutral
+/*! \deprecated
+
+    \var Hb::WidgetAttribute Hb::InputMethodNeutral
     Indicates that the widget does not want to change the state of the input method.
     In practice this means that virtual keyboard is not closed if focus is changed from editor to this widget.
 */
 
+/*!  \var Hb::WidgetAttribute Hb::Widget
+
+    Indicates that a HbWidgetBase derived item is Hb widget. Constructors of HbWidget set this flag on.
+*/
+
 /*!
    \enum ListContentType
        LibHb's predefined (list) item content types.
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbnamespace.h
--- a/src/hbcore/core/hbnamespace.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbnamespace.h	Tue Jul 06 14:36:53 2010 +0300
@@ -187,7 +187,8 @@
     enum WidgetAttribute {
         InteractionDisabled   = 0x00000001,
         InsidePopup = 0x00000002,
-        InputMethodNeutral = 0x00000004
+        InputMethodNeutral = 0x00000004,
+        Widget = 0x00000008
     };
 
     Q_DECLARE_FLAGS(WidgetAttributes, WidgetAttribute)
@@ -323,7 +324,8 @@
         ModifierSliderElement = 0x2,
         ModifierExpandedItem = 0x4,
         ModifierCollapsedItem = 0x8,
-        ModifierScrolling = 0x10
+        ModifierScrolling = 0x10,
+        ModifierInputFunctionButton = 0x20
     };
 
     Q_DECLARE_FLAGS(InteractionModifiers, InteractionModifier)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbnamespace_p.h
--- a/src/hbcore/core/hbnamespace_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbnamespace_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -103,8 +103,8 @@
     RootItemZValue,                  /* Z value of the root parent item */
     BackgroundZValue,                /* Z value of the background layer. */
     ContentZValue,                   /* Z value of the content layer. */
+    StatusBarZValue,                 /* Z value of the statusbar. */
     TitleBarZValue,                  /* Z value of the titlebar. */
-    StatusBarZValue,                 /* Z value of the statusbar. */
     ToolBarZValue,                   /* Z value of the toolbar. */
     DockWidgetZValue,                /* Z value of the dockwidget item. */
     TitlePaneZValue,                 /* Z value of the title pane. */
@@ -149,6 +149,27 @@
 static const qreal VKBValueUnit                          = FadingItemZValueUnit / 2;
 static const qreal SelectionControlHandlesValueUnit      = VKBValueUnit / 2;
 
+
+    // Dynamic properties to control gestures:
+
+    // Tap gesture threshold rect can be defined as restricted to default radius.
+    // Used in case the widget is inside scroll area which is scrollable to given direction.
+    // Both take boolean value.
+    static const QLatin1String VerticallyRestricted("verticallyRestricted");
+    static const QLatin1String HorizontallyRestricted("horizontallyRestricted");
+
+    // Widget can give custom threshold for tap gesture as rect or radius.
+    // Default tap radius is added to thresholdRect to ensure succefull taps.
+    // Radius is taken in int and threshold rect is taken in QRect.
+    static const QLatin1String TapRadius("tapRadius");
+    static const QLatin1String ThresholdRect("thresholdRect");
+
+    // set Qt::GestureType to scene to have a gesture to suppress other gestures.
+    // It's used to have the pan gesture to wait for tap gesture to cancel before
+    // it's allowed to start. Used in combination with vertically and horizontally
+    // restricted dynamic properties.
+    static const QLatin1String OverridingGesture("overridingGesture");
+
 }
 
 #endif // HBNAMESPACE_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hborientationstatus.cpp
--- a/src/hbcore/core/hborientationstatus.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hborientationstatus.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -25,7 +25,7 @@
 #include "hborientationstatus_p.h"
 
 #ifdef Q_OS_SYMBIAN
-#include "hbcorepskeys_p.h"
+#include "hbcorepskeys_r.h"
 #include "hbforegroundwatcher_p.h"
 
 // UID for process checking (write orientation value only when in theme server)
@@ -73,7 +73,7 @@
     if (!orientationStatus) {
         int currentOrientation = Qt::Vertical;
         if (RProperty::Get(KHbPsHardwareCoarseOrientationCategoryUid,
-                           KHbPsHardwareCoarseOrientationKey, currentOrientation) == KErrNone) {
+                           KHbPsHardwareCoarseQtOrientationKey, currentOrientation) == KErrNone) {
             orientation = (Qt::Orientation)currentOrientation;
             success = true;
         }
@@ -102,9 +102,9 @@
 #ifdef Q_OS_SYMBIAN
     HbForegroundWatcher::instance()->setSensorListener(mSensorListener);
     // Create orientation property
-    RProperty::Define(KHbPsHardwareCoarseOrientationCategoryUid, KHbPsHardwareCoarseOrientationKey,
+    RProperty::Define(KHbPsHardwareCoarseOrientationCategoryUid, KHbPsHardwareCoarseQtOrientationKey,
                       RProperty::EInt, KRdPolicy, KWrPolicy);
-    mProperty.Attach(KHbPsHardwareCoarseOrientationCategoryUid, KHbPsHardwareCoarseOrientationKey);
+    mProperty.Attach(KHbPsHardwareCoarseOrientationCategoryUid, KHbPsHardwareCoarseQtOrientationKey);
     storeOrientation(defaultOrientation);
 #else
     Q_UNUSED(parent);
@@ -137,4 +137,3 @@
     Q_UNUSED(orientation);
 #endif
 }
-
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbsensorlistener.cpp
--- a/src/hbcore/core/hbsensorlistener.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbsensorlistener.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -70,6 +70,9 @@
         mSensrvChannel->CloseChannel();
         delete mSensrvChannel;
     }
+    if (mNotifyHandler) {
+        delete mNotifyHandler;
+    }
 #endif
 }
 
@@ -101,6 +104,7 @@
         } else {
             qWarning("HbSensorListener::checkCenrepValue: repository->Get fails, error code = %d", err);
         }
+    delete repository;
     }
     if (!mNotifyHandler) {
         TRAPD(err, mNotifyHandler = HbSensorNotifyHandler::NewL(*this));
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbsharedmemorymanager_p.cpp
--- a/src/hbcore/core/hbsharedmemorymanager_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbsharedmemorymanager_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -273,9 +273,9 @@
             mainAllocator->initialize(chunk, chunkHeader->mainAllocatorOffset);
             subAllocator->initialize(chunk, chunkHeader->subAllocatorOffset, mainAllocator);
         } else {
+            memset(chunkHeader, 0, sizeof(HbSharedChunkHeader));
             // Load memory file in the beginning of the chunk first.
             int memoryFileSize = 0;
-            chunkHeader->sharedCacheOffset = 0;
 
 #ifdef Q_OS_SYMBIAN
             if (!binCSSConverterApp) {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbsmartpointer_p.h
--- a/src/hbcore/core/hbsmartpointer_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbsmartpointer_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
-#ifndef SMARTPOINTER_P_H
-#define SMARTPOINTER_P_H
+#ifndef HBSMARTPOINTER_P_H
+#define HBSMARTPOINTER_P_H
 
 #include "hbmemoryutils_p.h"
 
@@ -44,7 +44,7 @@
     smart_ptr( pointer ptr = 0, HbMemoryManager::MemoryType type = HbMemoryManager::InvalidMemory )
     { 
         mType = type;
-        this->setOffset(ptr);
+        setOffset(ptr);
     }
     
     /*
@@ -54,9 +54,9 @@
     smart_ptr( U *ptr, HbMemoryManager::MemoryType type ) 
     {  
         mType = type;
-        pointer p (ptr);
+        pointer p(ptr);
         (void)p;
-        this->setOffset(p);
+        setOffset(p);
     }
 
     /*
@@ -65,7 +65,7 @@
     smart_ptr( const smart_ptr &other )
     { 
         mType = other.mType;
-        this->setOffset( other.get() );
+        setOffset(other.get());
     }
 
     /*
@@ -75,15 +75,14 @@
     template<class T2>
     smart_ptr( const smart_ptr<T2> &other ) 
     {  
-        this->mType = other.memoryType();
-        pointer p( other.get() );
-        (void)p;
-        this->setOffset(p);
+        mType = other.memoryType();
+        pointer p(other.get());
+        setOffset(p);
     }
 
     smart_ptr operator+( difference_type offset )
     {
-        return smart_ptr( get() + offset, this->mType );
+        return smart_ptr(get() + offset, mType);
     }
 
     reference operator*() const
@@ -93,7 +92,7 @@
 
     reference operator[]( difference_type idx ) const
     {
-        return this->get()[idx];
+        return get()[idx];
     }
 
     smart_ptr & operator++( void )
@@ -111,7 +110,7 @@
 
     smart_ptr & operator-- (void) 
     {  
-        this->decOffset(sizeof (T));
+        decOffset(sizeof(T));
         return *this;
     }
 
@@ -124,17 +123,17 @@
 
     bool operator == ( const smart_ptr<T> &other )
     { 
-        return ( get() == other.get() && mType == other.mType );
+        return (get() == other.get() && mType == other.mType);
     }
 
     bool operator != ( const smart_ptr<T> &other )
     { 
-        return ( get() != other.get() && mType == other.mType );
+        return (get() != other.get() && mType == other.mType);
     }
 
     bool operator! () const
     {
-        return this->get() == 0;   
+        return get() == 0;
     }
 
     pointer get() const
@@ -154,12 +153,12 @@
        mOffset = offset;
     }
 
-	// This function is here for being able to modify offset when
-	// cells in shared memory are moved.
-	difference_type *offsetPtr()
-	{
-		return &mOffset;
-	}
+    // This function is here for being able to modify offset when
+    // cells in shared memory are moved.
+    difference_type *offsetPtr()
+    {
+        return &mOffset;
+    }
 
     HbMemoryManager::MemoryType memoryType() const
     {
@@ -168,14 +167,13 @@
 
     pointer operator->() const           
     {
-        return this->get();
+        return get();
     }
 
-    smart_ptr & operator= ( const smart_ptr &other )
+    smart_ptr & operator = ( const smart_ptr &other )
     { 
         mType = other.mType;    
-        pointer p( other.get() );
-        (void)p; 
+        pointer p(other.get());
         this->setOffset(p); 
         return *this;
     }
@@ -184,50 +182,50 @@
 * Assignment From other smart_ptr
 */
     template <class T2>
-    smart_ptr & operator= ( const smart_ptr<T2> & other )
+    smart_ptr & operator = ( const smart_ptr<T2> & other )
     {  
         mType = other.memoryType();
-        pointer p( other.get() );
-        this->setOffset(p);
+        pointer p(other.get());
+        setOffset(p);
         return *this;
     }
 
-    smart_ptr & operator= ( pointer from )
+    smart_ptr & operator = ( pointer from )
     {
-        this->setOffset(from); 
+        setOffset(from);
         return *this;
     }
 
     smart_ptr operator+ ( difference_type offset ) const   
     {  
-        return smart_ptr( this->get() + offset, this->mType );
+        return smart_ptr(get() + offset, mType);
     }
 
     smart_ptr operator- ( difference_type offset ) const   
     {  
-        return smart_ptr( this->get() - offset, this->mType );
+        return smart_ptr(get() - offset, mType);
     }
 
-    smart_ptr &operator+= ( difference_type offset )
+    smart_ptr &operator += ( difference_type offset )
     {  
-        this->incOffset( offset * sizeof (T) );
+        incOffset(offset * sizeof(T));
         return *this; 
     }
 
     smart_ptr &operator-= ( difference_type offset )
     {  
-        this->decOffset( offset * sizeof (T) );
+        decOffset(offset * sizeof(T));
         return *this;
     }
 
     operator void *()
     {
-        return (void*)this->get();
+        return (void*)get();
     }
 
 private:
 
-   typedef smart_ptr<T>           self_t;
+   typedef smart_ptr<T> self_t;
 
    void unspecified_bool_type_func() const {}
    typedef void ( self_t::*unspecified_bool_type )() const;
@@ -301,4 +299,4 @@
 inline int operator- ( const smart_ptr<T> &pt, const smart_ptr<T2> &pt2 )
 {  return pt.get() - pt2.get();   }
 
-#endif // SMARTPOINTER_P_H
+#endif // HBSMARTPOINTER_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbstring_p.cpp
--- a/src/hbcore/core/hbstring_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbstring_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -35,8 +35,14 @@
 #include "hbcssconverterutils_p.h"
 #endif
 
-static const int shared_null_offset = -2;
-static HbStringData *shared_null = 0;
+static int createNullOffset(HbMemoryManager::MemoryType type)
+{
+    GET_MEMORY_MANAGER(type);
+    int nullOffset(manager->alloc(sizeof(HbStringData)));
+    HbStringData* data = HbMemoryUtils::getAddress<HbStringData>(type, nullOffset);
+    new(data) HbStringData();
+    return nullOffset;
+}
 
 HbStringData::HbStringData() :
     mStartOffset(-1),
@@ -56,15 +62,6 @@
 #endif
 }
 
-HbStringData *getStringData(HbMemoryManager::MemoryType type, int offset, bool shared = false)
-{
-    if (offset == shared_null_offset) {
-        return shared_null;
-    } else {
-        return getAddress<HbStringData>(type, offset, shared);
-    }
-}
-
 /*
     Constructs a new HbString with \a MemoryType (SharedMemory/HeapMemory).
 */
@@ -72,26 +69,26 @@
     : mMemoryType(type), mShared(false), mDataOffset(-1)
 {
     if (type == HbMemoryManager::HeapMemory) {
-        // Set offset to point to default NULL instance of HbStringData to
-        // avoid unnecessary heap allocation when constructing HbString instances.
-        mDataOffset = shared_null_offset;
-        if (!shared_null) {
-            shared_null = new HbStringData;
-        }
-        shared_null->mRef.ref();
-        return;
-    }
+        static int heapNullOffset(createNullOffset(HbMemoryManager::HeapMemory));
+        mDataOffset = heapNullOffset;
+        HbStringData* data = HbMemoryUtils::getAddress<HbStringData>(type, mDataOffset);
+        data->mRef.ref();
+    } else if (type == HbMemoryManager::SharedMemory) {
+        static int sharedNullOffset(createNullOffset(HbMemoryManager::SharedMemory));
+        mDataOffset = sharedNullOffset;
+        HbStringData* data = HbMemoryUtils::getAddress<HbStringData>(type, mDataOffset);
+        data->mRef.ref();
+#ifdef HB_BIN_CSS
+        HbCssConverterUtils::registerOffsetHolder(&mDataOffset);
+#endif
+    } else {
+        GET_MEMORY_MANAGER(type)
+        RETURN_IF_READONLY(manager)
 
-    GET_MEMORY_MANAGER(type)
-    RETURN_IF_READONLY(manager)
-
-    mDataOffset = manager->alloc(sizeof(HbStringData));
-    HbStringData* data = HbMemoryUtils::getAddress<HbStringData>(mMemoryType, mDataOffset);
-    new(data) HbStringData();
-
-#ifdef HB_BIN_CSS
-    HbCssConverterUtils::registerOffsetHolder(&mDataOffset);
-#endif
+        mDataOffset = manager->alloc(sizeof(HbStringData));
+        HbStringData* data = HbMemoryUtils::getAddress<HbStringData>(mMemoryType, mDataOffset);
+        new(data) HbStringData();
+    }
 }
 
 /*
@@ -104,17 +101,9 @@
     RETURN_IF_READONLY(manager)
     HbSmartOffset dataOffset(manager->alloc(sizeof(HbStringData)), type);
 
-    int length = str.length();
-    HbStringData* data = getStringData(mMemoryType, dataOffset.get());
+    HbStringData *data = getStringData(mMemoryType, dataOffset.get());
     new(data) HbStringData(); 
-    if (length) {
-        data->mStartOffset = manager->alloc(length*sizeof(QChar));
-        ::memcpy((char*) manager->base() + data->mStartOffset, str.constData(), length*sizeof(QChar));
-    } else {
-        data->mStartOffset = -1;
-    }
-    data->mLength = length;
-    data->mCapacity = length;
+    copyString(str.constData(), str.length(), dataOffset.get());
     mDataOffset = dataOffset.release();
 
 #ifdef HB_BIN_CSS
@@ -130,10 +119,10 @@
     mMemoryType = other.mMemoryType;
     GET_MEMORY_MANAGER(other.mMemoryType)
 
-    HbStringData* data = getStringData(mMemoryType, other.mDataOffset);
+    HbStringData *data = getStringData(mMemoryType, other.mDataOffset);
     mDataOffset = other.mDataOffset;
 
-    if(!manager->isWritable() || other.mShared == true) {
+    if(!manager->isWritable() || other.mShared) {
        mShared = true;
        mMemoryType = HbMemoryManager::HeapMemory;
     } else {
@@ -157,12 +146,12 @@
 
     GET_MEMORY_MANAGER(mMemoryType);
     // if the memory where the string is not writable it means it's client process, so do nothing
-    if (!manager->isWritable() || mDataOffset == shared_null_offset) 
+    if (!manager->isWritable())
        return;
 
-    HbStringData* data = getStringData(mMemoryType, mDataOffset, mShared);
+    HbStringData *data = getStringData(mMemoryType, mDataOffset, mShared);
 
-    if (mShared != true && !data->mRef.deref()) {
+    if (!mShared && !data->mRef.deref()) {
         clear();
         data->~HbStringData();
         HbMemoryUtils::freeMemory(mMemoryType, mDataOffset);
@@ -257,21 +246,27 @@
             return -1;
         }
     }
-
     return *uc - *c;
 }
 
-
-
 /*
     Private Utility function that copies the const char* to the HbString
 */
-void HbString::copyString(const QChar *arr, int size)
+void HbString::copyString(const QChar *arr, int size, int dataOffset)
 {
     GET_MEMORY_MANAGER(mMemoryType)
     RETURN_IF_READONLY(manager)
+#ifdef HB_BIN_CSS
+    if (mMemoryType == HbMemoryManager::SharedMemory) {
+        HbString *str = HbCssConverterUtils::sharedStringData(QString(arr, size));
+        if (str) {
+            *this = *str;
+            return;
+        }
+    }
+#endif
     
-    HbStringData* data = getStringData(mMemoryType, mDataOffset, mShared);
+    HbStringData *data = getStringData(mMemoryType, dataOffset, mShared);
     // If source string is empty, simply make the destination string's length
     // as zero and keep the capacity as same for future use.
     if (size == 0){
@@ -295,6 +290,11 @@
         data->mLength = size;
         data->mCapacity = size;
     }
+#ifdef HB_BIN_CSS
+    if (mMemoryType == HbMemoryManager::SharedMemory) {
+        HbCssConverterUtils::addSharedStringData(QString(arr, size), *this);
+    }
+#endif
 }
 
 /*
@@ -321,35 +321,34 @@
 */
 void HbString::detach(int size)
 {    
-    
     HbStringData* data = getStringData(mMemoryType, mDataOffset, mShared);
-    if(data->mRef > 1 || mShared == true) {
+    if(data->mRef > 1 || mShared) {
         if(data->mRef > 1) {
             data->mRef.deref();
         }
         GET_MEMORY_MANAGER(mMemoryType);
         HbSmartOffset dataOffset(manager->alloc(sizeof(HbStringData)), mMemoryType);
 
-        HbStringData* newData = 0;
-        newData = getStringData(mMemoryType,dataOffset.get());
+        HbStringData* newData = 
+                getStringData(mMemoryType, dataOffset.get());
         new(newData) HbStringData();
 		
-		// Allocate new string buffer if given size is greater than zero
-		if (size > 0) {
-			newData->mStartOffset = manager->alloc(size*sizeof(QChar));
-			newData->mLength = qMin(data->mLength, size);
-			// copy old string data contents in the new string data
-			::memcpy(HbMemoryUtils::getAddress<char>(mMemoryType, newData->mStartOffset),
-                getAddress<char>(mMemoryType, data->mStartOffset, mShared),
-				newData->mLength * sizeof(QChar));
-		} 
+        // Allocate new string buffer if given size is greater than zero
+        if (size > 0) {
+            newData->mStartOffset = manager->alloc(size*sizeof(QChar));
+            newData->mLength = qMin(data->mLength, size);
+            // copy old string data contents in the new string data
+            ::memcpy(HbMemoryUtils::getAddress<char>(mMemoryType, newData->mStartOffset),
+            getAddress<char>(mMemoryType, data->mStartOffset, mShared),
+                newData->mLength * sizeof(QChar));
+        }
 
         newData->mCapacity = size;
         mShared = false;
         mDataOffset = dataOffset.release();
     } else if (size > data->mCapacity) { // no need to detach, but make sure there is capacity for the new size
         GET_MEMORY_MANAGER(mMemoryType);
-        data->mStartOffset = manager->realloc(data->mStartOffset, size*sizeof(QChar));
+        data->mStartOffset = manager->realloc(data->mStartOffset, size * sizeof(QChar));
         data->mCapacity = size;
     }
 }
@@ -382,10 +381,10 @@
         if(!manager->isWritable())
             Q_ASSERT(HbMemoryManager::HeapMemory == mMemoryType);
 
-        HbStringData* otherData = 0;
-		otherData = getStringData(other.mMemoryType, other.mDataOffset, other.mShared);
-        HbStringData* data = 0;
-        data = getStringData(mMemoryType, mDataOffset, mShared);
+        HbStringData* otherData = 
+                getStringData(other.mMemoryType, other.mDataOffset, other.mShared);
+        HbStringData* data =
+                getStringData(mMemoryType, mDataOffset, mShared);
     
         if(other.mMemoryType != mMemoryType || other.mShared == true) {
             if(mShared != true && data->mRef == 1) {                
@@ -433,7 +432,7 @@
     // If both strings are not equal, then assigns QLatin1String to HbString
     if (!result) {
         detach(len);
-        copyString(tempStr.constData(), len);
+        copyString(tempStr.constData(), len, mDataOffset);
     }
 
     return *this;
@@ -452,7 +451,7 @@
         // If both strings are not equal, then assigns QString to HbString
         if(!compareString(ptr, len)) {
             detach(len);
-            copyString(ptr, len);
+            copyString(ptr, len, mDataOffset);
         }
     }
     return *this;
@@ -555,22 +554,20 @@
 */
 void HbString::clear()
 {
-    // No need to clear null string
-    if (mDataOffset == shared_null_offset) {
-        return;
-    }
-
-    detach(0); // This will update the new mDataOffset.
     HbStringData* data = getStringData(mMemoryType, mDataOffset, mShared);
+    if (data->mStartOffset != -1) {
+        detach(0); // This will update the new mDataOffset.
+        data = getStringData(mMemoryType, mDataOffset, mShared);
 
-    if (data->mStartOffset != -1) {
-        GET_MEMORY_MANAGER(mMemoryType)
-        RETURN_IF_READONLY(manager);
+        if (data->mStartOffset != -1) {
+            GET_MEMORY_MANAGER(mMemoryType)
+            RETURN_IF_READONLY(manager);
 
-        manager->free(data->mStartOffset);
-        data->mStartOffset = -1;
-        data->mLength = 0;
-        data->mCapacity = 0;
+            manager->free(data->mStartOffset);
+            data->mStartOffset = -1;
+            data->mLength = 0;
+            data->mCapacity = 0;
+        }
     }
 }
 
@@ -582,12 +579,12 @@
     GET_MEMORY_MANAGER(mMemoryType)
     RETURN_IF_READONLY(manager);
 
-    HbStringData* data = 0;
-    data = getStringData(mMemoryType, mDataOffset, mShared);
+    HbStringData* data = 
+            getStringData(mMemoryType, mDataOffset, mShared);
 
     detach(data->mLength);
-    HbStringData* newData = 0;
-    newData = getStringData(mMemoryType, mDataOffset, mShared);
+    HbStringData* newData = 
+            getStringData(mMemoryType, mDataOffset, mShared);
 
     if (n > 0) {
         if(newData->mStartOffset != -1 && newData->mLength > n){
@@ -607,14 +604,13 @@
     GET_MEMORY_MANAGER(mMemoryType)
     RETURN_OBJECT_IF_READONLY(manager, *this)
     
-    HbStringData* data = 0;
-    data = getStringData(mMemoryType, mDataOffset, mShared);
+    HbStringData* data = 
+            getStringData(mMemoryType, mDataOffset, mShared);
 
     detach(data->mLength);
 
     HbStringData* newData = getStringData(mMemoryType, mDataOffset, mShared);
-    QChar *ptr = 0;
-    ptr = getAddress<QChar>(mMemoryType, newData->mStartOffset, mShared);
+    QChar *ptr = getAddress<QChar>(mMemoryType, newData->mStartOffset, mShared);
     int i = position;
     if(ptr){
         if(n > (newData->mLength - position)){
@@ -636,9 +632,9 @@
 */
 bool HbString::isEmpty() const
 { 
-    HbStringData* data = 0;
-    data = getStringData(mMemoryType, mDataOffset, mShared);
-    return (data->mLength == 0)? true:false;
+    HbStringData* data = 
+            getStringData(mMemoryType, mDataOffset, mShared);
+    return (data->mLength == 0);
 }
 
 /*
@@ -648,8 +644,8 @@
 */
 bool HbString::startsWith ( const QLatin1Char &s, Qt::CaseSensitivity cs ) const 
 {
-    HbStringData* data = 0;
-    data = getStringData(mMemoryType, mDataOffset, mShared);
+    HbStringData* data = 
+            getStringData(mMemoryType, mDataOffset, mShared);
 
     if (data->mStartOffset == -1) {
         return false;
@@ -674,23 +670,23 @@
     GET_MEMORY_MANAGER(mMemoryType)
     RETURN_OBJECT_IF_READONLY(manager, *this)
    
-    HbStringData* data = 0;
-    data = getStringData(mMemoryType, mDataOffset, mShared);
+    HbStringData* data =
+            getStringData(mMemoryType, mDataOffset, mShared);
 
     int size = data->mLength + str.length();
 
     detach(size);
-    HbStringData* newData = 0;
-    newData = getStringData(mMemoryType, mDataOffset, mShared);
+    HbStringData* newData = 
+            getStringData(mMemoryType, mDataOffset, mShared);
 
     if(size > newData->mCapacity ) {
-        newData->mStartOffset = manager->realloc(newData->mStartOffset, size*sizeof(QChar));
+        newData->mStartOffset = manager->realloc(newData->mStartOffset, size * sizeof(QChar));
         newData->mCapacity = size;
     }
 
     if(newData->mStartOffset != -1) {
         char *dest = getAddress<char>(mMemoryType, newData->mStartOffset, mShared);
-        memmove(dest + str.length() * sizeof(QChar), dest, newData->mLength*sizeof(QChar));
+        memmove(dest + str.length() * sizeof(QChar), dest, newData->mLength * sizeof(QChar));
         memcpy(dest, str.constData(), str.length() * sizeof(QChar));
         newData->mLength = size;
     }
@@ -705,24 +701,24 @@
     GET_MEMORY_MANAGER(mMemoryType)
     RETURN_OBJECT_IF_READONLY(manager, *this)
     
-    HbStringData* data = 0;
-    data = getStringData(mMemoryType, mDataOffset, mShared);
+    HbStringData* data = 
+            getStringData(mMemoryType, mDataOffset, mShared);
 
     int size = data->mLength + str.length();
 
     detach(size);
 
-    HbStringData* newData = 0;
-    newData = getStringData(mMemoryType, mDataOffset, mShared);
+    HbStringData* newData = 
+            getStringData(mMemoryType, mDataOffset, mShared);
 
     if(size > newData->mCapacity ) {
-        newData->mStartOffset = manager->realloc(newData->mStartOffset, size*sizeof(QChar));
+        newData->mStartOffset = manager->realloc(newData->mStartOffset, size * sizeof(QChar));
         newData->mCapacity = size;
     }
 
     if(newData->mStartOffset != -1) {
         char *dest = getAddress<char>(mMemoryType, newData->mStartOffset, mShared);
-        memcpy(dest + newData->mLength*sizeof(QChar), str.constData(), str.length()*sizeof(QChar));
+        memcpy(dest + newData->mLength * sizeof(QChar), str.constData(), str.length() * sizeof(QChar));
         newData->mLength = size;
     }
     return *this;
@@ -735,8 +731,8 @@
 HbString HbString::toLower() const
 {
     GET_MEMORY_MANAGER(mMemoryType)
-    HbStringData* data = 0;
-    data = getStringData(mMemoryType, mDataOffset, mShared);
+    HbStringData* data = 
+            getStringData(mMemoryType, mDataOffset, mShared);
 
     // If the string is empty, a copy of it can be returned directly.
     if (!data->mLength) {
@@ -756,8 +752,7 @@
     // Detach allocates data with new capacity
     copy.detach(data->mLength);
     HbStringData *newData = getStringData(copy.mMemoryType, copy.mDataOffset, copy.mShared);
-
-	QChar *dest = getAddress<QChar>(copyMemoryType, newData->mStartOffset, copy.mShared);
+    QChar *dest = getAddress<QChar>(copyMemoryType, newData->mStartOffset, copy.mShared);
 
     int count = data->mLength;
     for (int i = 0; i<count; ++i) {
@@ -834,7 +829,7 @@
 */
 void HbString::print() const
 {
-    if (mDataOffset != -1 && mDataOffset != -2) {
+    if (mDataOffset != -1) {
         GET_MEMORY_MANAGER(mMemoryType)
         HbStringData * mData = HbMemoryUtils::getAddress<HbStringData>( mMemoryType, mDataOffset);
         qDebug() << QString::fromRawData( (QChar*)((char*)manager->base() 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbstring_p.h
--- a/src/hbcore/core/hbstring_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbstring_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -44,7 +44,7 @@
     friend class TestHbString;
 
 public:
-    HbString( HbMemoryManager::MemoryType type = HbMemoryManager::InvalidMemory ); 
+    explicit HbString( HbMemoryManager::MemoryType type = HbMemoryManager::InvalidMemory );
     HbString( const QString &str, HbMemoryManager::MemoryType type );
     HbString( const HbString &Other );
     ~HbString();
@@ -85,7 +85,7 @@
 #endif
 
 private:
-    void copyString( const QChar *arr, int size );
+    void copyString( const QChar *arr, int size, int dataOffset );
     bool compareString( const QChar *rhs, int len ) const;
     void detach( int size );
 
@@ -93,7 +93,6 @@
 
     HbMemoryManager::MemoryType mMemoryType;
     bool mShared;
-
     int mDataOffset;
 };
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbstringdata_p.h
--- a/src/hbcore/core/hbstringdata_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbstringdata_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -30,15 +30,13 @@
 #include "hbmemorymanager_p.h"
 
 template<typename T>
+inline
 T * getAddress(HbMemoryManager::MemoryType type, int offset, bool shared)
 {
-    T *data = 0;
-    if( shared == true ) {
-        data = HbMemoryUtils::getAddress<T>(HbMemoryManager::SharedMemory, offset);
-    } else {
-        data = HbMemoryUtils::getAddress<T>(type, offset);
+    if(shared) {
+        type = HbMemoryManager::SharedMemory;
     }
-    return data;
+    return HbMemoryUtils::getAddress<T>(type, offset);
 }
 
 class HB_AUTOTEST_EXPORT HbStringData
@@ -53,4 +51,10 @@
     QAtomicInt mRef;
 };
 
+inline
+HbStringData *getStringData(HbMemoryManager::MemoryType type, int offset, bool shared = false)
+{
+    return getAddress<HbStringData>(type, offset, shared);
+}
+
 #endif // HBSTRINGDATA_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbthemeindex.cpp
--- a/src/hbcore/core/hbthemeindex.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbthemeindex.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -65,6 +65,9 @@
     // First check base theme, which should be always valid
     HbThemeIndexInfo info = HbThemeUtils::getThemeIndexInfo(BaseTheme);
     if (!info.address) { // This shouldn't happen, as there must be valid base theme
+#ifdef THEME_INDEX_TRACES
+        qDebug("HbThemeUtils::getThemeIndexInfo(BaseTheme) returned null address");
+#endif
         return; // Data will be 0
     }
     
@@ -72,6 +75,9 @@
     const HbThemeIndexItemData *baseItemData = baseIndex.getItemData(resourceName);
 
     if (!baseItemData) { // If the item is not found from base theme, it can't be found elsewhere
+#ifdef THEME_INDEX_TRACES
+        qDebug("HbThemeIndex::getItemData(%s) returned null data", qPrintable(resourceName));
+#endif
         return; // Data will be 0
     }
 
@@ -334,9 +340,13 @@
 QColor HbThemeIndexResource::colorValue()
 {
     if (!data || data->itemType != HbThemeIndexItemData::ColorItem) {
+        qWarning("HbThemeIndexResource::colorValue(): cannot fetch color for 0x%x::%i",
+                 qptrdiff(data), data ? data->itemType : (uint) -1);
         return QColor();
     }
-
+#ifdef THEME_INDEX_TRACES
+    qDebug("HbThemeIndexResource::colorValue(): constructing QColor(%x)", data->colorValue);
+#endif // THEME_INDEX_TRACES
     return QColor(data->colorValue);
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbthemesystemeffect.cpp
--- a/src/hbcore/core/hbthemesystemeffect.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbthemesystemeffect.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -147,6 +147,7 @@
             mBaseEffectsFolder.append("/effects/");
             mBaseEffectsFolder.append(info.name);
             mBaseEffectsFolder.append('/');
+            mBaseEffectsFolder = QDir::toNativeSeparators(mBaseEffectsFolder);
         }
     }
 
@@ -193,9 +194,10 @@
         effects->registerEffects(mWsSession, mBaseEffectsFolder);
 #endif //Q_OS_SYMBIAN
     } else {
-        // Disable warning until themes have the conf file
-        //qWarning() << "HbThemeSystemEffect::registerEffects: no system effects configuration"
-        //           << "found - unregistering all system effects.";
+#ifdef HBTHEMESYSTEMEFFECT_DEBUG
+        qDebug() << "HbThemeSystemEffect::registerEffects: no system effects configuration"
+                 << "found - unregistering all system effects.";
+#endif //HBTHEMESYSTEMEFFECT_DEBUG
 #ifdef Q_OS_SYMBIAN
         effects->unregisterAllEffects(mWsSession);
 #endif //Q_OS_SYMBIAN
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbthemesystemeffectmap.cpp
--- a/src/hbcore/core/hbthemesystemeffectmap.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbthemesystemeffectmap.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -162,6 +162,10 @@
     QMapIterator<SystemEffectKey, SystemEffectValue> mapIt(mSystemEffects);
     TPtrC themeResourceDir = mEffectsFolder.utf16();
     TPtrC baseResourceDir = baseEffectsFolder.utf16();
+#ifdef HBTHEMESYSTEMEFFECT_DEBUG
+    qDebug() << "HbThemeSystemEffectMap::registerEffects effect folder:" << mEffectsFolder
+            << "base theme effect folder:" << baseEffectsFolder;
+#endif //HBTHEMESYSTEMEFFECT_DEBUG
     while (mapIt.hasNext()) {
         mapIt.next();
         // Register entry
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbthemesystemeffectmap_p.h
--- a/src/hbcore/core/hbthemesystemeffectmap_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbthemesystemeffectmap_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -33,7 +33,7 @@
 #endif //Q_OS_SYMBIAN
 
 // Define this to enable debug traces
-//#define HBTHEMESYSTEMEFFECT_DEBUG
+#undef HBTHEMESYSTEMEFFECT_DEBUG
 
 
 class HbThemeSystemEffectMap
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/core/hbvector_p.h
--- a/src/hbcore/core/hbvector_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/core/hbvector_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -130,9 +130,9 @@
     : public const_vector_iterator<T, Pointer>
 {
 public:
-    typedef T           value_type;
-    typedef value_type &         reference;
-    typedef int                         difference_type;
+    typedef T value_type;
+    typedef value_type & reference;
+    typedef int difference_type;
 public:
 
     vector_iterator()
@@ -232,38 +232,37 @@
     //Owing to OOM condition, the ctor of HbVector can throw, the exception is 
     // propagated to the caller.
     HbVector(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
-       : mData(0,type),
-         mMemoryType(type),
+       : mData(0, type),
          mShared(false)
    {
-       GET_MEMORY_MANAGER(type);
-       HbSmartOffset smartOffset(manager->alloc(sizeof(HbVectorData)), type );
-       mData = new((char*)manager->base() + smartOffset.get()) HbVectorData(type);
-       smartOffset.release();
-
+       if (type == HbMemoryManager::HeapMemory) {
+           static int heapNullOffset(createNullOffset(HbMemoryManager::HeapMemory));
+           mData.setOffset(heapNullOffset);
+           mData->mRef.ref();
+       } else if (type == HbMemoryManager::SharedMemory) {
+           static int sharedNullOffset(createNullOffset(HbMemoryManager::SharedMemory));
+           mData.setOffset(sharedNullOffset);
+           mData->mRef.ref();
 #ifdef HB_BIN_CSS
-       HbCssConverterUtils::registerOffsetHolder(mData.offsetPtr());
+           HbCssConverterUtils::registerOffsetHolder(mData.offsetPtr());
 #endif
+       } else {
+           HbMemoryManager *manager = memoryManager();
+           HbSmartOffset smartOffset(manager->alloc(sizeof(HbVectorData)), type );
+           mData = new((char*)manager->base() + smartOffset.get()) HbVectorData(type);
+           smartOffset.release();
+       }
    }
 
-    HbVector(const HbVector<T> &other)
-    { 
-       mMemoryType = other.mMemoryType;
-       GET_MEMORY_MANAGER(other.mMemoryType)
-       // Deep copy , if current vector is in client side and it copies data which is in shared memory.
-       // else Do normal Implicit sharing.
-       mData = other.mData;
-
-       if(!manager->isWritable() || other.mShared == true){
+    HbVector(const HbVector<T> &other) : mData(other.mData), mShared(other.mShared)
+    {
+       HbMemoryManager *manager = memoryManager();
+       if(!manager->isWritable()){
            mShared = true;
-           mMemoryType = HbMemoryManager::HeapMemory;
-       } else {
-           mShared = false;
+       }
+       if (!mShared) {
            mData->mRef.ref();
        }
-       Q_ASSERT(mMemoryType == HbMemoryManager::SharedMemory 
-                || mMemoryType == HbMemoryManager::HeapMemory);
-
 #ifdef HB_BIN_CSS
        HbCssConverterUtils::registerOffsetHolder(mData.offsetPtr());
 #endif
@@ -271,7 +270,7 @@
     
     ~HbVector()
     {
-       GET_MEMORY_MANAGER(mMemoryType);
+       HbMemoryManager *manager = memoryManager();
        // if the memory where the vector is not writable it means it's client process, so do nothing
        if(!mData || !manager->isWritable()) 
            return;
@@ -286,7 +285,7 @@
     
     HbMemoryManager::MemoryType memoryType() const
     {
-       return mMemoryType;
+       return mShared ?  HbMemoryManager::HeapMemory : mData.memoryType();
     }
     
     #ifdef CSS_PARSER_TRACES
@@ -399,8 +398,9 @@
     // reserve() can throw owing to OOM
     void reserve(int newSize)
     {
-        if( mShared || newSize > mData->mCapacity || mData->mRef != 1) {
-            GET_MEMORY_MANAGER(mMemoryType);
+        if( newSize > 0
+            && (mShared || newSize > mData->mCapacity || mData->mRef != 1)) {
+            HbMemoryManager *manager = memoryManager();
             int offset = (char*)mData->mStart.get() - (char*)manager->base();
             int newOffset = -1;
             if(newSize > mData->mCapacity)
@@ -542,40 +542,31 @@
 
     HbVector<T> & operator=(const HbVector<T> &other)
     {
-        GET_MEMORY_MANAGER(mMemoryType);
-        if(!manager->isWritable())
-            Q_ASSERT(mMemoryType != HbMemoryManager::SharedMemory);
-        
+        Q_ASSERT(memoryType() == HbMemoryManager::SharedMemory
+                 || memoryType() == HbMemoryManager::HeapMemory);
         // if the Current vector and other Vector memory type is not same then do Deep Copy.
         //To Do: mShared == true is just Quick fix for unit-test where the other vector is in heap but 
         // its data shared to shared memory also the current vector is same state. this needs to fix
         // and decision making is required very clear for all the scenarios.
-        if (other.mMemoryType != mMemoryType || other.mShared == true || mShared == true ) 
+        if (other.memoryType() != memoryType() || other.mShared || mShared)
         {
             if(!mShared && !mData->mRef.deref()) {
                 destroyData();
             }
             mShared = true;
-            // Here assumption is that two memory type will be different in
-            // client side. so this code will not be execute in the server side so
-            // memoryType will be heap but data still shared to Shared memory.
-            mMemoryType = HbMemoryManager::HeapMemory;
         } else {
             if(!mData->mRef.deref() ) {
                destroyData();
             }
             other.mData->mRef.ref();
-            mMemoryType = other.mMemoryType;
             mShared = other.mShared;
         }
         mData = other.mData;
-        Q_ASSERT(mMemoryType == HbMemoryManager::SharedMemory || mMemoryType == HbMemoryManager::HeapMemory);
         return *this;
     }
 
     HbVector<T> & operator=(const QVector<T> &other)
     {
-        Q_ASSERT(mMemoryType == HbMemoryManager::SharedMemory || mMemoryType == HbMemoryManager::HeapMemory);
         clear();
         foreach (T obj, other) {
             append(obj);
@@ -593,12 +584,11 @@
 private:
     void detach()
     {
-        if(mData->mRef != 1 || mShared == true) {
+        if(mData->mRef != 1 || mShared) {
             copyData(size(), size());
             // Here assumption is the new copy of data is created in heap.
             // so disabling the shared flag.
-            if(mShared)
-                mShared = false;
+            mShared = false;
         }
     }
 
@@ -614,12 +604,13 @@
 // mData is not freed, because it is assumed, that it is owned by another HbVector (mData->mRef > 1)
     void copyData(int newSize, int oldSize)
     {
+        HbMemoryManager::MemoryType memType = memoryType();
         DataPointer tempData(mData);
-        DataPointer newData(0, mMemoryType);
-        GET_MEMORY_MANAGER(mMemoryType)
-        HbSmartOffset offset(manager->alloc(sizeof(HbVectorData)), mMemoryType);
+        DataPointer newData(0, memType);
+        HbMemoryManager *manager = memoryManager();
+        HbSmartOffset offset(manager->alloc(sizeof(HbVectorData)), memType);
         newData = new ((char*)manager->base() + offset.get())
-                        HbVectorData(mMemoryType, oldSize, newSize);
+                        HbVectorData(memType, oldSize, newSize);
         mData = newData;
         offset.release();
         if(!mShared && !tempData->mRef.deref()) {
@@ -643,13 +634,12 @@
 // the exception is propagated to the caller
     int reAlloc(int oldOffset, int newSize , int oldSize)
     {   
-        GET_MEMORY_MANAGER(mMemoryType);
-        if(mData->mRef != 1 || mShared == true) {
+        HbMemoryManager *manager = memoryManager();
+        if(mData->mRef != 1 || mShared) {
             copyData( newSize, oldSize );
             // Here assumption is the new copy of data is created in heap.
             // so disabling the shared flag.
-            if(mShared)
-                mShared = false;
+            mShared = false;
             return (char*)mData->mStart.get() - (char*)manager->base();
         } else {
             // this statement can throw
@@ -671,19 +661,34 @@
    }
 
 private : // Data
-   void deAllocateData()
-   {
-       GET_MEMORY_MANAGER(mMemoryType);
-       mData->deAllocateAll(mMemoryType);
+    static int createNullOffset(HbMemoryManager::MemoryType type)
+    {
+        GET_MEMORY_MANAGER(type);
+        int nullOffset(manager->alloc(sizeof(HbVectorData)));
+        HbVectorData* data = HbMemoryUtils::getAddress<HbVectorData>(type, nullOffset);
+        new(data) HbVectorData(type);
+        return nullOffset;
+    }
+    void deAllocateData()
+    {
+       HbMemoryManager *manager = memoryManager();
+       mData->deAllocateAll(manager);
        int dataOffset = (char*) mData.get() - (char*)manager->base();
        manager->free(dataOffset);
        mData = 0;
-   }   
+    }
+    HbMemoryManager *memoryManager()
+    {
+        Q_ASSERT(memoryType() == HbMemoryManager::SharedMemory
+                 || memoryType() == HbMemoryManager::HeapMemory);
+        return HbMemoryManager::instance(memoryType());
+    }
+
     struct HbVectorData
     {
         // The ctor of HbVectorData can throw owing to manager->alloc, we're not catching the exception
         // if any and simply allow to propagate it to caller.
-        HbVectorData(HbMemoryManager::MemoryType type, unsigned int size=0, unsigned int capacity = 0)
+        HbVectorData(HbMemoryManager::MemoryType type, unsigned int size = 0, unsigned int capacity = 0)
             : mStart(0,type),
               mSize(size), 
               mCapacity(capacity),
@@ -702,16 +707,15 @@
         ~HbVectorData()
         { 
 #ifdef HB_BIN_CSS	
-			HbCssConverterUtils::unregisterOffsetHolder(mStart.offsetPtr());
+            HbCssConverterUtils::unregisterOffsetHolder(mStart.offsetPtr());
 #endif //HB_BIN_CSS
-			destroyAll();
+            destroyAll();
         }
 
-        void deAllocateAll(HbMemoryManager::MemoryType type)
+        void deAllocateAll(HbMemoryManager *manager)
         {
             if(!mCapacity) return;
-            GET_MEMORY_MANAGER(type);
-            int offset = (char*)mStart.get() - (char*)manager->base();
+            int offset = (char*) mStart.get() - (char*) manager->base();
             manager->free(offset);
             mStart = 0;
             mSize = 0;
@@ -766,7 +770,6 @@
     };
     typedef smart_ptr<HbVectorData> DataPointer;
     DataPointer mData;
-    HbMemoryManager::MemoryType mMemoryType;
     bool mShared;
 
 };
@@ -778,8 +781,8 @@
 {
     int offset = before - mData->mStart;
     if(count != 0) {
-        if(mShared || mData->mRef !=1 || mData->mSize + count > mData->mCapacity) {
-            GET_MEMORY_MANAGER(mMemoryType);
+        if(mShared || mData->mRef != 1 || mData->mSize + count > mData->mCapacity) {
+            HbMemoryManager *manager = memoryManager();
             int offset = (char*)mData->mStart.get() - (char*)manager->base();
             int newCapacity = mData->mSize + count;
             if(newCapacity < mData->mCapacity) {
@@ -791,8 +794,9 @@
         if(QTypeInfo<value_type>::isStatic) {
             pointer b = mData->mStart + mData->mSize;
             pointer i = b + count;
+            HbMemoryManager::MemoryType memType = memoryType();
             while(i != b)
-                new(--i) T(mMemoryType);
+                new(--i) T(memType);
             i = mData->mStart + mData->mSize;
             pointer j = i + count;
             b = mData->mStart + offset;
@@ -828,7 +832,7 @@
             mData->mStart[mData->mSize] = value;
         }
     } else {
-        GET_MEMORY_MANAGER(mMemoryType);
+        HbMemoryManager *manager = memoryManager();
         int offset = (char*)mData->mStart.get() - (char*)manager->base();
 #ifdef HB_BIN_CSS
         int capacity = (mData->mCapacity == 0) ? HbVectorDefaultCapacity : mData->mCapacity + 1;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/cssparser/hbcssparser_p.cpp
--- a/src/hbcore/cssparser/hbcssparser_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/cssparser/hbcssparser_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -56,6 +56,7 @@
 
 static const HbCssKnownValue properties[NumProperties - 1] = {
     { "alignment", Property_Alignment },
+    { "anchor-direction", Property_AnchorDirection },
     { "aspect-ratio", Property_AspectRatio },
     { "border-width", Property_BorderWidth },
     { "border-width-bottom", Property_BorderWidthBottom },
@@ -67,6 +68,7 @@
     { "center-vertical", Property_CenterVertical },
     { "color", Property_Color },
     { "fixed-height", Property_FixedHeight },
+    { "fixed-length", Property_FixedLength },
     { "fixed-size", Property_FixedSize },
     { "fixed-width", Property_FixedWidth },
     { "font", Property_Font },
@@ -75,18 +77,19 @@
     { "font-style", Property_FontStyle },
     { "font-variant", Property_FontVariant },
     { "font-weight", Property_FontWeight },
-    { "height", Property_Height },
     { "layout", Property_Layout },
     { "layout-direction", Property_LayoutDirection },
     { "left", Property_Left },
     { "max-height", Property_MaximumHeight },
+    { "max-length", Property_MaximumLength },
     { "max-size", Property_MaximumSize },
     { "max-width", Property_MaximumWidth },
     { "min-height", Property_MinimumHeight },
+    { "min-length", Property_MinimumLength },
     { "min-size", Property_MinimumSize },
     { "min-width", Property_MinimumWidth },
-    { "mirroring", Property_Mirroring, }, // deprecated
     { "pref-height", Property_PreferredHeight },
+    { "pref-length", Property_PreferredLength },
     { "pref-size", Property_PreferredSize },
     { "pref-width", Property_PreferredWidth },
     { "right", Property_Right },
@@ -94,9 +97,6 @@
     { "size-policy", Property_SizePolicy },
     { "size-policy-horizontal", Property_SizePolicyHorizontal },
     { "size-policy-vertical", Property_SizePolicyVertical },
-    { "spacing", Property_Spacing },
-    { "spacing-horizontal", Property_SpacingHorizontal },
-    { "spacing-vertical", Property_SpacingVertical },
     { "text-align", Property_TextAlignment },
     { "text-decoration", Property_TextDecoration },
     { "text-height", Property_TextHeight },
@@ -105,17 +105,14 @@
     { "text-transform", Property_TextTransform },
     { "text-wrap-mode", Property_TextWrapMode },
     { "top", Property_Top },
-    { "width", Property_Width },
     { "zvalue", Property_ZValue }
 };
 
 static const HbCssKnownValue values[NumKnownValues - 1] = {
-    { "active", Value_Active },
     { "bold", Value_Bold },
     { "bottom", Value_Bottom },
     { "center", Value_Center },
     { "digital", Value_Digital },
-    { "disabled", Value_Disabled },
     { "expanding", Value_Expanding },
     { "fixed", Value_Fixed },
     { "ignore", Value_Ignore },
@@ -130,22 +127,20 @@
     { "maximum", Value_Maximum },
     { "minimum", Value_Minimum },
     { "minimum-expanding", Value_MinimumExpanding },
-    { "mirrored", Value_Mirrored },  // deprecated
+    { "negative", Value_Negative },
     { "no-wrap", Value_NoWrap },
     { "none", Value_None },
     { "normal", Value_Normal },
     { "oblique", Value_Oblique },
-    { "off", Value_Off },
-    { "on", Value_On },
     { "overline", Value_Overline },
     { "parent", Value_Parent },
+    { "positive", Value_Positive },
     { "preferred", Value_Preferred },
     { "primary", Value_Primary },
     { "primary-small", Value_PrimarySmall },
     { "right", Value_Right },
     { "right-to-left", Value_RightToLeft },
     { "secondary", Value_Secondary },
-    { "selected", Value_Selected },
     { "small-caps", Value_SmallCaps },
     { "title", Value_Title },
     { "top", Value_Top },
@@ -255,6 +250,13 @@
                 *ok = false;
             }
             return 0;
+    } else if (type == Value::Percentage) {
+        qreal result = s.toDouble(ok) /100.0;
+        if (ok && !(*ok)) {
+            return 0;
+        } else {
+            return result;
+        }
     }
 
     enum { None, Px, Un, Mm } unit = None;
@@ -340,11 +342,9 @@
             retVal = HbCss::LayoutDirection_RightToLeft;
             break;
         case Value_LeftToRight:
-        case Value_Disabled: // legacy support
             retVal = HbCss::LayoutDirection_LeftToRight;
             break;
         case Value_Parent:
-        case Value_Mirrored: // legacy support
         default:
             break;
         }
@@ -362,12 +362,27 @@
     case Value_KeepExpand:
         mode = Qt::KeepAspectRatioByExpanding;
         break;
+    case Value_Keep:
     default:
         break;
     }
     return mode;
 }
 
+static HbAnchor::Direction parseAnchorDirection(const Value& v)
+{
+    HbAnchor::Direction dir = HbAnchor::Positive;
+    switch (v.variant.toInt()) {
+    case Value_Negative:
+        dir = HbAnchor::Negative;
+        break;
+    case Value_Positive:
+    default:
+        break;
+    }
+    return dir;
+}
+
 static Qt::Alignment parseAlignment(const Declaration &decl)
 {
     if (decl.values.isEmpty() || decl.values.count() > 2)
@@ -582,15 +597,19 @@
         const Declaration &decl = declarations.at(i);
         switch (decl.propertyId) {
         case Property_MinimumWidth: prop.mMinW = asReal(decl); flags|=ExtractedMinW; break;
+        case Property_MinimumLength: // fall-through
         case Property_MinimumHeight: prop.mMinH = asReal(decl); flags|=ExtractedMinH; break;
         case Property_MaximumWidth: prop.mMaxW = asReal(decl); flags|=ExtractedMaxW; break;
+        case Property_MaximumLength: // fall-through
         case Property_MaximumHeight: prop.mMaxH = asReal(decl); flags|=ExtractedMaxH; break;
         case Property_PreferredWidth: prop.mPrefW = asReal(decl); flags|=ExtractedPrefW; break;
+        case Property_PreferredLength: // fall-through
         case Property_PreferredHeight: prop.mPrefH = asReal(decl); flags|=ExtractedPrefH; break;
         case Property_FixedWidth:
             prop.mPrefW = asReal(decl); flags|=ExtractedPrefW;
             prop.mSizePolicy.setHorizontalPolicy(QSizePolicy::Fixed); flags|=ExtractedPolHor;
             break;
+        case Property_FixedLength: // fall-through
         case Property_FixedHeight:
             prop.mPrefH = asReal(decl); flags|=ExtractedPrefH;
             prop.mSizePolicy.setVerticalPolicy(QSizePolicy::Fixed); flags|=ExtractedPolVer;
@@ -656,7 +675,6 @@
             prop.mCenterV = asReal(decl); flags|=ExtractedCenterV; break;
 
         case Property_LayoutDirection: // fall-through
-        case Property_Mirroring:
             prop.mLayoutDir = parseLayoutDirectionValue(decl.values.at(0));
             flags|=ExtractedLayoutDir;
             break;
@@ -702,6 +720,10 @@
         case Property_TextHeight: 
             tphSet = true; prop.mFontSpec.setTextHeight(asReal(decl)); break;
 
+        case Property_AnchorDirection:
+            prop.mAnchorDir = parseAnchorDirection(decl.values.at(0));
+            flags|=ExtractedAnchorDir;
+            break;
         default: continue;
         }
         hit = true;
@@ -1054,11 +1076,9 @@
                     case Value::VariableNegative:
                     case Value::Expression:
                     case Value::ExpressionNegative:
+                    case Value::Percentage:
                         values[j] = asReal(val);
                         break;
-                    case Value::Percentage:
-                        values[j] = val.variant.toDouble() / 100;
-                        break;
                     case Value::KnownIdentifier:
                         values[j] = (QString)val.original;
                         break;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/cssparser/hbcssparser_p.h
--- a/src/hbcore/cssparser/hbcssparser_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/cssparser/hbcssparser_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -40,6 +40,7 @@
 #include <hbnamespace.h>
 #include <hbdeviceprofile.h>
 #include <hbfontspec.h>
+#include <hbanchor.h>
 
 // smart containers and memory manager inclusion
 #include "hbmemorymanager_p.h"
@@ -53,6 +54,8 @@
 
 enum Property {
     Property_Unknown,
+    Property_Alignment,
+    Property_AnchorDirection,
     Property_AspectRatio,
     Property_BorderWidth,
     Property_BorderWidthBottom,
@@ -64,6 +67,7 @@
     Property_CenterVertical,
     Property_Color,
     Property_FixedHeight,
+    Property_FixedLength,
     Property_FixedSize,
     Property_FixedWidth,
     Property_Font,
@@ -72,18 +76,19 @@
     Property_FontStyle,
     Property_FontVariant,
     Property_FontWeight,
-    Property_Height,
     Property_Layout,
     Property_LayoutDirection,
     Property_Left,
     Property_MaximumHeight,
+    Property_MaximumLength,
     Property_MaximumSize,
     Property_MaximumWidth,
     Property_MinimumHeight,
+    Property_MinimumLength,
     Property_MinimumSize,
     Property_MinimumWidth,
-    Property_Mirroring, // deprecated
     Property_PreferredHeight,
+    Property_PreferredLength,
     Property_PreferredSize,
     Property_PreferredWidth,
     Property_Right,
@@ -91,9 +96,6 @@
     Property_SizePolicy,
     Property_SizePolicyHorizontal,
     Property_SizePolicyVertical,
-    Property_Spacing,
-    Property_SpacingHorizontal,
-    Property_SpacingVertical,
     Property_TextAlignment,
     Property_TextDecoration,
     Property_TextHeight,
@@ -102,9 +104,7 @@
     Property_TextTransform,
     Property_TextWrapMode,
     Property_Top,
-    Property_Width,
     Property_ZValue,
-    Property_Alignment,
     NumProperties
 };
 
@@ -128,12 +128,6 @@
     Value_Uppercase,
     Value_Lowercase,
 
-    Value_Disabled,
-    Value_Active,
-    Value_Selected,
-    Value_On,
-    Value_Off,
-
     Value_Ignore,
     Value_Keep,
     Value_KeepExpand,
@@ -152,7 +146,6 @@
     Value_MinimumExpanding,
     Value_Ignored,
     
-    Value_Mirrored, // deprecated
     Value_LeftToRight,
     Value_RightToLeft,
     Value_Parent,
@@ -161,6 +154,9 @@
     Value_WordWrap,
     Value_WrapAnywhere,
 
+    Value_Positive,
+    Value_Negative,
+
     NumKnownValues
 };
 
@@ -416,8 +412,10 @@
     ExtractedAspectRatioMode    = 0x10000000,
 
     // Frame specific
-    ExtractedBorderWidths       = 0x20000000
+    ExtractedBorderWidths       = 0x20000000,
 
+    // Anchor specific
+    ExtractedAnchorDir          = 0x80000000
 };
 Q_DECLARE_FLAGS(KnownPropertyFlags, KnownPropertyFlag)
 
@@ -440,6 +438,8 @@
 
     qreal mBorderWidths[HbCss::NumEdges];
 
+    HbAnchor::Direction mAnchorDir;
+
     KnownPropertyFlags mFlags;
 };
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbbatteryindicator.cpp
--- a/src/hbcore/decorators/hbbatteryindicator.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbbatteryindicator.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -28,6 +28,7 @@
 #include "hbstyleoptionbatteryindicator_p.h"
 
 #include <hbinstance.h>
+#include <hbevent.h>
 
 /*
     \class HbBatteryIndicator
@@ -73,10 +74,12 @@
             mChargingTimer.stop();
         }
         mChargingTimer.start(250, q);
+        emit q->levelChanged(); // to make sure the charging status is communicated
     } else {
         mChargingOn = false;
         mChargingTimer.stop();
         q->setLevel(mSystemDeviceInfo->batteryLevel());
+        emit q->levelChanged(); // to make sure the non-charging status is communicated
     }
 }
 #endif // HB_HAVE_QT_MOBILITY
@@ -155,6 +158,7 @@
     if (d->mLevelPercent != levelPercent) {
         d->mLevelPercent = levelPercent;
         updatePrimitives();
+        emit levelChanged(); // must be emitted whenever the visualization changes (i.e. also while charging)
     }
 }
 
@@ -206,4 +210,30 @@
     option->batteryValue = d->mLevelPercent;
 }
 
+bool HbBatteryIndicator::isCharging() const
+{
+    Q_D(const HbBatteryIndicator);
+    // Cannot use mChargingOn only because this function must work
+    // reliably even when called while being in setLevel(). On the
+    // other hand the timer is stopped while being in sleep mode. So
+    // check both.
+    return d->mChargingTimer.isActive() || d->mChargingOn;
+}
+
+/*!
+    \reimp
+*/
+bool HbBatteryIndicator::event(QEvent *e)
+{
+    Q_D(HbBatteryIndicator);
+    if (e->type() == HbEvent::SleepModeEnter) {
+        d->mChargingTimer.stop();
+    } else if (e->type() == HbEvent::SleepModeExit) {
+        if (d->mChargingOn) {
+            d->mChargingTimer.start(250, this);
+        }
+    }
+    return HbWidget::event(e);
+}
+    
 #include "moc_hbbatteryindicator_p.cpp"
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbbatteryindicator_p.h
--- a/src/hbcore/decorators/hbbatteryindicator_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbbatteryindicator_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -50,6 +50,7 @@
 
     inline int type() const { return Type; }
     int level() const;
+    bool isCharging() const;
 
 public slots:
     virtual void createPrimitives();
@@ -57,9 +58,13 @@
 
     void setLevel(int levelPercent);
 
+signals:
+    void levelChanged();
+
 protected:
     void timerEvent(QTimerEvent *event);
     void initStyleOption(HbStyleOptionBatteryIndicator *option) const;
+    bool event(QEvent *event);
 
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbBatteryIndicator)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbindicatorbutton.cpp
--- a/src/hbcore/decorators/hbindicatorbutton.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbindicatorbutton.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -46,7 +46,8 @@
 
 HbIndicatorButtonPrivate::HbIndicatorButtonPrivate() :
     mHandleIcon(0), mDefaultAction(0), mNewEventAction(0), mProgressAction(0), mDeviceDialog(0), 
-    mProgressAnimationFound(false), mNewEventIcon(0), mNewEvent(false), mStyle(0), mIndicatorMenuOpen(false)
+    mProgressAnimationFound(false), mNewEventIcon(0), mNewEvent(false), mStyle(0), mIndicatorMenuOpen(false),
+    mTouchArea(0)
 {
 
 }
@@ -135,24 +136,24 @@
     switch (mStyle)
     {
     case 0:
+        q->setProperty("layout_type", 1);
         q->setAction(mDefaultAction);
-        q->setProperty("layout", 1);
         break;
     case 1:
+        q->setProperty("layout_type", 1);
         q->setAction(mNewEventAction);
-        q->setProperty("layout", 1);
         break;
     case 2:
+        q->setProperty("layout_type", 1);
         q->setAction(mProgressAction);
-        q->setProperty("layout", 1);
         break;
     case 3:
+        q->setProperty("layout_type", 2);
         q->setAction(mProgressAction);
-        q->setProperty("layout", 2);
         break;
     default:
+        q->setProperty("layout_type", 1);
         q->setAction(mDefaultAction);
-        q->setProperty("layout", 1);
         break;
     }
     q->repolish();
@@ -186,7 +187,7 @@
     : HbToolButton(*new HbIndicatorButtonPrivate, parent)
 {
     Q_D(HbIndicatorButton);
-    setProperty("layout", 1);
+    setProperty("layout_type", 1);
     d->init(); 
 
     setAction(d->mDefaultAction);
@@ -234,7 +235,7 @@
 void HbIndicatorButton::currentViewChanged(HbView *view)
 {
     Q_D(HbIndicatorButton);
-    HbIconItem *item = dynamic_cast<HbIconItem *>(d->iconItem);
+    HbIconItem *item = qgraphicsitem_cast<HbIconItem *>(d->iconItem);
     if (item) {
         item->animator().setOwnerView(view);
     }
@@ -246,7 +247,11 @@
     d->mHandleIcon = style()->createPrimitive(HbStyle::P_IndicatorButton_handleindication, this);
     d->mHandleIcon->setVisible(false);
     d->mNewEventIcon = style()->createPrimitive(HbStyle::P_IndicatorButton_eventindication, this);
-    setBackgroundItem(HbStyle::P_IndicatorButton_background); // calls updatePrimitives()
+    d->mTouchArea = style()->createPrimitive(HbStyle::P_IndicatorButton_toucharea, this);
+    QGraphicsObject *touchArea = static_cast<QGraphicsObject*>(d->mTouchArea);
+    touchArea->grabGesture(Qt::TapGesture);
+    ungrabGesture(Qt::TapGesture);
+    d->setBackgroundItem(HbStyle::P_IndicatorButton_background);
 }
 
 void HbIndicatorButton::updatePrimitives()
@@ -257,6 +262,7 @@
     style()->updatePrimitive(backgroundItem(), HbStyle::P_IndicatorButton_background, &option);
     style()->updatePrimitive(d->mHandleIcon, HbStyle::P_IndicatorButton_handleindication, &option);
     style()->updatePrimitive(d->mNewEventIcon, HbStyle::P_IndicatorButton_eventindication, &option);
+    style()->updatePrimitive(d->mTouchArea, HbStyle::P_IndicatorButton_toucharea, &option);
     HbToolButton::updatePrimitives();
 }
 
@@ -312,6 +318,17 @@
     HbToolButton::changeEvent(event);
 }
 
+/*
+  Overloaded hit detection to include touch area
+ */
+bool HbIndicatorButton::hitButton(const QPointF &pos) const
+{
+    Q_D(const HbIndicatorButton);
+    QRectF compRect = d->mTouchArea->boundingRect();
+    compRect.translate(d->mTouchArea->pos());
+    return compRect.contains(pos);
+}
+
 void HbIndicatorButton::handlePress()
 {
 #ifdef HB_EFFECTS
@@ -323,9 +340,7 @@
 void HbIndicatorButton::handleRelease()
 {
     Q_D(HbIndicatorButton);
-    if (isUnderMouse()) {
-        d->showIndicatorMenu();
-    }
+    d->showIndicatorMenu();
 #ifdef HB_EFFECTS
     HbEffect::start(this, "decorator", "released");
 #endif
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbindicatorbutton_p.h
--- a/src/hbcore/decorators/hbindicatorbutton_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbindicatorbutton_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -66,6 +66,7 @@
 protected:
     virtual void initStyleOption(HbStyleOptionIndicatorButton *option) const;
     virtual void changeEvent(QEvent* event);
+    virtual bool hitButton(const QPointF &pos) const;
 
 private slots:
     void handlePress();
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbindicatorbutton_p_p.h
--- a/src/hbcore/decorators/hbindicatorbutton_p_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbindicatorbutton_p_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -62,6 +62,7 @@
     bool mNewEvent;
     int mStyle;
     bool mIndicatorMenuOpen;
+    QGraphicsItem *mTouchArea;
 };
 
 #endif // HBINDICATORBUTTON_P_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbindicatorgroup.cpp
--- a/src/hbcore/decorators/hbindicatorgroup.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbindicatorgroup.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -181,8 +181,8 @@
 
 void HbIndicatorGroupPrivate::startRemovingEffect()
 {
+    Q_Q(HbIndicatorGroup);
 #ifdef HB_EFFECTS
-    Q_Q(HbIndicatorGroup);
     for (int i = 0; i < mRemovedIndicators.size(); ++i) {   
         int index = findIndicatorIcon(mRemovedIndicators[i]);
         if (index >= 0) {
@@ -202,7 +202,7 @@
         }
     }
 #else 
-    updatePrimitives();
+    q->updatePrimitives();
 #endif
 }
 
@@ -231,7 +231,7 @@
     Q_D(HbIndicatorGroup);
     d->init();
     d->mIndicatorType = indicatorType;
-    setProperty("layout", d->mIndicatorType);
+    setProperty("alignment", d->mIndicatorType);
 }
 
 /*
@@ -255,7 +255,7 @@
 {
     Q_D(HbIndicatorGroup);
     for (int i = 0; i < d->mIcons.size(); ++i) {
-        HbIconItem *iconItem = dynamic_cast<HbIconItem *>(d->mIcons.at(i));
+        HbIconItem *iconItem = qgraphicsitem_cast<HbIconItem *>(d->mIcons.at(i));
         if (iconItem) {
             iconItem->animator().setOwnerView(view);
         }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbnavigationbutton.cpp
--- a/src/hbcore/decorators/hbnavigationbutton.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbnavigationbutton.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -33,7 +33,7 @@
 #include "hbstyleoptionnavigationbutton_p.h"
 #include "hbmainwindow_p.h"
 
-HbNavigationButtonPrivate::HbNavigationButtonPrivate()
+HbNavigationButtonPrivate::HbNavigationButtonPrivate() : mTouchArea(0)
 {
     
 }
@@ -70,20 +70,21 @@
 
 void HbNavigationButton::createPrimitives()
 {
-    setBackgroundItem(HbStyle::P_NavigationButton_background); // calls updatePrimitives()
+    Q_D(HbNavigationButton);
+    d->mTouchArea = style()->createPrimitive(HbStyle::P_NavigationButton_toucharea, this);
+    QGraphicsObject *touchArea = static_cast<QGraphicsObject*>(d->mTouchArea);
+    touchArea->grabGesture(Qt::TapGesture);
+    ungrabGesture(Qt::TapGesture);
+    d->setBackgroundItem(HbStyle::P_NavigationButton_background);
 }
 
 void HbNavigationButton::updatePrimitives()
 {
+    Q_D(HbNavigationButton);
     HbStyleOptionNavigationButton option;
     initStyleOption(&option);
-    if (HbDeviceProfile::profile(this).touch()) {
-        style()->updatePrimitive(backgroundItem(), HbStyle::P_NavigationButton_background, &option);
-    } else {
-        // Hide icon & background & show text
-        setEnabled(true);
-        setToolButtonStyle(HbToolButton::ToolButtonText);
-    }
+    style()->updatePrimitive(backgroundItem(), HbStyle::P_NavigationButton_background, &option);
+    style()->updatePrimitive(d->mTouchArea, HbStyle::P_NavigationButton_toucharea, &option);
     HbToolButton::updatePrimitives();
 }
 
@@ -109,6 +110,17 @@
     HbToolButton::changeEvent(event);
 }
 
+/*
+  Overloaded hit detection to include touch area
+ */
+bool HbNavigationButton::hitButton(const QPointF &pos) const
+{
+    Q_D(const HbNavigationButton);
+    QRectF compRect = d->mTouchArea->boundingRect();
+    compRect.translate(d->mTouchArea->pos());
+    return compRect.contains(pos);
+}
+
 void HbNavigationButton::handlePress()
 {
 #ifdef HB_EFFECTS
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbnavigationbutton_p.h
--- a/src/hbcore/decorators/hbnavigationbutton_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbnavigationbutton_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -52,6 +52,7 @@
 protected:
     virtual void initStyleOption(HbStyleOptionNavigationButton *option) const;
     virtual void changeEvent(QEvent* event);
+    virtual bool hitButton(const QPointF &pos) const;
 
 private slots:
     void handlePress();
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbnavigationbutton_p_p.h
--- a/src/hbcore/decorators/hbnavigationbutton_p_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbnavigationbutton_p_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -38,6 +38,9 @@
     virtual ~HbNavigationButtonPrivate();
 
     void init();
+
+private:
+    QGraphicsItem *mTouchArea;
 };
 
 #endif // HBNAVIGATIONBUTTON_P_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbsignalindicator.cpp
--- a/src/hbcore/decorators/hbsignalindicator.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbsignalindicator.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -77,6 +77,7 @@
     mNetworkMode = mode;
     mNetworkStatus = status;
     q->updatePrimitives();
+    emit q->levelChanged(); // this signal should be emitted for any kind of change
 }
 #endif // HB_HAVE_QT_MOBILITY
 
@@ -125,6 +126,7 @@
     if (d->mLevelPercent != levelPercent) {
         d->mLevelPercent = levelPercent;
         updatePrimitives();
+        emit levelChanged();
     }
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbsignalindicator_p.h
--- a/src/hbcore/decorators/hbsignalindicator_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbsignalindicator_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -54,6 +54,9 @@
     virtual void createPrimitives();
     virtual void updatePrimitives();
 
+signals:
+    void levelChanged();
+
 protected:
     void initStyleOption(HbStyleOptionSignalIndicator *option) const;
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbstatusbar.cpp
--- a/src/hbcore/decorators/hbstatusbar.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbstatusbar.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -29,6 +29,7 @@
 #include <hbmainwindow.h>
 #include <hbview.h>
 #include <hbextendedlocale.h>
+#include <hbevent.h>
 
 #include "hbstatusbar_p.h"
 #include "hbstatusbar_p_p.h"
@@ -125,6 +126,15 @@
     q->connect(mIndicatorPrivate, SIGNAL(deactivated(const QList<IndicatorClientInfo> &)),
         q, SIGNAL(deactivated(const QList<IndicatorClientInfo> &)));
 
+    q->connect(mIndicatorPrivate, SIGNAL(activated(const QList<IndicatorClientInfo> &)),
+        q, SLOT(_q_indicatorsChanged()));
+    q->connect(mIndicatorPrivate, SIGNAL(allActivated(const QList<IndicatorClientInfo> &)),
+        q, SLOT(_q_indicatorsChanged()));
+    q->connect(mIndicatorPrivate, SIGNAL(updated(const QList<IndicatorClientInfo> &)),
+        q, SLOT(_q_indicatorsChanged()));
+    q->connect(mIndicatorPrivate, SIGNAL(deactivated(const QList<IndicatorClientInfo> &)),
+        q, SLOT(_q_indicatorsChanged()));
+
     mClockTimerId = q->startTimer(clockUpdateDelay);
     mIndicatorPrivate->startListen();
 
@@ -154,6 +164,31 @@
 
     mIndicatorPrivate = new HbIndicatorPrivate;
     mIndicatorPrivate->init();
+
+    QObject::connect(mSignalIndicator, SIGNAL(levelChanged()), q, SLOT(_q_signalLevelChanged()));
+    QObject::connect(mBatteryIndicator, SIGNAL(levelChanged()), q, SLOT(_q_batteryLevelChanged()));
+}
+
+void HbStatusBarPrivate::_q_signalLevelChanged()
+{
+    Q_Q(HbStatusBar);
+    emit q->contentChanged(HbStatusBar::SignalLevelChanged);
+}
+
+void HbStatusBarPrivate::_q_batteryLevelChanged()
+{
+    Q_Q(HbStatusBar);
+    HbStatusBar::ContentChangeFlags flags = HbStatusBar::BatteryLevelChanged;
+    if (mBatteryIndicator->isCharging()) {
+        flags |= HbStatusBar::BatteryCharging;
+    }
+    emit q->contentChanged(flags);
+}
+
+void HbStatusBarPrivate::_q_indicatorsChanged()
+{
+    Q_Q(HbStatusBar);
+    emit q->contentChanged(HbStatusBar::IndicatorsChanged);
 }
 
 void HbStatusBarPrivate::updateTime()
@@ -173,9 +208,14 @@
     QTime current = QTime::currentTime();
 
     // set time, using a proper formatting
+    QString oldTimeText = mTimeText;
     mTimeText = current.toString(timeFormat);
 
     q->updatePrimitives();
+
+    if (mTimeText != oldTimeText) {
+        emit q->contentChanged(HbStatusBar::TimeChanged);
+    }
 }
 
 #if defined(Q_OS_SYMBIAN)
@@ -216,9 +256,9 @@
  */
 HbStatusBar::~HbStatusBar()
 { 
-	Q_D(HbStatusBar);
-
-	if (d->mClockTimerId != 0) {
+    Q_D(HbStatusBar);
+    
+    if (d->mClockTimerId != 0) {
         killTimer(d->mClockTimerId);
         d->mClockTimerId = 0;
     }
@@ -228,9 +268,9 @@
     Delayed constructor.
  */
 void HbStatusBar::delayedConstruction()
-{
-   Q_D(HbStatusBar);
-   d->delayedConstruction();
+{   
+    Q_D(HbStatusBar);
+    d->delayedConstruction();
 }
 
 void HbStatusBar::propertiesChanged()
@@ -246,19 +286,19 @@
     Q_D(HbStatusBar);
 
     d->mTimeTextItem = style()->createPrimitive(HbStyle::P_StatusBar_timetext, this);
-    setBackgroundItem(HbStyle::P_StatusBar_background);
+    d->setBackgroundItem(HbStyle::P_StatusBar_background);
 
-	d->updateTime();
+    d->updateTime();
 }
 
 void HbStatusBar::updatePrimitives()
 {
     Q_D(HbStatusBar);
-	HbStyleOptionStatusBar option;
-
-	initStyleOption(&option);
+    HbStyleOptionStatusBar option;
+    
+    initStyleOption(&option);
     style()->updatePrimitive(backgroundItem(), HbStyle::P_StatusBar_background, &option);
-	style()->updatePrimitive(d->mTimeTextItem, HbStyle::P_StatusBar_timetext, &option);
+    style()->updatePrimitive(d->mTimeTextItem, HbStyle::P_StatusBar_timetext, &option);
 }
 
 /*
@@ -302,7 +342,7 @@
     Q_D(HbStatusBar);
     if (event->timerId() == d->mClockTimerId) {
         d->updateTime(); // get current time
-	}
+    }
 }
 
 /*!
@@ -346,3 +386,22 @@
     // all gesture events accepted by default
 }
 
+/*!
+    \reimp
+*/
+bool HbStatusBar::event(QEvent *e)
+{
+    Q_D(HbStatusBar);
+    if (e->type() == HbEvent::SleepModeEnter) {
+        if (d->mClockTimerId != 0) {
+            killTimer(d->mClockTimerId);
+            d->mClockTimerId = 0;
+        }
+    } else if (e->type() == HbEvent::SleepModeExit) {
+        d->updateTime();
+        d->mClockTimerId = startTimer(clockUpdateDelay);
+    }
+    return HbWidget::event(e);
+}
+
+#include "moc_hbstatusbar_p.cpp"
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbstatusbar_p.h
--- a/src/hbcore/decorators/hbstatusbar_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbstatusbar_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -39,6 +39,15 @@
     Q_OBJECT
 
 public:
+    enum ContentChangeFlag {
+    	TimeChanged,
+    	BatteryLevelChanged,
+    	SignalLevelChanged,
+    	IndicatorsChanged,
+    	BatteryCharging
+    };
+    Q_DECLARE_FLAGS(ContentChangeFlags, ContentChangeFlag)
+
     explicit HbStatusBar(HbMainWindow *mainWindow, QGraphicsItem *parent = 0);
     virtual ~HbStatusBar();
 
@@ -59,15 +68,23 @@
     void activated(const QList<IndicatorClientInfo> &clientInfo);
     void deactivated(const QList<IndicatorClientInfo> &clientInfo);
     void allActivated(const QList<IndicatorClientInfo> &clientInfo);
+    void contentChanged(HbStatusBar::ContentChangeFlags changeType);
 
 protected:
     void initStyleOption(HbStyleOptionStatusBar *option) const;
     void timerEvent(QTimerEvent *event);
     void gestureEvent(QGestureEvent* e);
+    bool event(QEvent *e);
 
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbStatusBar)
     Q_DISABLE_COPY(HbStatusBar)
+
+    Q_PRIVATE_SLOT(d_func(), void _q_signalLevelChanged())
+    Q_PRIVATE_SLOT(d_func(), void _q_batteryLevelChanged())
+    Q_PRIVATE_SLOT(d_func(), void _q_indicatorsChanged())
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(HbStatusBar::ContentChangeFlags)
+
 #endif // HBSTATUSBAR_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbstatusbar_p_p.h
--- a/src/hbcore/decorators/hbstatusbar_p_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbstatusbar_p_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -46,7 +46,7 @@
     virtual ~HbStatusBarPrivate();
 
     void delayedConstruction();
-	void init();
+    void init();
     void updateTime();
     
 #if defined(Q_OS_SYMBIAN)
@@ -54,7 +54,7 @@
     TInt DoEnvChange();
 #endif    
     
-	int mClockTimerId;
+    int mClockTimerId;
     QString mTimeText;
     QGraphicsItem *mTimeTextItem;
 
@@ -72,6 +72,10 @@
     // Notifications about locale and time changes
     CEnvironmentChangeNotifier *mEnvChangeNotifier;
 #endif    
+
+    void _q_signalLevelChanged();
+    void _q_batteryLevelChanged();
+    void _q_indicatorsChanged();
 };
 
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbtitlebar.cpp
--- a/src/hbcore/decorators/hbtitlebar.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbtitlebar.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -32,7 +32,8 @@
 #include <hbwidgetfeedback.h>
 #include <hbinstance.h>
 #include <hbnamespace.h>
-#include <hbpangesture.h>
+
+#include <hbswipegesture.h>
 
 #include "hbtitlebar_p.h"
 #include "hbtitlebar_p_p.h"
@@ -79,14 +80,14 @@
         mIndicatorButton, SLOT(activateAll(const QList<IndicatorClientInfo> &)));
     q->connect(mMainWindow, SIGNAL(currentViewChanged(HbView*)), q, SLOT(currentViewChanged(HbView*)));
     q->connect(mDefaultNavigationAction, SIGNAL(triggered()), qApp, SLOT(quit()));  
-
-    q->setFlag(QGraphicsItem::ItemIsPanel, true);
 }
 
 void HbTitleBarPrivate::init()
 {
     Q_Q(HbTitleBar);
 
+    q->setFlag(QGraphicsItem::ItemIsPanel, true);
+
     // create title pane
     mTitlePane = new HbTitlePane(q);
     mTitlePane->setZValue(HbPrivate::TitlePaneZValue);
@@ -110,8 +111,8 @@
     
     mPreviousTitleBarProperties = 0; // view not yet ready
 
-    QObject::connect(this->mTitlePane, SIGNAL(panRight()), q, SLOT(gestureRight()));
-    QObject::connect(this->mTitlePane, SIGNAL(panLeft()), q, SLOT(gestureLeft()));
+    QObject::connect(this->mTitlePane, SIGNAL(swipeRight()), q, SLOT(gestureSwipeRight()));
+    QObject::connect(this->mTitlePane, SIGNAL(swipeLeft()), q, SLOT(gestureSwipeLeft()));
 }
 
 void HbTitleBarPrivate::initSceneEventFilters(HbView *view)
@@ -124,7 +125,7 @@
             mTouchAreaItem->setAcceptedMouseButtons(Qt::LeftButton);
             mTouchAreaItem->installSceneEventFilter(q);
             QGraphicsObject *touchAreaItemGraphicsObject = static_cast<QGraphicsObject*>(mTouchAreaItem);
-            touchAreaItemGraphicsObject->grabGesture(Qt::PanGesture);
+            touchAreaItemGraphicsObject->grabGesture(Qt::SwipeGesture);
         }
     } else { // Remove scene event filter
         if (mTouchAreaItem) {
@@ -173,6 +174,7 @@
     d->q_ptr = this;
     d->mMainWindow = mainWindow;
     d->init();
+    setFlag(QGraphicsItem::ItemIsPanel, true);
 }
 
 HbTitleBar::HbTitleBar(HbTitleBarPrivate &dd, HbMainWindow *mainWindow,
@@ -204,8 +206,8 @@
  */
 void HbTitleBar::delayedConstruction()
 {
-       Q_D(HbTitleBar);
-       d->delayedConstruction();
+    Q_D(HbTitleBar);
+    d->delayedConstruction();
 }
 
 /*
@@ -275,17 +277,17 @@
 }
 
 /*
-    gestureRight. Handles left-to-right flick.
-            if(layoutDirection() == Qt::LeftToRight) {
+    gestureSwipeRight. Handles left-to-right flick.
 */
 
-void HbTitleBar::gestureRight()
+void HbTitleBar::gestureSwipeRight()
 {
     Q_D(HbTitleBar);
 
-    if (!minimizable()) {
+    if (!minimizable()) {      
         return;
     }
+
     HbWidgetFeedback::triggered(this, Hb::InstantFlicked);
 
     Position p(position());
@@ -296,7 +298,6 @@
         d->mIndicatorButton->isVisible() &&
         p == HbTitleBar::Original) {
 #ifdef HB_EFFECTS
-        //grabMouse(); // this prevents taps/gestures on top of animating titlebar
         QRectF extRect(scenePos().x(), 0.0, screenSize.width(), 10.0);
         HbEffect::start(this, "titlebar", "minimize", this, "effectFinished", QVariant(), extRect);
 #else // no effects, just do the translation
@@ -306,16 +307,17 @@
 }
 
 /*
-    gestureLeft. Handles right-to-left flick.
+    gestureSwipeLeft. Handles right-to-left flick.
 */
 
-void HbTitleBar::gestureLeft()
+void HbTitleBar::gestureSwipeLeft()
 {
     Q_D(HbTitleBar);
 
     if (!minimizable()) {
         return;
     }
+
     HbWidgetFeedback::triggered(this, Hb::InstantFlicked);
 
     Position p(position());
@@ -327,7 +329,6 @@
         d->mIndicatorButton->isVisible() &&
         p == HbTitleBar::Minimized) {
 #ifdef HB_EFFECTS
-        //grabMouse(); // this prevents taps/gestures on top of animating titlebar
         // effect translates widget from rect's right x-coordinate to left x-coordinate
         QRectF extRect(-handleRect.width(), 0.0, scenePos().x(), 10.0); // height not used in effect
         HbEffect::start(this, "titlebar", "maximize", this, "effectFinished", QVariant(), extRect);
@@ -434,7 +435,7 @@
 
     Q_D(HbTitleBar);
     bool filterOutEvent = false;
-    switch(event->type()){
+    switch(event->type()){    
     case QEvent::GraphicsSceneMousePress:
         HbWidgetFeedback::triggered(this, Hb::InstantPressed);
         event->accept(); //we need to catch the mouse release and move events also
@@ -462,24 +463,23 @@
             HbWidgetFeedback::triggered(this, Hb::InstantReleased);
         }
         filterOutEvent = true;
-        break;
+        break;    
     }
     case QEvent::Gesture: {
         QGestureEvent *gestureEvent = static_cast<QGestureEvent*>(event);
-        if (HbPanGesture *pan = qobject_cast<HbPanGesture*>(gestureEvent->gesture(Qt::PanGesture))) {
-            if (pan->state() == Qt::GestureFinished) {
-                if(pan->sceneDelta().x() < -0) {
-                    gestureLeft();
-                }
-                else if (pan->sceneDelta().x() > 0) {
-                    gestureRight();
-                }
-                gestureEvent->accept();
+        HbSwipeGesture *swipe = qobject_cast<HbSwipeGesture*>(gestureEvent->gesture(Qt::SwipeGesture));
+        if(swipe) {
+            if(swipe->sceneHorizontalDirection() == QSwipeGesture::Right) {
+                gestureSwipeRight();
+            } else if(swipe->sceneHorizontalDirection() == QSwipeGesture::Left) {
+                gestureSwipeLeft();
             }
+            gestureEvent->accept();
         }
+
         filterOutEvent = true;
         break;
-    }
+    }   
     default:
         break;
     }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbtitlebar_p.h
--- a/src/hbcore/decorators/hbtitlebar_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbtitlebar_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -80,8 +80,8 @@
     void allActivated(const QList<IndicatorClientInfo> &clientInfo);
 
 public slots:
-    void gestureRight();
-    void gestureLeft();
+    void gestureSwipeRight();
+    void gestureSwipeLeft();
     void currentViewChanged(HbView *view);
 #ifdef HB_EFFECTS
     void effectFinished(const HbEffect::EffectStatus &status);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbtitlepane.cpp
--- a/src/hbcore/decorators/hbtitlepane.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbtitlepane.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -34,7 +34,9 @@
 #include <hbview.h>
 #include <hbmenu.h>
 #include <hbtapgesture.h>
+#include <hbswipegesture.h>
 #include <hbpangesture.h>
+#include <hbmarqueeitem.h>
 
 #include <QGestureEvent>
 #include <QGesture>
@@ -52,30 +54,22 @@
 */
 
 HbTitlePanePrivate::HbTitlePanePrivate() :
-    mText(),
-    mTextItem(0),
-    mToggled(false),
-    mIcon(0),
-    mMode(QIcon::Normal)
+    mText(), mTextItem(0), mToggled(false), mIcon(0), mMode(QIcon::Normal), mTouchArea(0)
 {
 
 }
 
 void HbTitlePanePrivate::delayedConstruction()
 {
-    Q_Q(HbTitlePane);
-    q->grabGesture(Qt::TapGesture);
-    q->grabGesture(Qt::PanGesture);
 }
 
 void HbTitlePanePrivate::init()
 {
     Q_Q(HbTitlePane);
 
+    createPrimitives();
     q->setAcceptedMouseButtons(Qt::LeftButton);
     q->setText(HbApplication::applicationName());
-
-    createPrimitives();
 }
 
 void HbTitlePanePrivate::toggle(bool on)
@@ -89,22 +83,29 @@
 
     mTextItem = q->style()->createPrimitive(HbStyle::P_TitlePane_text, q);
     mIcon = q->style()->createPrimitive(HbStyle::P_TitlePane_icon, q);
-    q->setBackgroundItem(HbStyle::P_TitlePane_background); // calls updatePrimitives
+    mTouchArea = q->style()->createPrimitive(HbStyle::P_TitlePane_toucharea, q);
+
+    QGraphicsObject *touchArea = static_cast<QGraphicsObject*>(mTouchArea);
+    touchArea->grabGesture(Qt::TapGesture);
+    touchArea->grabGesture(Qt::SwipeGesture);
+    touchArea->grabGesture(Qt::PanGesture);
+
+    q->ungrabGesture(Qt::TapGesture);
+    q->ungrabGesture(Qt::SwipeGesture);
+    q->ungrabGesture(Qt::PanGesture);
+
+    setBackgroundItem(HbStyle::P_TitlePane_background);
 }
 
 void HbTitlePanePrivate::updatePrimitives()
 {
     Q_Q(HbTitlePane);
     HbStyleOptionTitlePane option;
-
-    if (q->backgroundItem() == 0 || mTextItem == 0) {
-        return;
-    }
-
     q->initStyleOption(&option);
     q->style()->updatePrimitive(q->backgroundItem(), HbStyle::P_TitlePane_background, &option);
     q->style()->updatePrimitive(mTextItem, HbStyle::P_TitlePane_text, &option);
     q->style()->updatePrimitive(mIcon, HbStyle::P_TitlePane_icon, &option);
+    q->style()->updatePrimitive(mTouchArea, HbStyle::P_TitlePane_toucharea, &option);
 }
 
 // ======== MEMBER FUNCTIONS ========
@@ -187,6 +188,10 @@
     if (tmp != d->mText) {
         d->mText = tmp;
         updatePrimitives();
+        HbMarqueeItem* marquee = qgraphicsitem_cast<HbMarqueeItem*>(d->mTextItem);
+        if (marquee) {
+            marquee->startAnimation();
+        }
     }
 }
 
@@ -220,9 +225,23 @@
 {
     Q_D(HbTitlePane);
 
-    if(HbTapGesture *tap = qobject_cast<HbTapGesture*>(event->gesture(Qt::TapGesture))) {
+    if (mainWindow() && mainWindow()->currentView()) {
+        if (mainWindow()->currentView()->menu()->isEmpty()) {
+            return;
+        }
+    }
+    HbTapGesture *tap = qobject_cast<HbTapGesture*>(event->gesture(Qt::TapGesture));
+    HbPanGesture *pan = qobject_cast<HbPanGesture*>(event->gesture(Qt::PanGesture));
+    HbSwipeGesture *swipe = qobject_cast<HbSwipeGesture*>(event->gesture(Qt::SwipeGesture));
+
+    if(tap) {
+
         switch(tap->state()) {
         case Qt::GestureStarted: {
+                if (scene()) {
+                    scene()->setProperty(HbPrivate::OverridingGesture.latin1(),Qt::TapGesture);
+                    tap->setProperty(HbPrivate::ThresholdRect.latin1(), mapRectToScene(boundingRect()).toRect());
+                }
                 d->mMode = QIcon::Active;
                 updatePrimitives();
 #ifdef HB_EFFECTS
@@ -232,7 +251,24 @@
                 d->toggle(true);
                 break;
             }
+        case Qt::GestureCanceled: {
+                if (scene()) {
+                    scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
+                }
+                HbWidgetFeedback::triggered(this, Hb::InstantReleased);
+
+                if (d->mMode != QIcon::Normal) {
+                    d->mMode = QIcon::Normal;
+                    updatePrimitives();
+                }
+                d->toggle(false);
+
+                break;
+            }
         case Qt::GestureFinished: {
+                if (scene()) {
+                    scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
+                }
                 d->mMode = QIcon::Selected;
                 updatePrimitives();
 #ifdef HB_EFFECTS
@@ -248,66 +284,21 @@
             }
         default:
             break;
-        }        
-    } else if (HbPanGesture *pan = qobject_cast<HbPanGesture*>(event->gesture(Qt::PanGesture))) {
-        QPointF pointerPos = mapFromScene(event->mapToGraphicsScene(pan->startPos() + pan->offset()));
-        switch(pan->state()) {
-        case Qt::GestureUpdated: {
-                if (boundingRect().contains(pointerPos)) {
-                    if (d->mMode != QIcon::Active) {
-                        d->mMode = QIcon::Active;
-                        updatePrimitives();
-                    }
-                } else {
-                    if (d->mMode != QIcon::Normal) {
-                        d->mMode = QIcon::Normal;
-                        updatePrimitives();
-                    }
-                }
-                if (boundingRect().contains(pointerPos) && !d->mToggled) {
-                    HbWidgetFeedback::triggered(this, Hb::InstantPressed);
-                    d->toggle(true);
-                } else if (!boundingRect().contains(pointerPos) && d->mToggled) {
-                    HbWidgetFeedback::triggered(this, Hb::InstantReleased);
-                    d->toggle(false);
-                }
-                break;
-            }
-        case Qt::GestureFinished: {
+        }
+    } else if(pan) {
+       if(d->mMode != QIcon::Normal) {
+           HbWidgetFeedback::triggered(this, Hb::InstantReleased);
+           d->toggle(false);
+           d->mMode = QIcon::Normal;
+           updatePrimitives();
+        }
+   } else if(swipe) {
+        HbWidgetFeedback::triggered(this, Hb::InstantFlicked);
 
-                if(pan->sceneDelta().x() > 0) {
-                    emit panRight();
-                }
-                else if(pan->sceneDelta().x() < 0) {
-                    emit panLeft();
-                }
-
-                if (boundingRect().contains(pointerPos) && !d->mToggled) {
-                    d->mMode = QIcon::Selected;
-                    updatePrimitives();
-#ifdef HB_EFFECTS
-                    HbEffect::start(this, "decorator", "latched");
-#endif
-                    if (d->mToggled) {
-                        HbWidgetFeedback::triggered(this, Hb::InstantReleased);
-                    }
-
-                    HbWidgetFeedback::triggered(this, Hb::InstantClicked);
-                    QPointF launchPos(scenePos().x() + boundingRect().width() / 2 + 3, scenePos().y() + boundingRect().height());
-                    emit launchPopup(launchPos);
-                }
-                else {
-                    if (d->mMode != QIcon::Normal) {
-                        HbWidgetFeedback::triggered(this, Hb::InstantReleased);
-                        d->toggle(false);
-                        d->mMode = QIcon::Normal;
-                        updatePrimitives();
-                    }
-                }
-                break;
-            }
-        default:
-            break;
+        if(swipe->sceneHorizontalDirection() == QSwipeGesture::Right) {
+            emit swipeRight();
+        } else if(swipe->sceneHorizontalDirection() == QSwipeGesture::Left) {
+            emit swipeLeft();
         }
     }
 }
@@ -376,12 +367,12 @@
     } else {
         if (itemName == "background") {
             return this->backgroundItem();
-        }
-        else if (itemName == "text") {
+        } else if (itemName == "text") {
             return d->mTextItem;
-        }
-        else if (itemName == "icon") {
+        } else if (itemName == "icon") {
             return d->mIcon;
+        } else if (itemName == "toucharea") {
+            return d->mTouchArea;
         } else {
             return 0;
         }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbtitlepane_p.h
--- a/src/hbcore/decorators/hbtitlepane_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbtitlepane_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -54,8 +54,8 @@
 signals:
     void launchPopup(const QPointF &pos);
     void visibilityChanged();
-    void panLeft();
-    void panRight();
+    void swipeLeft();
+    void swipeRight();
 
 public slots:
     void setText(const QString &text);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/decorators/hbtitlepane_p_p.h
--- a/src/hbcore/decorators/hbtitlepane_p_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/decorators/hbtitlepane_p_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -48,6 +48,7 @@
     QGraphicsItem *mIcon;
 
     QIcon::Mode mMode;
+    QGraphicsItem *mTouchArea;
 };
 
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/devicedialogbase/devicedialogbase.pri
--- a/src/hbcore/devicedialogbase/devicedialogbase.pri	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogbase.pri	Tue Jul 06 14:36:53 2010 +0300
@@ -52,6 +52,7 @@
 PRIVATE_HEADERS += $$PWD/hbdeleteguardsymbian_p.h
 PRIVATE_HEADERS += $$PWD/hbdevicedialogconnecthelper_p.h
 PRIVATE_HEADERS += $$PWD/hbdevicedialogconnecthelper_p_p.h
+PRIVATE_HEADERS += $$PWD/hbdevicedialoglaunchhelper_p.h
 
 SOURCES += $$PWD/hbsymbianvariant.cpp
 SOURCES += $$PWD/hbdevicedialogsymbian.cpp 
@@ -64,6 +65,7 @@
 SOURCES += $$PWD/hbtextresolversymbian.cpp
 SOURCES += $$PWD/hbdeleteguardsymbian.cpp
 SOURCES += $$PWD/hbdevicedialogconnecthelper.cpp
+SOURCES += $$PWD/hbdevicedialoglaunchhelper.cpp
 }
 
 !symbian {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -39,7 +39,7 @@
 #include <hbinstance.h>
 #include <hbpopup.h>
 #include <hbgraphicsscene.h>
-#include <hbcorepskeys_p.h>
+#include <hbcorepskeys_r.h>
 #if defined(Q_OS_SYMBIAN)
 #include <coemain.h>
 #include <coecntrl.h>
@@ -166,8 +166,16 @@
     bool recycled(true);
     int error(0);
 
+#if defined(Q_OS_SYMBIAN)
+    // Speed-up search by specifying a file name
+    QString pluginBaseFileName("HbIndicatorMenuPlugin");
+#else // Q_OS_SYMBIAN
+    QString pluginBaseFileName;
+#endif // Q_OS_SYMBIAN
+
     HbDeviceDialogInterface *deviceDialogIf =
-        mPluginManager.createWidget(QString(indicatorMenu), QVariantMap(), recycled, error);
+        mPluginManager.createWidget(QString(indicatorMenu), QVariantMap(), pluginBaseFileName,
+            QString(), recycled, error);
     if (deviceDialogIf) {
         connectIndicatorStatus(deviceDialogIf);
         mPluginManager.freeWidget(deviceDialogIf);
@@ -535,22 +543,23 @@
 {
     parameters.mError = HbDeviceDialogNoError;
 
-    if (!mPluginManager.loadPlugin(parameters.mType)) {
+    QString pluginFilePath;
+    if (!mPluginManager.loadPlugin(parameters.mType, QString(), &pluginFilePath)) {
         parameters.mError = HbDeviceDialogNotFoundError;
         return 0;
     }
 
-    const HbDeviceDialogPlugin &plugin = mPluginManager.plugin(parameters.mType);
+    const HbDeviceDialogPlugin &plugin = mPluginManager.plugin(pluginFilePath);
     if (!plugin.deviceDialogInfo(parameters.mType, parameters.mData, &deviceDialogInfo)) {
         // Ensure plugin returns valid error code
         parameters.mError = checkpluginerror(plugin.error());
-        mPluginManager.unloadPlugin(parameters.mType);
+        mPluginManager.unloadPlugin(pluginFilePath);
         return 0;
     }
 
     if (!checkDialogInfo(deviceDialogInfo)) {
         parameters.mError = HbDeviceDialogGeneralError;
-        mPluginManager.unloadPlugin(parameters.mType);
+        mPluginManager.unloadPlugin(pluginFilePath);
         return 0;
     }
 
@@ -560,7 +569,7 @@
         addSecurityCredentials(parameters, credentials);
         if (!plugin.accessAllowed(parameters.mType, parameters.mData, credentials)) {
             parameters.mError = HbDeviceDialogAccessDeniedError;
-            mPluginManager.unloadPlugin(parameters.mType);
+            mPluginManager.unloadPlugin(pluginFilePath);
             return 0;
         }
     }
@@ -569,7 +578,7 @@
     if (deviceDialogInfo.flags & HbDeviceDialogPlugin::SingleInstance) {
         if (isShowing(parameters.mType)) {
             parameters.mError = HbDeviceDialogAlreadyExists;
-            mPluginManager.unloadPlugin(parameters.mType);
+            mPluginManager.unloadPlugin(pluginFilePath);
             return 0;
         }
     }
@@ -578,12 +587,12 @@
     // first time it's shown.
     bool recycled = (deviceDialogInfo.group == HbDeviceDialogPlugin::IndicatorGroup);
     HbDeviceDialogInterface *deviceDialogIf =
-        mPluginManager.createWidget(parameters.mType, parameters.mData, recycled,
-            parameters.mError);
+        mPluginManager.createWidget(parameters.mType, parameters.mData, QString(), pluginFilePath,
+        recycled, parameters.mError);
 
     // Decrease plugin reference count increased by loadPlugin() above. Unload takes place when
     // device dialog widget is deleted.
-    mPluginManager.unloadPlugin(parameters.mType);
+    mPluginManager.unloadPlugin(pluginFilePath);
 
     if (!deviceDialogIf){
         parameters.mError = checkpluginerror(parameters.mError);
@@ -793,7 +802,7 @@
     
     if (showingSecurity && !moreDialogs) {
 #if defined(Q_OS_SYMBIAN)
-        doMoveToForeground(false, ECoeWinPriorityAlwaysAtFront-1);        
+        doMoveToForeground(false, ECoeWinPriorityAlwaysAtFront);        
 #endif
     }    
     TRACE_EXIT
@@ -808,7 +817,7 @@
     if (event->type() == QEvent::ApplicationActivate) {
 #if defined(Q_OS_SYMBIAN)    
         RWindowGroup &rootWindowGroup = CCoeEnv::Static()->RootWin();
-        if (rootWindowGroup.OrdinalPriority() == ECoeWinPriorityAlwaysAtFront-1) {
+        if (rootWindowGroup.OrdinalPriority() == ECoeWinPriorityAlwaysAtFront) {
             moveToForeground(true);
         }
 #endif // Q_OS_SYMBIAN         
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager.cpp
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -50,8 +50,6 @@
     match each loadPlugin() with a corresponding unloadPlugin(). Each widget created
     createWidget() should be freed by freeWidget();
 
-    HbDeviceDialogPluginManager can preload plugins into memory by a preloadPlugins() function.
-    Plugins in file system are scanned and those returning preload flag are loaded into memory.
     Plugins may also specify a keep loaded flag. These are kept loaded in memory after they
     have been loaded first time.
 */
@@ -73,8 +71,9 @@
     int readOnlyPaths;
     mPluginPathList = pluginPathList("/devicedialogs/", readOnlyPaths);
 
-    // Scan only read-only drives at startup to ensure installed plugins cannot affect device boot
-    for(int i = 0; i < readOnlyPaths; i++) {
+    // Scan only read-only drives + allow eclipsing at startup to ensure installed plugins cannot
+    // affect device boot
+    for(int i = 0; i < mPluginPathList.count(); i++) {
         updateCachePath(mPluginPathList.at(i), true);
     }
     TRACE_EXIT
@@ -90,36 +89,30 @@
 }
 
 /*
-    Preloads plugins into memory.
-*/
-void HbDeviceDialogPluginManager::preloadPlugins()
-{
-    TRACE_ENTRY
-    // Check if preloading is disabled
-    if (mFlags & HbDeviceDialogPluginManager::NoPreloadFlag) {
-        return;
-    }
-
-    QString unused;
-    // Scan plugins and load those that request preloading
-    scanPlugins(&HbDeviceDialogPluginManager::preloadPluginCallback, unused, false);
-    TRACE_EXIT
-}
-
-/*
     Creates a device dialog widget. Plugin is loaded into memory if it's not already loaded.
     \a deviceDialogType contains device dialog type. \a parameters contains widget parameters.
-    \a error receives an error code if widget couldn't be created. Returns pointer to widget
-    or null on error.
+    \a baseFileName limits search for certain file name. \a pluginFilePath contains a plugin
+    file path, if empty a search is performed. \a error receives an error code if
+    widget couldn't be created. Returns pointer to widget or null on error.
 */
 HbDeviceDialogInterface *HbDeviceDialogPluginManager::createWidget(const QString &deviceDialogType,
-    const QVariantMap &parameters, bool &recycled, int &error)
+    const QVariantMap &parameters, const QString &baseFileName, const QString &pluginFilePath,
+    bool &recycled, int &error)
 {
     TRACE_ENTRY
     error = HbDeviceDialogNoError;
     HbDeviceDialogInterface *widgetIf = 0;
-    if (loadPlugin(deviceDialogType)) {
-        PluginInfo &pluginInfo = mPlugins[findPlugin(deviceDialogType)];
+    QString filePath;
+    bool loaded;
+    if (!pluginFilePath.isEmpty()) {
+        incPluginRefCount(pluginFilePath);
+        filePath = pluginFilePath;
+        loaded = true;
+    } else {
+        loaded = loadPlugin(deviceDialogType, baseFileName, &filePath);
+    }
+    if (loaded) {
+        PluginInfo &pluginInfo = mPlugins[findPlugin(filePath)];
         // Check if widget reuse is requested
         if (recycled) {
             pluginInfo.mFlags |= PluginInfo::RecycleWidget; // freeWidget() will keep the widget
@@ -141,9 +134,7 @@
                 qobject_cast<HbDeviceDialogPluginInterface*>(pluginInstance);
             widgetIf = pluginIf->createDeviceDialog(deviceDialogType, parameters);
             if (widgetIf) {
-                // Add a dynamic property to be able to find plugin from a widget
-                widgetIf->deviceDialogWidget()->setProperty(deviceDialogTypePropertyName,
-                    QVariant(deviceDialogType));
+                pluginInfo.mWidgets.append(widgetIf);
                 pluginInfo.mRefCount++;
             } else {
                 error = static_cast<HbDeviceDialogPlugin *>(pluginInstance)->error();
@@ -174,16 +165,9 @@
     TRACE_ENTRY
     if (widget) {
         // Check if widget should be reused
-        QObject *obj = widget->deviceDialogWidget();
-        QString deviceDialogType = obj->property(deviceDialogTypePropertyName).toString();
-        int index = findPlugin(deviceDialogType);
+        int index = findPlugin(widget);
         Q_ASSERT(index >= 0);
         PluginInfo &pluginInfo = mPlugins[index];
-        // Get signal sender for the widget
-        QObject *sender = widget->signalSender();
-        if (!sender) {
-            sender = obj;
-        }
         if (pluginInfo.mFlags & PluginInfo::RecycleWidget &&
             pluginInfo.mRecycledWidget == 0) {
             pluginInfo.mRecycledWidget = widget;
@@ -201,57 +185,78 @@
 
 /*
     Loads a plugin into memory. \a deviceDialogType contains device dialog type of the plugin.
-    If plugin is already loaded, only reference count is increased. Returns true on success
-    and false on failure.
+    \a baseFileName limits the search to a certain file name. \a pluginFilePath contains plugin
+    file path on return. If plugin is already loaded, only reference count is increased.
+    Returns true on success and false on failure.
 */
-bool HbDeviceDialogPluginManager::loadPlugin(const QString &deviceDialogType)
+bool HbDeviceDialogPluginManager::loadPlugin(const QString &deviceDialogType, const QString &baseFileName,
+    QString *pluginFilePath)
 {
     TRACE_ENTRY_ARGS(deviceDialogType)
-    // If plugin is not loaded, try to load it
-    int index = findPlugin(deviceDialogType);
-    if (index < 0) {
-        // Check if plugin file name is in cache
-        bool loaded = false;
-        const QString filePath = mNameCache.find(deviceDialogType);
-        if (!filePath.isEmpty()) {
-            TRACE("cache hit")
+    QString baseNameWithExt(baseFileName);
+    if (!baseNameWithExt.isEmpty()) {
+        // Add extension to file name
+        baseNameWithExt.append(fileNameExtension());
+    }
+    // Search name cache
+    bool loaded = false;
+    QString filePath = mNameCache.find(deviceDialogType, baseNameWithExt);
+    if (!filePath.isEmpty()) {
+        TRACE("cache hit")
+        int index = findPlugin(filePath);
+        if (index >= 0) {
+            loaded = true;
+            // Plugin is already loaded, increase reference count
+            mPlugins[index].mRefCount++;
+        } else {
             loaded = scanPlugin(&HbDeviceDialogPluginManager::loadPluginCallback, deviceDialogType,
                 filePath);
-            // If plugin wasn't loaded, the cache has stale information. Rescan the directory.
-            if (!loaded) {
-                TRACE("cache stale")
-                updateCachePath(filePath);
+        }
+        // If plugin wasn't loaded, the cache has stale information. Rescan the directory.
+        if (!loaded) {
+            TRACE("cache stale")
+            updateCachePath(filePath);
+        }
+    }
+    if (!loaded) {
+        TRACE("cache miss")
+        // Plugin name wasn't in cache, try to find it
+        filePath = scanPlugins(deviceDialogType, baseNameWithExt);
+        if (!filePath.isEmpty()) {
+            int index = findPlugin(filePath);
+            if (index >= 0) {
+                loaded = true;
+                // Plugin is already loaded, increase reference count
+                mPlugins[index].mRefCount++;
+            } else {
+                loaded = scanPlugin(&HbDeviceDialogPluginManager::loadPluginCallback, deviceDialogType,
+                    filePath);
             }
         }
-        if (!loaded) {
-            TRACE("cache miss")
-            // Plugin name wasn't in cache, try to find it
-            scanPlugins(&HbDeviceDialogPluginManager::loadPluginCallback, deviceDialogType);
-            int i = findPlugin(deviceDialogType);
-            if (i >= 0) {
-                // Plugin was found, update plugin name cache by scanning the directory
-                updateCachePath(mPlugins[i].mLoader->fileName());
-            }
+        if (loaded) {
+            // Plugin was found, update plugin name cache by scanning the directory
+            updateCachePath(filePath);
         }
-    } else {
-        // Plugin is already loaded, increase reference count
-        mPlugins[index].mRefCount++;
+    }
+    TRACE("loaded" << loaded)
+
+    if (loaded) {
+        *pluginFilePath = filePath;
     }
     TRACE_EXIT
-    // Return true if plugin is loaded
-    return findPlugin(deviceDialogType) >= 0;
+    return loaded;
 }
 
 /*
     Unloads plugin from memory. Each loadPlugin() should be matched by unloadPlugin(). Plugin is
-    unloaded from memory if reference count becomes 0. \a deviceDialogType contains device dialog
-    type of the plugin. Returns true on success and false on failure.
+    unloaded from memory if reference count becomes 0. \a pluginFilePath contains plugin file name
+    and path. Returns true on success and false on failure.
 */
-bool HbDeviceDialogPluginManager::unloadPlugin(const QString &deviceDialogType)
+bool HbDeviceDialogPluginManager::unloadPlugin(const QString &pluginFilePath)
 {
-    TRACE_ENTRY_ARGS(deviceDialogType)
+    TRACE_ENTRY_ARGS(pluginFilePath)
     bool removed = false;
-    int index = findPlugin(deviceDialogType);
+    int index = findPlugin(pluginFilePath);
     if (index >= 0) {
         PluginInfo &pluginInfo = mPlugins[index];
         if (--pluginInfo.mRefCount == 0) {
@@ -268,11 +273,11 @@
     deviceDialog type of the plugin.
 */
 const HbDeviceDialogPlugin &HbDeviceDialogPluginManager::plugin(
-    const QString &deviceDialogType)
+    const QString &pluginFilePath)
 {
     TRACE_ENTRY
     // Plugin has to be loaded when this function is called
-    int index = findPlugin(deviceDialogType);
+    int index = findPlugin(pluginFilePath);
     Q_ASSERT(index >= 0);
 
     const PluginInfo &pluginInfo = mPlugins[index];
@@ -281,22 +286,36 @@
     return *qobject_cast<HbDeviceDialogPlugin*>(pluginInstance);
 }
 
-// Scan plugins in file system
-void HbDeviceDialogPluginManager::scanPlugins(PluginScanCallback func, const QString &deviceDialogType, bool stopIfFound)
+// Scan plugins in file system. Returns plugin file path.
+QString HbDeviceDialogPluginManager::scanPlugins(const QString &deviceDialogType,
+    const QString &baseFileName)
 {
     TRACE_ENTRY
     const QString fileNameFilter = pluginFileNameFilter();
+    QString pluginFileName(baseFileName);
+    if (!pluginFileName.isEmpty()) {
+        // Add extension to file name
+        pluginFileName.append(fileNameExtension());
+    }
 
+    QString result;
     foreach(const QString &path, mPluginPathList) {
         QDir pluginDir(path, fileNameFilter, QDir::NoSort, QDir::Files | QDir::Readable);
         foreach(const QString &fileName, pluginDir.entryList()) {
-            if (scanPlugin(func, deviceDialogType, pluginDir.absoluteFilePath(fileName)) &&
-                stopIfFound) {
-                break;
+            if (pluginFileName.isEmpty() || HbPluginNameCache::compare(pluginFileName, fileName) == 0) {
+                const QString current(pluginDir.absoluteFilePath(fileName));
+                if (scanPlugin(&HbDeviceDialogPluginManager::scanPluginCallback, deviceDialogType,
+                    current)) {
+                    result = current;
+                    if (pluginFileName.isEmpty()) {
+                        pluginFileName = fileName;
+                    }
+                }
             }
         }
     }
     TRACE_EXIT
+    return result;
 }
 
 // Scan a plugin. Return true if plugin was loaded.
@@ -324,32 +343,6 @@
     return loaded;
 }
 
-// Callback for scanPlugins(). Load plugin if it has a preload flag.
-HbLockedPluginLoader *HbDeviceDialogPluginManager::preloadPluginCallback(HbLockedPluginLoader *loader,
-    const QString &unused)
-{
-    TRACE_ENTRY
-    Q_UNUSED(unused);
-
-    QObject *pluginInstance = loader->instance();
-    HbDeviceDialogPlugin *plugin = qobject_cast<HbDeviceDialogPlugin*>(pluginInstance);
-
-    HbDeviceDialogPlugin::PluginFlags flags = plugin->pluginFlags();
-    if (flags & HbDeviceDialogPlugin::PreloadPlugin) {
-        // Save preloaded plugin into a list
-        PluginInfo pluginInfo;
-        pluginInfo.mTypes = plugin->deviceDialogTypes();
-        pluginInfo.mPluginFlags = flags;
-        pluginInfo.mLoader = loader;
-        loader = 0;
-        pluginInfo.mRefCount++; // this keeps plugin loaded in memory
-        mPlugins.append(pluginInfo);
-        pluginInfo.mLoader = 0; // ownership was transferred to the list
-    }
-    TRACE_EXIT
-    return loader;
-}
-
 // Callback for scanPlugins(). Load plugin for device dialog type.
 HbLockedPluginLoader *HbDeviceDialogPluginManager::loadPluginCallback(HbLockedPluginLoader *loader,
     const QString &deviceDialogType)
@@ -362,7 +355,6 @@
     if (types.contains(deviceDialogType)) {
         // Save plugin into a list
         PluginInfo pluginInfo;
-        pluginInfo.mTypes = types;
         pluginInfo.mPluginFlags = plugin->pluginFlags();
         pluginInfo.mLoader = loader;
         loader = 0;
@@ -380,13 +372,31 @@
     return loader;
 }
 
+// Callback for scanPlugins(). Check whether plugin implements device dialog type.
+HbLockedPluginLoader *HbDeviceDialogPluginManager::scanPluginCallback(HbLockedPluginLoader *loader,
+    const QString &deviceDialogType)
+{
+    TRACE_ENTRY
+    QObject *pluginInstance = loader->instance();
+    HbDeviceDialogPlugin *plugin = qobject_cast<HbDeviceDialogPlugin*>(pluginInstance);
+
+    QStringList types = plugin->deviceDialogTypes();
+    if (types.contains(deviceDialogType)) {
+        loader->unload();
+        delete loader;
+        loader = 0;
+    }
+    TRACE_EXIT
+    return loader;
+}
+
 // Find index of a plugin
-int HbDeviceDialogPluginManager::findPlugin(const QString &deviceDialogType) const
+int HbDeviceDialogPluginManager::findPlugin(const QString &pluginFilePath) const
 {
     TRACE_ENTRY
     int count = mPlugins.count();
     for(int i = 0; i < count; i++) {
-        if (mPlugins.at(i).mTypes.contains(deviceDialogType)) {
+        if (HbPluginNameCache::compare(mPlugins.at(i).mLoader->fileName(), pluginFilePath) == 0) {
             TRACE_EXIT_ARGS(i);
             return i;
         }
@@ -395,6 +405,29 @@
     return -1;
 }
 
+// Find index of a plugin
+int HbDeviceDialogPluginManager::findPlugin(HbDeviceDialogInterface* widget) const
+{
+    TRACE_ENTRY
+    int count = mPlugins.count();
+    for(int i = 0; i < count; i++) {
+        if (mPlugins.at(i).mWidgets.contains(widget)) {
+            TRACE_EXIT_ARGS(i);
+            return i;
+        }
+    }
+    TRACE_EXIT_ARGS(-1);
+    return -1;
+}
+
+// Increase plugin reference count
+void HbDeviceDialogPluginManager::incPluginRefCount(const QString &pluginFilePath)
+{
+    int index = findPlugin(pluginFilePath);
+    Q_ASSERT(index >= 0);
+    mPlugins[index].mRefCount++;
+}
+
 // Free widgets that are kept for re-use. Widget reuse is a performance optimization
 // to get widgets to appear faster.
 void HbDeviceDialogPluginManager::freeRecycleWidgets()
@@ -411,17 +444,26 @@
 }
 
 // Update plugin name cache watch/scan list
-void HbDeviceDialogPluginManager::updateCachePath(const QString &path, bool updateReadOnly)
+void HbDeviceDialogPluginManager::updateCachePath(const QString &path, bool firstScan)
 {
     QString dirPath = HbPluginNameCache::directoryPath(path);
     QFileInfo fileInfo(dirPath);
     if (fileInfo.exists()) {
         // If directory is writable, watch it. Otherwise scan it only once.
         if (fileInfo.isWritable()) {
-            mNameCache.addWatchPath(dirPath);
+            HbPluginNameCache::ScanParameters::Options scanOptions =
+                HbPluginNameCache::ScanParameters::NoOptions;
+            Q_UNUSED(firstScan)
+#if defined(Q_OS_SYMBIAN)
+            if (firstScan) {
+                scanOptions = HbPluginNameCache::ScanParameters::LimitToSet;
+            }
+#endif // defined(Q_OS_SYMBIAN)
+            mNameCache.addWatchPath(HbPluginNameCache::ScanParameters(dirPath, scanOptions));
         } else {
-            if (updateReadOnly) {
-                mNameCache.scanDirectory(dirPath);
+            if (firstScan) {
+                HbPluginNameCache::ScanParameters parameters(path, HbPluginNameCache::ScanParameters::AddToLimitSet);
+                mNameCache.scanDirectory(parameters);
             }
         }
     } else {
@@ -446,7 +488,7 @@
         pluginPathList << path;
     }
 #elif defined(Q_OS_WIN32) || defined(Q_OS_UNIX)
-    pluginPathList << qApp->applicationDirPath() + '/' << HB_PLUGINS_DIR + subDir;
+    pluginPathList <<  HB_PLUGINS_DIR + subDir << qApp->applicationDirPath() + '/';
 #endif
     readOnlyPaths = trimPluginPathList(pluginPathList);
     // Plugin name caching differentiates directory and file names by trailing slash in a name
@@ -461,14 +503,22 @@
 // Generate plugin file name filter
 QString HbDeviceDialogPluginManager::pluginFileNameFilter()
 {
+    QString filter("*");
+    filter.append(fileNameExtension());
+    return filter;
+}
+
+// Generate file name extension
+QString HbDeviceDialogPluginManager::fileNameExtension()
+{
 #if defined(Q_OS_SYMBIAN)
-    return QString("*.qtplugin");
+    return QString(".qtplugin");
 #elif defined(Q_OS_MAC)
-    return QString("*.dylib");
+    return QString(".dylib");
 #elif defined(Q_OS_WIN32)
-    return QString("*.dll");
+    return QString(".dll");
 #else
-    return QString("*.so");
+    return QString(".so");
 #endif
 }
 
@@ -487,17 +537,16 @@
     QList<HbDeviceDialogInterface*>::iterator i = mDeleteWidgets.begin();
     while (i != mDeleteWidgets.end()) {
         HbDeviceDialogInterface *&widgetIf = *i;
-        QString deviceDialogType = widgetIf->deviceDialogWidget()->
-            property(deviceDialogTypePropertyName).toString();
+        int index = findPlugin(widgetIf);
         // IN Windows/Linux scene may get deleted before plugin manager and deletes all widgets
         if (!mAllWidgetsDeleted) {
             delete widgetIf;
         }
-        int index = findPlugin(deviceDialogType);
         Q_ASSERT(index >= 0);
         PluginInfo &pluginInfo = mPlugins[index];
         pluginInfo.mRefCount--;
-        unloadPlugin(deviceDialogType);
+        pluginInfo.mWidgets.removeAt(pluginInfo.mWidgets.indexOf(widgetIf));
+        unloadPlugin(pluginInfo.mLoader->fileName());
         ++i;
     }
     mDeleteWidgets.clear();
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager_p.h
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -59,16 +59,17 @@
     explicit HbDeviceDialogPluginManager(Flags flags = NoFlags, QObject *parent = 0);
     virtual ~HbDeviceDialogPluginManager();
 
-    void preloadPlugins();
     HbDeviceDialogInterface *createWidget(const QString &deviceDialogType,
-        const QVariantMap &parameters, bool &recycled, int &error);
+        const QVariantMap &parameters, const QString &baseFileName, const QString &pluginFilePath,
+        bool &recycled, int &error);
     void freeWidget(HbDeviceDialogInterface *widget);
-    bool loadPlugin(const QString &deviceDialogType);
-    bool unloadPlugin(const QString &deviceDialogType);
-    const HbDeviceDialogPlugin &plugin(const QString &deviceDialogType);
+    bool loadPlugin(const QString &deviceDialogType, const QString &baseFileName, QString *pluginFilePath);
+    bool unloadPlugin(const QString &pluginFilePath);
+    const HbDeviceDialogPlugin &plugin(const QString &pluginFilePath);
 
     static QStringList pluginPathList(const QString &subDir, int &readOnlyPaths);
     static QString pluginFileNameFilter();
+    static QString fileNameExtension();
     static int trimPluginPathList(QStringList &pathList);
 
 private: // types
@@ -79,7 +80,7 @@
         };
         Q_DECLARE_FLAGS(Flags, Flag)
 
-        QStringList mTypes; // device dialog types implemented by the plugin
+        QList<HbDeviceDialogInterface*> mWidgets; // widgets created by the plugin
         HbLockedPluginLoader *mLoader; // loaded plugin
         int mRefCount; // number of references into the plugin
         HbDeviceDialogPlugin::PluginFlags mPluginFlags;
@@ -94,14 +95,16 @@
         (HbLockedPluginLoader*, const QString&);
 
 private: // functions
-    void scanPlugins(PluginScanCallback func, const QString &deviceDialogType, bool stopIfFound = true);
+    QString scanPlugins(const QString &deviceDialogType, const QString &baseFileName);
     bool scanPlugin(PluginScanCallback func, const QString &deviceDialogType, const QString &filePath);
-    HbLockedPluginLoader *preloadPluginCallback(HbLockedPluginLoader *loader, const QString& unused);
     HbLockedPluginLoader *loadPluginCallback(HbLockedPluginLoader *loader, const QString &deviceDialogType);
+    HbLockedPluginLoader *scanPluginCallback(HbLockedPluginLoader *loader, const QString &deviceDialogType);
 
-    int findPlugin(const QString &deviceDialogType) const;
+    int findPlugin(const QString &pluginFilePath) const;
+    int findPlugin(HbDeviceDialogInterface* widget) const;
+    void incPluginRefCount(const QString &pluginFilePath);
     void freeRecycleWidgets();
-    void updateCachePath(const QString &path, bool updateReadOnly = false);
+    void updateCachePath(const QString &path, bool firstScan = false);
     static QStringList pluginKeys(QObject *pluginInstance);
 
 private slots:
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/devicedialogbase/devicedialogserver/hbpluginnamecache.cpp
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbpluginnamecache.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbpluginnamecache.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -74,24 +74,27 @@
 class HbPluginNameCacheThread : public QThread
 {
 public:
+    typedef HbPluginNameCache::ScanParameters WorkItem;
+
     HbPluginNameCacheThread(HbPluginNameCache &nameCache,
         HbPluginNameCache::GetPluginKeys getPluginKeys,
         HbPluginNameCache::PluginFileNameFilter pluginFileNameFilter);
-    void scanDirectory(const QString &path);
+    void scanDirectory(const WorkItem &workItem);
     void cancelScan(const QString &path);
     void stop();
     QMutex &lock(){return *mMutex;}
 
 private:
-    void doDirectoryScan(const QString &path);
+    void doDirectoryScan(const WorkItem &workItem);
     void run();
 
 private: // data
     HbPluginNameCache::GetPluginKeys mGetPluginKeys; // function to get keys from a plugin
     HbPluginNameCache::PluginFileNameFilter mPluginFileNameFilter;
     bool mExit;
-    QStringList mWorkQueue; // queue for directories to be scanned
-    QString mCurrentScan;  // directory currently scanned
+    QList<WorkItem> mWorkQueue; // queue for directories to be scanned
+    WorkItem mCurrentScan;  // directory currently scanned
+    QStringList mLimitSet; // names of plugin-files found from rom-drives
     HbPluginNameCache &mNameCache;
     static QMutex *mMutex;
 };
@@ -99,6 +102,13 @@
 // Share lock between all instances of the cache.
 QMutex *HbPluginNameCacheThread::mMutex = 0;
 
+// For file name compare
+#if defined(Q_OS_LINUX) && !defined(Q_OS_SYMBIAN)
+    static const Qt::CaseSensitivity caseSensitivity = Qt::CaseSensitive;
+#else
+    static const Qt::CaseSensitivity caseSensitivity = Qt::CaseInsensitive;
+#endif // defined(Q_OS_LINUX) && !defined(Q_OS_SYMBIAN)
+
 HbPluginNameCacheThread::HbPluginNameCacheThread(HbPluginNameCache &nameCache,
     HbPluginNameCache::GetPluginKeys getPluginKeys,
     HbPluginNameCache::PluginFileNameFilter pluginFileNameFilter) :
@@ -111,11 +121,11 @@
 }
 
 // Add directory to be scanned
-void HbPluginNameCacheThread::scanDirectory(const QString &path)
+void HbPluginNameCacheThread::scanDirectory(const WorkItem &workItem)
 {
     QMutexLocker lock(mMutex);
-    if (!mWorkQueue.contains(path)) {
-        mWorkQueue.append(path);
+    if (!mWorkQueue.contains(workItem)) {
+        mWorkQueue.append(workItem);
     }
 #ifdef USE_NAME_CACHE_THREAD
     if (!isRunning()) {
@@ -134,19 +144,21 @@
 {
     QMutexLocker lock(mMutex);
     // If scan is waiting in a queue, remove it
-    int i = mWorkQueue.indexOf(path);
+    WorkItem workItem(path);
+    int i = mWorkQueue.indexOf(workItem);
     if (i >= 0) {
         mWorkQueue.removeAt(i);
     }
 #ifdef USE_NAME_CACHE_THREAD
     // If thread is currently scanning the path, stop and wait for it to exit
-    if (isRunning() && mCurrentScan == path) {
+    if (isRunning() && mCurrentScan.mDirPath.compare(path, caseSensitivity) == 0) {
         mExit = true;
         lock.unlock();
         stop();
         // Restart scan thread if scan queue is not empty
         if (!mWorkQueue.isEmpty()) {
-            scanDirectory(mWorkQueue.first());
+            const WorkItem &workItem =  mWorkQueue.first();
+            scanDirectory(workItem);
         }
     }
 #endif
@@ -170,28 +182,42 @@
 }
 
 // Scan directory for plugins and keys they implement.
-void HbPluginNameCacheThread::doDirectoryScan(const QString &path)
+void HbPluginNameCacheThread::doDirectoryScan(const WorkItem &workItem)
 {
     TRACE_ENTRY_ARGS(path)
 
     // Invalidate cache contents for the path
-    mNameCache.removePath(path);
+    mNameCache.insertPath(workItem.mDirPath);
 
     QString fileNameFilter = mPluginFileNameFilter();
 
-    QDir pluginDir(path, fileNameFilter, QDir::NoSort, QDir::Files | QDir::Readable);
-    foreach (const QString &fileName, pluginDir.entryList()) {
+    QDir pluginDir(workItem.mDirPath, fileNameFilter, QDir::NoSort, QDir::Files | QDir::Readable);
+    foreach(const QString &fileName, pluginDir.entryList()) {
         if (mExit) {
             break;
         }
-
+        if (workItem.mOptions == HbPluginNameCache::ScanParameters::LimitToSet) {
+            // Scan is limited to a set of files
+            if (!mLimitSet.contains(fileName, caseSensitivity)) {
+                continue;
+            }
+        }
         const QString absolutePath = pluginDir.absoluteFilePath(fileName);
         HbLockedPluginLoader *loader = new HbLockedPluginLoader(*mMutex, absolutePath);
         QObject *pluginInstance = loader->instance();
 
         if (pluginInstance) {
             // If plugin type is correct, plugin file name and keys are saved into a cache
-            mNameCache.insert(mGetPluginKeys(pluginInstance), absolutePath);
+            QStringList keys = mGetPluginKeys(pluginInstance);
+            if (!keys.isEmpty()) {
+                mNameCache.insert(keys, workItem.mDirPath, fileName);
+                if (workItem.mOptions == HbPluginNameCache::ScanParameters::AddToLimitSet) {
+                    // Add file name to limit set
+                    if (!mLimitSet.contains(fileName, caseSensitivity)) {
+                        mLimitSet.append(fileName);
+                    }
+                }
+            }
         }
         loader->unload();
         delete loader;
@@ -237,16 +263,16 @@
 }
 
 // Add directory watch path
-void HbPluginNameCache::addWatchPath(const QString &path)
+void HbPluginNameCache::addWatchPath(const ScanParameters &parameters)
 {
-    TRACE_ENTRY_ARGS(path)
-    QString dirPath = directoryPath(path);
+    TRACE_ENTRY_ARGS(parameters.mDirPath)
+    QString dirPath = directoryPath(parameters.mDirPath);
     TRACE(dirPath)
     if (!dirPath.isEmpty()) {
 #ifdef MONITOR_INSTALLATION_DIRS
         mWatcher.addPath(dirPath); // start watching
 #endif // MONITOR_INSTALLATION_DIRS
-        directoryChanged(dirPath); // scan directory
+        mThread->scanDirectory(ScanParameters(dirPath, parameters.mOptions));
     }
 }
 
@@ -258,12 +284,7 @@
     TRACE(dirPath)
     if (!dirPath.isEmpty()) {
 #ifdef MONITOR_INSTALLATION_DIRS
-#if defined(Q_OS_LINUX) && !defined(Q_OS_SYMBIAN)
-        const Qt::CaseSensitivity cs = Qt::CaseSensitive;
-#else
-        const Qt::CaseSensitivity cs = Qt::CaseInsensitive;
-#endif // defined(Q_OS_LINUX) && !defined(Q_OS_SYMBIAN)
-        if (mWatcher.directories().contains(dirPath, cs)) {
+        if (mWatcher.directories().contains(dirPath, caseSensitivity)) {
             mWatcher.removePath(dirPath);
 #else // MONITOR_INSTALLATION_DIRS
         {
@@ -275,22 +296,46 @@
 }
 
 // Scan directory directory for plugins
-void HbPluginNameCache::scanDirectory(const QString &path)
+void HbPluginNameCache::scanDirectory(const ScanParameters &parameters)
 {
     TRACE_ENTRY_ARGS(path)
-    QString dirPath = directoryPath(path);
+    QString dirPath = directoryPath(parameters.mDirPath);
     TRACE(dirPath)
     if (!dirPath.isEmpty()) {
-        mThread->scanDirectory(dirPath);
+        mThread->scanDirectory(ScanParameters(dirPath, parameters.mOptions));
     }
 }
 
-// Find a plugin by a key. Returns plugin file path or an empty string
-QString HbPluginNameCache::find(const QString &key)
+// Find a plugin by a key. Returns plugin file path or an empty string. Search may be limited
+// to a certain file name.
+QString HbPluginNameCache::find(const QString &key, const QString &fileName)
 {
     TRACE_ENTRY_ARGS(key)
     QMutexLocker(&mThread->lock());
-    return mCache.value(key);
+    const DirItem *resultDir = 0;
+    const FileItem *resultFile = 0;
+    int count = mCache.count();
+    for(int i = 0; i < count; i++) {
+        const DirItem &item = mCache.at(i);
+        int files = item.mFiles.count();
+        for(int j = 0; j < files; j++) {
+            const FileItem &fileItem = item.mFiles.at(j);
+            // Search limited to a certain file name
+            if (!fileName.isEmpty() && compare(fileName, fileItem.mFile)) {
+                continue;
+            }
+            // Allow eclipsing only if file names are the same
+            if (resultFile && compare(resultFile->mFile, fileItem.mFile) != 0) {
+                continue;
+            }
+            if (!fileItem.mKeys.contains(key)) {
+                continue;
+            }
+            resultDir = &item;
+            resultFile = &fileItem;
+        }
+    }
+    return resultFile ? resultDir->mPath + resultFile->mFile : QString();
 }
 
 // Get directory part of a file name
@@ -308,38 +353,75 @@
     }
 }
 
+// Case sensitive/insensitive compare depending on os
+int HbPluginNameCache::compare(const QString &s1, const QString &s2)
+{
+    return s1.compare(s2, caseSensitivity);
+}
+
 // Print cache contents
 void HbPluginNameCache::print()
 {
     TRACE_ENTRY
     QMutexLocker(&mThread->lock());
-    QHash<QString, QString>::iterator i = mCache.begin();
-    while (i != mCache.end()) {
-        TRACE(i.key() << i.value())
-        ++i;
-    }
-}
+    TRACE("Name cache")
 
-// Update cache with \a keys and \a filePath
-void HbPluginNameCache::insert(const QStringList &keys, const QString &filePath)
-{
-    TRACE_ENTRY_ARGS("keys" << keys << "filePath" << filePath)
-    QMutexLocker(&mThread->lock());
-    for (int i = 0; i < keys.size(); ++i) {
-        // New entry is added into a cache. If the key is already present, value is not
-        // updated. This is to prevent overriding an existing plugin.
-        if (!mCache.contains(keys.at(i))) {
-            mCache.insert(keys.at(i), filePath);
+    int count = mCache.count();
+    for(int i = 0; i < count; i++) {
+        const DirItem &current = mCache.at(i);
+        TRACE("Dir:" << current.mPath)
+        int fileCount = current.mFiles.count();
+        for(int j = 0; j < fileCount; j++) {
+            const FileItem &fileitem = current.mFiles.at(j);
+            TRACE("File:" << fileitem.mFile)
+            int keyCount = fileitem.mKeys.count();
+            for(int k = 0; k < keyCount; k++) {
+                TRACE(fileitem.keys.at(k))
+            }
         }
     }
 }
 
-// Remove a key from from a cache
-void HbPluginNameCache::remove(const QString &key)
+// Create cache entry for directory path
+void HbPluginNameCache::insertPath(const QString &dirPath)
+{
+    TRACE_ENTRY_ARGS(dirPath)
+    QMutexLocker(&mThread->lock());
+    DirItem searchItem;
+    searchItem.mPath = dirPath;
+    int index = mCache.indexOf(searchItem);
+    if (index < 0) {
+        mCache.append(searchItem);
+    } else {
+        mCache[index].mFiles.clear();
+    }
+}
+
+// Update cache with \a keys , \a firPath and \a fileName
+void HbPluginNameCache::insert(const QStringList &keys, const QString &dirPath,
+    const QString &fileName)
 {
-    TRACE_ENTRY_ARGS(key)
+    TRACE_ENTRY_ARGS("keys" << keys << "filePath" << filePath)
     QMutexLocker(&mThread->lock());
-    mCache.remove(key);
+    // Find directory path
+    DirItem searchItem;
+    searchItem.mPath = dirPath;
+    int dirIndex = mCache.indexOf(searchItem);
+    if (dirIndex >= 0) {
+        DirItem &dirItem = mCache[dirIndex];
+        FileItem searchItem;
+        searchItem.mFile = fileName;
+        int fileIndex = dirItem.mFiles.indexOf(searchItem);
+        if (fileIndex >= 0) {
+            FileItem &fileItem = dirItem.mFiles[fileIndex];
+            fileItem.mKeys = keys;
+        } else {
+            FileItem fileItem;
+            fileItem.mFile = fileName;
+            fileItem.mKeys = keys;
+            dirItem.mFiles.append(fileItem);
+        }
+    }
 }
 
 // Remove all keys with a \a filePath
@@ -347,18 +429,11 @@
 {
     TRACE_ENTRY_ARGS(filePath)
     QMutexLocker(&mThread->lock());
-    QHash<QString, QString>::iterator i = mCache.begin();
-    while (i != mCache.end()) {
-#if defined(Q_OS_LINUX) && !defined(Q_OS_SYMBIAN)
-        const Qt::CaseSensitivity cs = Qt::CaseSensitive;
-#else
-        const Qt::CaseSensitivity cs = Qt::CaseInsensitive;
-#endif // defined(Q_OS_LINUX) && !defined(Q_OS_SYMBIAN)
-        if (i.value().startsWith(filePath, cs)) {
-            i = mCache.erase(i);
-        } else {
-            ++i;
-        }
+    DirItem searchItem;
+    searchItem.mPath = directoryPath(filePath);
+    int index = mCache.indexOf(searchItem);
+    if (index >= 0) {
+        mCache[index].mFiles.clear();
     }
 }
 
@@ -380,10 +455,26 @@
 void HbPluginNameCache::directoryChanged(const QString &path)
 {
     TRACE_ENTRY_ARGS(path)
+    mThread->scanDirectory(ScanParameters(path));
+    TRACE_EXIT
+}
 
-    mThread->scanDirectory(path);
+// Compare scan parameters
+bool HbPluginNameCache::ScanParameters::operator ==(const ScanParameters &other) const
+{
+    return compare(mDirPath, other.mDirPath) == 0;
+}
 
-    TRACE_EXIT
+// Compare cache items
+bool HbPluginNameCache::FileItem::operator ==(const FileItem &other) const
+{
+    return compare(mFile, other.mFile) == 0;
+}
+
+// Compare cache items
+bool HbPluginNameCache::DirItem::operator ==(const DirItem &other) const
+{
+    return compare(mPath, other.mPath) == 0;
 }
 
 // Constructor
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/devicedialogbase/devicedialogserver/hbpluginnamecache_p.h
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbpluginnamecache_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbpluginnamecache_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -48,6 +48,19 @@
 
 public:
 
+    class ScanParameters {
+    public:
+        enum Options {NoOptions, AddToLimitSet, LimitToSet};
+        ScanParameters(){mOptions = NoOptions;}
+        ScanParameters(const QString &path, Options options = NoOptions):
+            mOptions(options), mDirPath(path){}
+        bool operator ==(const ScanParameters &other) const;
+        void clear(){mDirPath.clear();}
+
+        Options mOptions; // scan options
+        QString mDirPath; // directory to scan
+    };
+
     typedef QStringList (*GetPluginKeys)(QObject *pluginInstance);
     typedef QString (*PluginFileNameFilter)();
 
@@ -55,16 +68,30 @@
         PluginFileNameFilter pluginFileNameFilter = 0, QObject *parent = 0);
     ~HbPluginNameCache();
 
-    void addWatchPath(const QString &path);
+    void addWatchPath(const ScanParameters &parameters);
     void removeWatchPath(const QString &path);
-    void scanDirectory(const QString &path);
-    QString find(const QString &key);
+    void scanDirectory(const ScanParameters &parameters);
+    QString find(const QString &key, const QString &fileName);
     static QString directoryPath(const QString &path);
+    static int compare(const QString &s1, const QString &s2);
+    void print();
 
-    void print();
 private:
-    void insert(const QStringList &keys, const QString &filePath);
-    void remove(const QString &key);
+    class FileItem {
+    public:
+        bool operator ==(const FileItem &other) const;
+        QString mFile;
+        QStringList mKeys;
+    };
+    class DirItem {
+    public:
+        bool operator ==(const DirItem &other) const;
+        QString mPath;
+        QList<FileItem> mFiles;
+    };
+
+    void insertPath(const QString &dirPath);
+    void insert(const QStringList &keys, const QString &dirPath, const QString &fileName);
     void removePath(const QString &filePath);
     static QString pluginFileNameFilter();
 
@@ -73,7 +100,7 @@
 
 private: // data
     Q_DISABLE_COPY(HbPluginNameCache)
-    QHash<QString, QString> mCache;
+    QList<DirItem> mCache;
     HbPluginNameCacheThread *mThread;
     QFileSystemWatcher mWatcher;
 };
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfosym_p_p.cpp
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfosym_p_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfosym_p_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -28,6 +28,7 @@
 #include <qcoreevent.h>
 
 const TUint32 secureId = 0x20022FC5;
+const TUint32 splashGenServerSecureId = 0x2002E68B;
 
 // publish & subscribe 
 const TUid PropertyCategoryUid = {secureId};
@@ -45,6 +46,7 @@
 
 HbSystemInfoPrivate::~HbSystemInfoPrivate()
 {
+    Cancel();
     if (!mWriter) {
         lostForeground();
     }
@@ -60,8 +62,10 @@
     if (writer) {
         RProcess me;
         if ((me.SecureId().iId != secureId )) {
+            me.Close();
             return;
         }
+        me.Close();
     }
     
     if (writer) {
@@ -101,7 +105,15 @@
             mPtr.Set(mDataBuffer->Des());
             mInfoProperty.Attach(PropertyCategoryUid, InfoKey);
         }
-        
+
+        // hbsplashgenerator will not have any Qt widget shown (and
+        // thus created) so we cannot rely on foreground-background
+        // notifications. Instead, invoke gainedForeground manually.
+        RProcess me;
+        if (me.SecureId().iId == splashGenServerSecureId) {
+            QMetaObject::invokeMethod(this, "gainedForeground", Qt::QueuedConnection);
+        }
+        me.Close();
     }
 }
 
@@ -263,11 +275,15 @@
 
 void HbSystemInfoPrivate::lostForeground()
 {
-    if (mListening) {
+    // Statusbars are rendered in the background by hbsplashgenerator
+    // so cannot stop listening in that case.
+    RProcess me;
+    if (mListening && me.SecureId().iId != splashGenServerSecureId) {
         mInfoProperty.Cancel();
         Cancel();
         mListening = false;
     }
+    me.Close();
 }
 
 void HbSystemInfoPrivate::gainedForeground()
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/devicedialogbase/hbdevicedialoglaunchhelper.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/devicedialogbase/hbdevicedialoglaunchhelper.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,181 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include <hbdevicedialoglaunchhelper_p.h>
+#include <hbdevicedialogclientsession_p.h>
+#include <hbdevicedialogserverdefs_p.h>
+#include <apacmdln.h>
+#include <e32cmn.h>
+
+/*!
+    HbDeviceDialogLaunchHelper
+    \internal
+*/
+class HbDeviceDialogLaunchHelperPrivate : public CActive
+    {
+public:
+    HbDeviceDialogLaunchHelperPrivate();
+    ~HbDeviceDialogLaunchHelperPrivate();
+    void Start();
+    TInt Error() { return iError; }
+    void StartServer();
+        
+protected:    
+    void RunL();
+    void DoCancel();
+    TInt RunError(TInt aError);
+
+public:    
+    RProcess iProcess;
+    CActiveSchedulerWait iWait;
+    TInt iError;
+    };
+    
+HbDeviceDialogLaunchHelperPrivate::HbDeviceDialogLaunchHelperPrivate()
+: CActive(CActive::EPriorityStandard)
+{    
+    CActiveScheduler::Add(this);               
+}
+
+HbDeviceDialogLaunchHelperPrivate::~HbDeviceDialogLaunchHelperPrivate()
+{
+    if (iWait.IsStarted()) {
+        iWait.AsyncStop();
+    }
+    Cancel();
+}
+
+void HbDeviceDialogLaunchHelperPrivate::Start()
+{
+    StartServer();
+    
+    if (iError == KErrNone) {
+        SetActive();
+        iWait.Start();            
+    }
+}
+
+void HbDeviceDialogLaunchHelperPrivate::RunL()
+{ 
+    iError = iStatus.Int();
+           
+    if (iProcess.ExitType() == EExitPanic) {
+        iError = KErrGeneral;
+    }
+
+    iProcess.Close();
+       
+    if (iWait.IsStarted()) {
+        iWait.AsyncStop();
+    }    
+}
+
+void HbDeviceDialogLaunchHelperPrivate::DoCancel()
+{
+    if (IsActive()) {        
+        iProcess.RendezvousCancel(iStatus);
+    }
+}
+
+TInt HbDeviceDialogLaunchHelperPrivate::RunError(TInt aError)
+{
+    iError = aError;
+    return KErrNone;
+}
+
+void HbDeviceDialogLaunchHelperPrivate::StartServer()
+{
+    iError = KErrNone;
+
+    if (RHbDeviceDialogClientSession::ServerRunning()) {
+        // Already running, return error.
+        iError = KErrAlreadyExists; 
+        return;
+    }        
+
+    // Create the server process
+    iError = iProcess.Create(KHbServerExe, KNullDesC);
+
+    if (iError != KErrNone) {
+        // Process could not be created, return error.
+        return;
+        }
+    
+    CApaCommandLine* apaCommandLine = 0;
+    TRAP(iError, apaCommandLine = CApaCommandLine::NewL());
+    if (iError != KErrNone) {
+        iProcess.Close();
+        return;
+    }
+    TRAP(iError,
+        apaCommandLine->SetExecutableNameL(KHbServerExe);
+        apaCommandLine->SetCommandL(EApaCommandBackground);
+        apaCommandLine->SetProcessEnvironmentL(iProcess);
+    );
+    delete apaCommandLine;
+    apaCommandLine = 0;
+
+    if (iError != KErrNone) {
+        iProcess.Close();
+        return;
+    }
+    
+    iProcess.Rendezvous(iStatus);
+    iProcess.Resume();    // logon OK - start the server     
+}
+
+HbDeviceDialogLaunchHelper* HbDeviceDialogLaunchHelper::NewLC()
+{
+     HbDeviceDialogLaunchHelper* self = new (ELeave) HbDeviceDialogLaunchHelper;
+     CleanupStack::PushL(self);
+     self->d_ptr = new (ELeave) HbDeviceDialogLaunchHelperPrivate();
+     return self;    
+}
+
+HbDeviceDialogLaunchHelper* HbDeviceDialogLaunchHelper::NewL()
+{
+    HbDeviceDialogLaunchHelper* self = NewLC();
+    CleanupStack::Pop(self);
+    return self;
+}
+    
+HbDeviceDialogLaunchHelper::~HbDeviceDialogLaunchHelper()
+{
+    delete d_ptr;
+}
+
+void HbDeviceDialogLaunchHelper::Start()
+{
+    d_ptr->Start();
+}
+
+TInt HbDeviceDialogLaunchHelper::Error() 
+{
+    return d_ptr->iError; 
+}
+
+HbDeviceDialogLaunchHelper::HbDeviceDialogLaunchHelper()
+{    
+}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/devicedialogbase/hbdevicedialoglaunchhelper_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/devicedialogbase/hbdevicedialoglaunchhelper_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBDEVICEDIALOGLAUNCHHELPER_P_H
+#define HBDEVICEDIALOGLAUNCHHELPER_P_H
+
+#include <QObject>
+#include <e32base.h>
+
+class HbDeviceDialogLaunchHelperPrivate;
+
+class HbDeviceDialogLaunchHelper : public CBase
+    {
+public:
+    static HbDeviceDialogLaunchHelper *NewLC();
+    static HbDeviceDialogLaunchHelper *NewL();
+    
+    ~HbDeviceDialogLaunchHelper();
+    void Start();
+    TInt Error();
+    
+private:
+     HbDeviceDialogLaunchHelper();
+    
+private:
+    friend class HbDeviceDialogLaunchHelperPrivate; 
+    HbDeviceDialogLaunchHelperPrivate *d_ptr; 
+    };
+
+#endif
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/devicedialogbase/hbdevicedialogsymbian.cpp
--- a/src/hbcore/devicedialogbase/hbdevicedialogsymbian.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogsymbian.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -29,7 +29,7 @@
 #include "hbdevicedialogerrors_p.h"
 #include "hbdevicedialogclientsession_p.h"
 #include <e32cmn.h>
-
+#include "hbdevicedialoglaunchhelper_p.h"
 #include "hbdevicedialogsymbian.h"
 #include "hbsymbianvariant.h"
 #include "hbsymbianvariantconverter_p.h"
@@ -191,7 +191,24 @@
             return KErrNoMemory;
         }
     }
-    return iHbSession.Connect();
+
+    TInt error(KErrNone);
+    if (iFlags & CHbDeviceDialogSymbian::EASyncServerStartup) {
+        HbDeviceDialogLaunchHelper *helper(0);
+        TRAP(error, helper = HbDeviceDialogLaunchHelper::NewL());
+        
+        if (helper) {            
+            helper->Start();
+            error = helper->Error();
+            delete helper;
+            helper = 0;
+            }        
+    }
+
+    if (error == KErrNone || error == KErrAlreadyExists) {
+        error = iHbSession.Connect();
+    }
+    return error;
 }
 
 TInt CHbDeviceDialogSymbianPrivate::Show(const QByteArray& aArray)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/devicedialogbase/hbdevicedialogsymbian.h
--- a/src/hbcore/devicedialogbase/hbdevicedialogsymbian.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogsymbian.h	Tue Jul 06 14:36:53 2010 +0300
@@ -57,7 +57,8 @@
 
     enum TDeviceDialogFlag{
         ENoDeviceDialogFlags = 0x0,
-        EImmediateResourceReservation = 0x1
+        EImmediateResourceReservation = 0x1,
+        EASyncServerStartup = 0x2
     };
 
     IMPORT_C static CHbDeviceDialogSymbian* NewL(TInt aFlags = ENoDeviceDialogFlags);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/devicedialogbase/hbtextresolversymbian.cpp
--- a/src/hbcore/devicedialogbase/hbtextresolversymbian.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbtextresolversymbian.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -145,19 +145,8 @@
         if (tmp.isEmpty() == 0)
             {
             tmp = QString::fromUtf16(ptr.Ptr(), ptr.Length());
-            }
-        
-        bool ok(false);
-        int conv = tmp.toInt(&ok); 
-
-        if (ok) 
-            {   
-            string = string.arg(conv);	
-            } 
-        else
-            {
-            string = string.arg(tmp);
-            }
+            }      
+        string = string.arg(tmp);
         }            
     TPtrC descriptor(static_cast<const TUint16*>(string.utf16()),
                     string.length());
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/effects/hbeffectcontroller.cpp
--- a/src/hbcore/effects/hbeffectcontroller.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/effects/hbeffectcontroller.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -181,7 +181,7 @@
 QString HbEffectController::expandFileName(const QString &fn, bool *fromTheme, bool *shared)
 {
     // Sharing not supported if the file is in Qt resource.
-    if (fn.startsWith(QLatin1String(":/")) && shared && *shared) {
+    if (shared && *shared && (fn.startsWith(QLatin1String(":/")) || HbIconLoader::isInPrivateDirectory(fn))) {
         *shared = false;
         return fn;
     } else {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/feedback/hbfeedbackplugingroup.cpp
--- a/src/hbcore/feedback/hbfeedbackplugingroup.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/feedback/hbfeedbackplugingroup.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -123,8 +123,8 @@
 
     foreach (const QFileInfo &driveInfo, driveInfoList) {
         const QString drive = driveInfo.absolutePath();
-        if (drive.startsWith("z:", Qt::CaseInsensitive) ||
-            drive.startsWith("c:", Qt::CaseInsensitive)) {
+        if (drive.startsWith(QLatin1String("z:"), Qt::CaseInsensitive) ||
+            drive.startsWith(QLatin1String("c:"), Qt::CaseInsensitive)) {
             QString path(drive + pluginRelativePath);
             pluginPathList << path;
         }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gestures/hbgestures_p.h
--- a/src/hbcore/gestures/hbgestures_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gestures/hbgestures_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -30,8 +30,10 @@
 #include <QObject>
 #include <QGraphicsView>
 
-const qreal HbDefaultPanThreshold = 3.3; // mm
-const qreal HbDefaultTapRadius = HbDefaultPanThreshold; //mm
+const qreal HbDefaultPanThreshold = 1.0; // mm
+const qreal HbPanVelocityUpdateThreshold = 3.3; // mm
+
+const qreal HbDefaultTapRadius = 3.3; //mm
 
 const qreal HbSwipeMinOffset = 7.5; // mm
 const qreal HbSwipeMinSpeed = 0.06; // mm / ms
@@ -39,6 +41,10 @@
 const int HbVelocitySampleTime = 80; // ms
 const int HbVelocityStopTime = 70; // ms
 
+const int HbTapAndHoldTriggerTimeout = 150; // ms
+const int HbTapAndHoldTimeout = 500; // ms
+
+
 class HbGestureUtils
 {
 public:
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gestures/hbpangesturelogic_p.cpp
--- a/src/hbcore/gestures/hbpangesturelogic_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gestures/hbpangesturelogic_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -27,11 +27,14 @@
 #include <QGestureRecognizer>
 #include <QGraphicsView>
 #include <QMouseEvent>
+#include <QGraphicsScene>
 
 #include <hbdeviceprofile.h>
+
 #include "hbpangesture.h"
 #include "hbpangesture_p.h"
 #include "hbpangesturelogic_p.h"
+#include "hbnamespace_p.h"
 
 /*!
    @hbcore
@@ -123,13 +126,16 @@
     gesture->d_ptr->mSceneLastOffset     = HbGestureUtils::mapToScene(watched, QPointF(0,0));
     gesture->d_ptr->mLastTimeStamp = mCurrentTime;
           
-    qreal defaultThreshold = HbDefaultPanThreshold * HbDeviceProfile::current().ppmValue();
-    gesture->d_ptr->mThresholdSquare = defaultThreshold * defaultThreshold;
+
+    gesture->d_ptr->mThresholdSquare = HbDefaultPanThreshold * HbDeviceProfile::current().ppmValue();
+    gesture->d_ptr->mThresholdSquare = gesture->d_ptr->mThresholdSquare * gesture->d_ptr->mThresholdSquare;
 
-    gesture->d_ptr->mAxisX.resetRecorder(defaultThreshold);
-    gesture->d_ptr->mAxisY.resetRecorder(defaultThreshold);
-    gesture->d_ptr->mSceneAxisX.resetRecorder(defaultThreshold);
-    gesture->d_ptr->mSceneAxisY.resetRecorder(defaultThreshold);
+    qreal velocityThreshold = HbPanVelocityUpdateThreshold * HbDeviceProfile::current().ppmValue();
+
+    gesture->d_ptr->mAxisX.resetRecorder(velocityThreshold);
+    gesture->d_ptr->mAxisY.resetRecorder(velocityThreshold);
+    gesture->d_ptr->mSceneAxisX.resetRecorder(velocityThreshold);
+    gesture->d_ptr->mSceneAxisY.resetRecorder(velocityThreshold);
     gesture->d_ptr->mAxisX.record( me->globalPos().x(), mCurrentTime );
     gesture->d_ptr->mAxisY.record( me->globalPos().y(), mCurrentTime );
     gesture->d_ptr->mSceneAxisX.record( scenePos.x(), mCurrentTime );
@@ -157,8 +163,16 @@
 
     QPointF offset = me->globalPos() - gesture->startPos().toPoint();
 
-    if (gestureState == Qt::NoGesture && (offset.x() * offset.x() + offset.y() * offset.y()) <= gesture->d_ptr->mThresholdSquare)
-    {
+    QGraphicsView* view = qobject_cast<QGraphicsView*>(watched->parent());
+    if (view) {
+        QGraphicsScene* scene = view->scene();
+        if (scene && scene->property(HbPrivate::OverridingGesture.latin1()).isValid() &&
+            scene->property(HbPrivate::OverridingGesture.latin1()).toInt() != Qt::PanGesture) {
+            return QGestureRecognizer::MayBeGesture;
+        }
+    }
+
+    if (gestureState == Qt::NoGesture && (offset.x() * offset.x() + offset.y() * offset.y()) <= gesture->d_ptr->mThresholdSquare) {
         return QGestureRecognizer::MayBeGesture;
     }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gestures/hbpinchgesturelogic_p.cpp
--- a/src/hbcore/gestures/hbpinchgesturelogic_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gestures/hbpinchgesturelogic_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -122,6 +122,10 @@
 {
     HbPinchGesturePrivate *d = gesture->d_func();
 
+    if (!watched->isWidgetType()) {
+        return QGestureRecognizer::Ignore;
+    }
+
     const QTouchEvent *ev = static_cast<const QTouchEvent *>(event);
 
     QGestureRecognizer::Result result;
@@ -155,17 +159,7 @@
                 if (d->mIsNewSequence) {
                     gesture->setStartCenterPoint(centerPoint);
                     d->mSceneStartCenterPoint = mapToScene(watched, centerPoint);
-
                 }
-                else {
-                    QLineF line1(p1.screenPos(), p1.lastScreenPos());
-                    QLineF line2(p2.screenPos(), p2.lastScreenPos());
-                    if (line1.length() < 3 && line2.length() < 3) {
-                        result = QGestureRecognizer::Ignore;
-                        break;
-                    }
-                }
-
                 gesture->setLastCenterPoint(gesture->centerPoint());
                 d->mSceneLastCenterPoint = mapToScene(watched, gesture->centerPoint());
                 gesture->setCenterPoint(centerPoint);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gestures/hbtapandholdgesture_p.h
--- a/src/hbcore/gestures/hbtapandholdgesture_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gestures/hbtapandholdgesture_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -34,10 +34,6 @@
 #include <QLine>
 #include <QVariant>
 
-const qreal DELTA_TOLERANCE = 1.0;
-const int HOLDTAP_ACTIVATION_USECS = 150; // usecs
-const int HOLDTAP_DURATION_USECS = 500-HOLDTAP_ACTIVATION_USECS; // usecs
-
 class HB_CORE_PRIVATE_EXPORT HbTapAndHoldGesturePrivate
 {
 public:
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gestures/hbtapandholdgesturelogic_p.cpp
--- a/src/hbcore/gestures/hbtapandholdgesturelogic_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gestures/hbtapandholdgesturelogic_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -144,7 +144,7 @@
     Q_ASSERT(gesture->priv->mTimerID == 0);
     Q_ASSERT(gestureState == Qt::NoGesture);
 
-    gesture->priv->mTimerID = gesture->startTimer(HOLDTAP_ACTIVATION_USECS);
+    gesture->priv->mTimerID = gesture->startTimer(HbTapAndHoldTriggerTimeout);
     mTapRadius = (int)(HbDefaultTapRadius * HbDeviceProfile::current().ppmValue());
 
     DEBUG() << gesture << QGestureRecognizer::MayBeGesture;
@@ -265,7 +265,8 @@
     gesture->priv->mTimerID = 0;
 
     if(gestureState == Qt::NoGesture) {
-        gesture->priv->mTimerID = gesture->startTimer(HOLDTAP_DURATION_USECS);
+        const int remainingTime = HbTapAndHoldTimeout-HbTapAndHoldTriggerTimeout;
+        gesture->priv->mTimerID = gesture->startTimer(remainingTime);
         result |= QGestureRecognizer::TriggerGesture;
     } else if (gestureState ==  Qt::GestureStarted) {
         result |= QGestureRecognizer::FinishGesture;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gestures/hbtapgesture_p.h
--- a/src/hbcore/gestures/hbtapgesture_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gestures/hbtapgesture_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -27,8 +27,6 @@
 #define HBTAPGESTURE_P_H
 #include "hbtapgesture.h"
 
-const int HOLDTAP_DURATION_USECS = 500;
-
 class HB_CORE_PRIVATE_EXPORT HbTapGesturePrivate
 {
     Q_DECLARE_PUBLIC(HbTapGesture)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gestures/hbtapgesturelogic_p.cpp
--- a/src/hbcore/gestures/hbtapgesturelogic_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gestures/hbtapgesturelogic_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -27,6 +27,7 @@
 #include "hbtapgesturelogic_p.h"
 #include "hbtapgesture.h"
 #include "hbtapgesture_p.h"
+#include "hbnamespace_p.h"
 
 #include <hbdeviceprofile.h>
 #include <QEvent>
@@ -75,7 +76,10 @@
 {
     gesture->setStartPos(QPointF());
     gesture->setSceneStartPos(QPointF());
-    gesture->setProperty("tapRadius", QVariant());
+    gesture->setProperty(HbPrivate::TapRadius.latin1(), QVariant());
+    gesture->setProperty(HbPrivate::ThresholdRect.latin1(), QVariant());
+    gesture->setProperty(HbPrivate::VerticallyRestricted.latin1(), QVariant());
+    gesture->setProperty(HbPrivate::HorizontallyRestricted.latin1(), QVariant());
 }
 
 /*!
@@ -99,12 +103,12 @@
         gesture->setStartPos(me->globalPos());
         gesture->setScenePosition(HbGestureUtils::mapToScene(watched, me->globalPos()));
         gesture->setSceneStartPos(HbGestureUtils::mapToScene(watched, me->globalPos()));
-        mTapRadius = (int)(HbDefaultTapRadius * HbDeviceProfile::current().ppmValue());
+        mTapRadius = (int)(HbDefaultTapRadius * HbDeviceProfile::current().ppmValue());        
 
         HbTapGesturePrivate* d_ptr = gesture->d_func();
         d_ptr->mTapStyleHint = HbTapGesture::Tap;
         if ( d_ptr->mTimerId ) gesture->killTimer(d_ptr->mTimerId);
-        d_ptr->mTimerId = gesture->startTimer(HOLDTAP_DURATION_USECS);
+        d_ptr->mTimerId = gesture->startTimer(HbTapAndHoldTimeout);
 
         return QGestureRecognizer::TriggerGesture;
     }
@@ -127,20 +131,46 @@
         QObject *watched,
         QMouseEvent *me )
 {
-    if(gestureState != Qt::NoGesture && gestureState != Qt::GestureCanceled) {
-        int tapRadiusSquare(mTapRadius * mTapRadius);
-        if(gesture->property("tapRadius").isValid()) {
-            qWarning("WARNING using widget specific properties in HbTapGestureRecognizer");
-            int tapRadius = gesture->property("tapRadius").toInt();
-            tapRadiusSquare = tapRadius * tapRadius;
-        }
-
+    if(gestureState != Qt::NoGesture && gestureState != Qt::GestureCanceled) {         
         gesture->setPosition(me->globalPos());
         gesture->setScenePosition(HbGestureUtils::mapToScene(watched, me->globalPos()));
         gesture->setHotSpot(me->globalPos());
+
+        int tapRadiusSquare(mTapRadius * mTapRadius);
+        if(gesture->property(HbPrivate::TapRadius.latin1()).isValid()) {
+            qWarning("WARNING using widget specific properties in HbTapGestureRecognizer");
+            int tapRadius = gesture->property(HbPrivate::TapRadius.latin1()).toInt();
+            tapRadiusSquare = tapRadius * tapRadius;
+        }
         QPointF delta = me->globalPos() - gesture->startPos();
-        if((delta.x() * delta.x() + delta.y() * delta.y()) > tapRadiusSquare) {
-            return QGestureRecognizer::CancelGesture;
+
+        QRect thresholdRect = gesture->property(HbPrivate::ThresholdRect.latin1()).toRect();
+        if (thresholdRect.isValid() &&
+            !(gesture->property(HbPrivate::VerticallyRestricted.latin1()).toBool() && gesture->property(HbPrivate::HorizontallyRestricted.latin1()).toBool())) {
+            // cancel long press with radius
+            if((delta.x() * delta.x() + delta.y() * delta.y()) > tapRadiusSquare) {                
+                if (gesture->d_func()->mTimerId) gesture->killTimer(gesture->d_func()->mTimerId);
+                gesture->d_func()->mTimerId = 0;
+            }
+
+            thresholdRect.adjust(-mTapRadius, -mTapRadius, mTapRadius, mTapRadius);
+
+            if (gesture->property(HbPrivate::VerticallyRestricted.latin1()).toBool()) {
+                thresholdRect.setTop(gesture->sceneStartPos().y() - mTapRadius);
+                thresholdRect.setBottom(gesture->sceneStartPos().y() + mTapRadius);
+            }
+            if (gesture->property(HbPrivate::HorizontallyRestricted.latin1()).toBool()){
+                thresholdRect.setLeft(gesture->sceneStartPos().x() - mTapRadius);
+                thresholdRect.setRight(gesture->sceneStartPos().x() + mTapRadius);
+            }
+
+            if (!thresholdRect.contains(gesture->scenePosition().toPoint())) {
+                return QGestureRecognizer::CancelGesture;
+            }
+        } else {            
+            if((delta.x() * delta.x() + delta.y() * delta.y()) > tapRadiusSquare) {
+                return QGestureRecognizer::CancelGesture;
+            }
         }
     }
     return QGestureRecognizer::Ignore;
@@ -185,21 +215,17 @@
 QGestureRecognizer::Result HbTapGestureLogic::handleTimerEvent(
         Qt::GestureState gestureState,
         HbTapGesture *gesture,
-        QObject *watched)
+        QObject *)
 {
-    if (watched == gesture && gestureState == Qt::GestureStarted) {
-        QGestureRecognizer::Result result = QGestureRecognizer::ConsumeEventHint;
-        gesture->killTimer(gesture->d_func()->mTimerId);
-        gesture->d_func()->mTimerId = 0;
-        if(gestureState != Qt::NoGesture) {
-            gesture->d_func()->mTapStyleHint = HbTapGesture::TapAndHold;
-            result |= QGestureRecognizer::TriggerGesture;
-        }
-
-        return result;
+    QGestureRecognizer::Result result = QGestureRecognizer::ConsumeEventHint;
+    gesture->killTimer(gesture->d_func()->mTimerId);
+    gesture->d_func()->mTimerId = 0;
+    if(gestureState != Qt::NoGesture) {
+        gesture->d_func()->mTapStyleHint = HbTapGesture::TapAndHold;
+        result |= QGestureRecognizer::TriggerGesture;
     }
 
-    return QGestureRecognizer::Ignore;
+    return result;
 }
 
 /*!
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/gui.pri
--- a/src/hbcore/gui/gui.pri	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/gui.pri	Tue Jul 06 14:36:53 2010 +0300
@@ -86,6 +86,7 @@
 PRIVATE_HEADERS += $$PWD/hbsplashdefs_p.h
 PRIVATE_HEADERS += $$PWD/hbsplashscreen_generic_p.h
 PRIVATE_HEADERS += $$PWD/hblongpressvisualizer_p.h
+PRIVATE_HEADERS += $$PWD/hbwindowobscured_p.h
 
 SOURCES += $$PWD/hbabstractbutton.cpp
 SOURCES += $$PWD/hbactionmanager.cpp
@@ -125,6 +126,7 @@
 SOURCES += $$PWD/hbcontentwidget.cpp
 SOURCES += $$PWD/hbscreen.cpp
 SOURCES += $$PWD/hblongpressvisualizer.cpp
+SOURCES += $$PWD/hbwindowobscured_p.cpp
 
 symbian:SOURCES += $$PWD/hbdevicefadecontrolsym.cpp
 else:SOURCES += $$PWD/hbdevicefadecontrolwin.cpp
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbabstractbutton.cpp
--- a/src/hbcore/gui/hbabstractbutton.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbabstractbutton.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -29,6 +29,7 @@
 #include "hbstyleoption_p.h"
 #include "hbtooltip.h"
 #include "hbinstance.h"
+#include "hbnamespace_p.h"
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsScene>
 #include <QPointer>
@@ -952,17 +953,21 @@
     Q_D(HbAbstractButton);
     
     if (HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
-        bool hit = hitButton(mapFromScene(event->mapToGraphicsScene(tap->position())));
         switch(tap->state()) {
 	        case Qt::GestureStarted:
-                if( hit ){
-                    setDown(true);
-                    HbWidgetFeedback::triggered(this, Hb::InstantPressed);
-                    updatePrimitives();
-                    d->emitPressed();
-                }
+                scene()->setProperty(HbPrivate::OverridingGesture.latin1(),Qt::TapGesture);
+                if (!tap->property(HbPrivate::ThresholdRect.latin1()).toRect().isValid()) {
+                    tap->setProperty(HbPrivate::ThresholdRect.latin1(), mapRectToScene(boundingRect()).toRect());
+                }                
+                setDown(true);
+                HbWidgetFeedback::triggered(this, Hb::InstantPressed);
+                updatePrimitives();
+                d->emitPressed();
+
                 break;
             case Qt::GestureCanceled:
+                scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
+
                 if(d->down) {
                     HbWidgetFeedback::triggered(this, Hb::InstantReleased);
                     setDown(false);
@@ -971,16 +976,18 @@
                 }
                 break;
             case Qt::GestureFinished:
+                scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
+
                 if (!d->down){
                     return;
                 }
-                if ( hit ){
-                    HbWidgetFeedback::triggered(this, Hb::InstantClicked);
-                    d->repeatTimer.stop();
-                    d->click();
-                }else{
-                    setDown(false);
-                }
+
+                HbWidgetFeedback::triggered(this, Hb::InstantClicked);
+
+
+                d->repeatTimer.stop();
+                d->click();
+
                 HbWidgetFeedback::triggered(this, Hb::InstantReleased);
                 d->longPress = false;
                 break;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbanchorarrowdrawer_p.cpp
--- a/src/hbcore/gui/hbanchorarrowdrawer_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbanchorarrowdrawer_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -25,13 +25,12 @@
 
 
 
-#include <hbanchor_p.h>
+#include <hbanchor.h>
 #include <hbanchorarrowdrawer_p.h>
 #include <hbcolorscheme.h>
 #include <hbevent.h>
 #include <hblayoututils_p.h>
 #include <hbanchorlayout.h>
-#include <hbanchorlayoutdebug_p.h>
 #include <QBrush>
 #include <QPainter>
 #include <QPen>
@@ -43,7 +42,7 @@
 const QString INVALID_COLOR = "qtc_view_visited_normal";
 
 HbAnchorArrowDrawer::HbAnchorArrowDrawer(HbAnchorLayout *layout, QGraphicsItem *parent)
-    : HbWidgetBase(parent), 
+    : HbWidgetBase(parent),
       mLayout(layout), mDrawOutlines(true), mDrawArrows(true), mDrawSpacers(true)
 {
 #if defined(HB_DEVELOPER) || defined(CSS_INSPECTOR)
@@ -82,9 +81,9 @@
         setGeometry(item->sceneBoundingRect());
         QGraphicsLayout *layout = widget->layout();
         if (layout) {
-            HbAnchorLayout *mesh = dynamic_cast<HbAnchorLayout *>(layout);
-            if (mesh) {
-                mLayout = mesh;
+            HbAnchorLayout *anchorlayout = dynamic_cast<HbAnchorLayout *>(layout);
+            if (anchorlayout) {
+                mLayout = anchorlayout;
             }
         }
     }
@@ -105,18 +104,14 @@
     }
     painter->save();
 
-    QList<HbAnchor*> anchors = HbAnchorLayoutDebug::getAnchors(mLayout);
+    QList<HbAnchor*> anchors = mLayout->effectiveAnchors();
 
     // Draw boxes round anchored child items
     if (mDrawOutlines) {
-        QList<QGraphicsLayoutItem*> anchoredChildren;
+        QSet<QGraphicsLayoutItem*> anchoredChildren;
         foreach (const HbAnchor *anchor, anchors) {
-            if (!anchoredChildren.contains(anchor->mStartItem)) {
-                anchoredChildren.append(anchor->mStartItem);
-            }
-            if (!anchoredChildren.contains(anchor->mEndItem)) {
-                anchoredChildren.append(anchor->mEndItem);
-            }
+            anchoredChildren << anchor->startItem();
+            anchoredChildren << anchor->endItem();
         }
         painter->setPen(QPen(QBrush(mBoxColor), LINE_WIDTH));
         painter->setBrush(Qt::NoBrush);
@@ -127,192 +122,170 @@
 
     if (mDrawSpacers) {
         painter->save();
-        for (int li=0 ; li<mLayout->count(); li++) {
-            QGraphicsLayoutItem *layoutItem = mLayout->itemAt(li);
-            //if (!layoutItem->graphicsItem()) {
-            QRectF rectArea = layoutItem->geometry();
-            if (rectArea.width() == 0 || rectArea.height() == 0) {
-                if (rectArea.height() == 0 && rectArea.width() > 0) {
-                    rectArea.setHeight(contentsRect().height());
-                    bool overridden = false;
-                    // find all the horizontal anchors
-                    foreach(HbAnchor *anchor, anchors) {
-                        if (anchor->mStartEdge == Hb::LeftEdge || 
-                            anchor->mStartEdge == Hb::RightEdge ||
-                            anchor->mStartEdge == Hb::CenterHEdge) {
+        foreach (const HbAnchor *anchor, anchors) {
+            if (anchor->anchorId().isEmpty()) {
+                // No anchor name set - not a spacer
+                continue;
+            }
+            QRectF drawArea;
 
-                            QGraphicsLayoutItem *other = 0;
-                            if (anchor->mStartItem == layoutItem && anchor->mEndItem != mLayout) {
-                                other = anchor->mEndItem;
-                            } else if (anchor->mEndItem == layoutItem && 
-                                        anchor->mStartItem != mLayout) {
-                                other = anchor->mStartItem;
-                            }
-                            if (other) {
-                                if (overridden) {
-                                    rectArea.setTop(qMin(rectArea.top(), other->geometry().top()));
-                                    rectArea.setBottom(
-                                        qMax(rectArea.bottom(), other->geometry().bottom()));
-                                    break;
-                                } else {
-                                    rectArea.setTop(other->geometry().top());
-                                    rectArea.setHeight(other->geometry().height());
-                                    overridden = true;
-                                }
-                            }
-                        }
-                    }
+            QGraphicsLayoutItem *srcToLayout = 0;
+            if (anchor->startItem() == mLayout) {
+                srcToLayout = anchor->endItem();
+            } else if (anchor->endItem() == mLayout) {
+                srcToLayout = anchor->startItem();
+            }
 
-                }
-
-                if (rectArea.width() == 0 && rectArea.height() > 0) {
-                    rectArea.setWidth(contentsRect().width());
-                    bool overridden = false;
-                    // find all the vertical anchors
-                    foreach(HbAnchor *anchor, anchors) {
-                        if (anchor->mStartEdge == Hb::TopEdge || 
-                                anchor->mStartEdge == Hb::BottomEdge ||
-                                anchor->mStartEdge == Hb::CenterVEdge) {
-                            QGraphicsLayoutItem *other = 0;
-                            if (anchor->mStartItem == layoutItem && anchor->mEndItem != mLayout) {
-                                other = anchor->mEndItem;
-                            } else if (anchor->mEndItem == layoutItem && 
-                                anchor->mStartItem != mLayout) {
-                                other = anchor->mStartItem;
-                            }
-                            if (other) {
-                                if (overridden) {
-                                    rectArea.setLeft(
-                                        qMin(rectArea.left(), other->geometry().left()));
-                                    rectArea.setRight(
-                                        qMax(rectArea.right(), other->geometry().right()));
-                                    break;
-                                } else {
-                                    rectArea.setLeft(other->geometry().left());
-                                    rectArea.setWidth(other->geometry().width());
-                                    overridden = true;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                painter->setOpacity(0.2); // so that we can see overlapping spacers
-                painter->fillRect(rectArea, QBrush(mInvalidColor, Qt::SolidPattern));
+            if (srcToLayout) {
+                // Attached to layout
+                QRectF srcRect = srcToLayout->geometry();
+                QRectF layoutRect = mLayout->geometry();
+                drawArea = srcRect;
+                switch (anchor->endEdge()) {
+                    case Hb::TopEdge:
+                        drawArea.setTop(0);
+                        drawArea.setBottom(srcRect.top() - ARROW_HEAD_SIZE*2);
+                        break;
+                    case Hb::BottomEdge:
+                        drawArea.setTop(srcRect.bottom() + ARROW_HEAD_SIZE*2);
+                        drawArea.setBottom(layoutRect.height());
+                        break;
+                    case Hb::LeftEdge:
+                        drawArea.setLeft(0);
+                        drawArea.setRight(srcRect.left() - ARROW_HEAD_SIZE*2);
+                        break;
+                    case Hb::RightEdge:
+                        drawArea.setLeft(srcRect.right() + ARROW_HEAD_SIZE*2);
+                        drawArea.setRight(layoutRect.width());
+                        break;
+                    case Hb::CenterVEdge:
+                        drawArea.setTop(qMin(srcRect.top(), layoutRect.center().y()));
+                        drawArea.setBottom(qMax(srcRect.bottom(), layoutRect.center().y()));
+                        break;
+                    case Hb::CenterHEdge:
+                        drawArea.setLeft(qMin(srcRect.left(), layoutRect.center().x()));
+                        drawArea.setRight(qMax(srcRect.right(), layoutRect.center().x()));
+                        break;
+                };
+            } else {
+                // Spacer between two items
+                QRectF startItemRect = anchor->startItem()->geometry();
+                QRectF endItemRect = anchor->endItem()->geometry();
+                drawArea.setLeft(qMin(startItemRect.left(), endItemRect.left()));
+                drawArea.setRight(qMax(startItemRect.right(), endItemRect.right()));
+                drawArea.setTop(qMin(startItemRect.top(), endItemRect.top()));
+                drawArea.setBottom(qMax(startItemRect.bottom(), endItemRect.bottom()));
             }
+            painter->setOpacity(0.2); // so that we can see overlapping spacers
+            painter->fillRect(drawArea, QBrush(mInvalidColor, Qt::SolidPattern));
         }
         painter->restore();
     } // End spacers
 
-
     // Draw anchor lines
     if (mDrawArrows) {
-        Qt::LayoutDirection dir = HbLayoutUtils::visualDirection(mLayout);
-        for (int i=0; i<anchors.count(); i++) {
-            Hb::Edge arrowType = Hb::RightEdge;
-            QPointF start, start2, end, end2;
-            HbAnchor *anchor = anchors.at(i);
+        bool layoutMirrored = HbLayoutUtils::visualDirection(mLayout) == Qt::RightToLeft;
+        foreach (HbAnchor *anchor, anchors) {
 
-            // Ignore some primitives
-            if (anchor->mStartItem) {
-                if (QGraphicsItem *asGraphicsItem = anchor->mStartItem->graphicsItem()) {
-                    if (asGraphicsItem->isWidget()) {
-                        const QGraphicsWidget *widget = 
-                            static_cast<const QGraphicsWidget *>(asGraphicsItem);
+            // Ignore frame and toucharea primitives
+            if (anchor->startItem()) {
+                if (QGraphicsItem *gItem = anchor->startItem()->graphicsItem()) {
+                    if (gItem->isWidget()) {
+                        const QGraphicsWidget *widget = static_cast<const QGraphicsWidget *>(gItem);
                         QString itemText(widget->metaObject()->className());
-                        if (itemText == "HbFrameItem"
-                            || itemText == "HbTouchArea") {
+                        if (itemText == "HbFrameItem" || itemText == "HbTouchArea") {
                             continue;
                         }
                     }
                 }
             }
-            // if edge is connected to parent on same edge, and if the gap is zero, 
+
+            // Vars from anchor
+            bool positiveDirection = anchor->direction() == HbAnchor::Positive;
+            Hb::Edge startEdge = anchor->startEdge();
+            Hb::Edge endEdge = anchor->endEdge();
+            qreal anchorLength = anchor->preferredLength();
+            bool spacerAnchor = false;
+
+            // Handle new anchor-based spacers
+            if (anchorLength == 0 && !anchor->anchorId().isEmpty()) {
+                anchorLength = (ARROW_HEAD_SIZE*2)+1;
+                spacerAnchor = true;
+            }
+
+            // if edge is connected to parent on same edge, and if the gap is zero,
             // then don't show an arrow head
-            if(anchor->mEndItem->isLayout()
-                && anchor->mStartEdge == anchor->mEndEdge
-                && anchor->mValue == 0) {
-                    continue;
+            if(anchor->endItem()->isLayout() && startEdge == endEdge && anchorLength == 0) {
+                continue;
             }
+
             // Mirroring
-            if (dir == Qt::RightToLeft) {
-                if (anchor->mStartEdge == Hb::LeftEdge) {
-                    anchor->mStartEdge = Hb::RightEdge;
-                    anchor->mValue = -(anchor->mValue);
-                } else if (anchor->mStartEdge == Hb::RightEdge) {
-                    anchor->mStartEdge = Hb::LeftEdge;
-                    anchor->mValue = -(anchor->mValue);
-                } else if (anchor->mStartEdge == Hb::CenterHEdge) {
-                    anchor->mValue = -(anchor->mValue);
+            if (layoutMirrored) {
+                if (startEdge == Hb::LeftEdge) {
+                    startEdge = Hb::RightEdge;
+                } else if (startEdge == Hb::RightEdge) {
+                    startEdge = Hb::LeftEdge;
                 }
 
-                if (anchor->mEndEdge == Hb::LeftEdge) {
-                    anchor->mEndEdge = Hb::RightEdge;
-                } else if (anchor->mEndEdge == Hb::RightEdge) {
-                    anchor->mEndEdge = Hb::LeftEdge;
+                if (endEdge == Hb::LeftEdge) {
+                    endEdge = Hb::RightEdge;
+                } else if (endEdge == Hb::RightEdge) {
+                    endEdge = Hb::LeftEdge;
                 }
             }
 
-            QRectF startRect = anchor->mStartItem->geometry();
-            QRectF endRect = anchor->mEndItem->geometry();
-
-            // Fix non-pinned spacers issue
-            if (startRect.left() == 0 && startRect.width() == 0) {
-                startRect.adjust(endRect.left(), 0, endRect.left() + endRect.width(), 0);
-            } else if (startRect.top() == 0 && startRect.height() == 0) {
-                startRect.adjust(0, endRect.top(), 0, endRect.top() + endRect.height());
-            }
-            if (endRect.left() == 0 && endRect.width() == 0) {
-                endRect.adjust(startRect.left(), 0, startRect.left() + startRect.width(), 0);
-            } else if (endRect.top() == 0 && endRect.height() == 0) {
-                endRect.adjust(0, startRect.top(), 0, startRect.top() + startRect.height());
-            }
+            QRectF startRect = anchor->startItem()->geometry();
+            QRectF endRect = anchor->endItem()->geometry();
+            Hb::Edge arrowType;
+            QPointF startPt, start2Pt, endPt, end2Pt;
 
             // Work out the arrow line start point
-            switch (anchor->mStartEdge) {
-                case Hb::LeftEdge: start.rx() = startRect.left(); break;
-                case Hb::RightEdge: start.rx() = startRect.right(); break;
-                case Hb::CenterHEdge: start.rx() = startRect.center().x(); break;
-                case Hb::TopEdge: start.ry() = startRect.top(); break;
-                case Hb::BottomEdge: start.ry() = startRect.bottom(); break;
-                case Hb::CenterVEdge: start.ry() = startRect.center().y(); break;
+            switch (startEdge) {
+                case Hb::LeftEdge: startPt.rx() = startRect.left(); break;
+                case Hb::RightEdge: startPt.rx() = startRect.right(); break;
+                case Hb::CenterHEdge: startPt.rx() = startRect.center().x(); break;
+                case Hb::TopEdge: startPt.ry() = startRect.top(); break;
+                case Hb::BottomEdge: startPt.ry() = startRect.bottom(); break;
+                case Hb::CenterVEdge: startPt.ry() = startRect.center().y(); break;
             }
-            start2 = start;
+            start2Pt = startPt;
 
-            switch (anchor->mStartEdge) {
+            switch (startEdge) {
                 case Hb::LeftEdge:
                 case Hb::RightEdge:
                 case Hb::CenterHEdge:
                 {
-                    // Set arrow end point
-                    end.rx() = start.x() + anchor->mValue;
-
-                    // Set arrow direction
-                    arrowType = anchor->mValue < 0
-                        ? Hb::LeftEdge
-                        : Hb::RightEdge;
+                    // Set arrow end point and arrow direction
+                    positiveDirection ^= layoutMirrored; // XOR with layout direction
+                    if (positiveDirection) {
+                        arrowType = Hb::RightEdge;
+                        endPt.rx() = startPt.x() + anchorLength;
+                    } else {
+                        arrowType = Hb::LeftEdge;
+                        endPt.rx() = startPt.x() - anchorLength;
+                    }
 
                     // Set vertical centering and staggered line point
                     qreal maxTop = qMax(startRect.top(), endRect.top());
                     qreal minBottom = qMin(startRect.bottom(), endRect.bottom());
                     if (maxTop < minBottom) {
-                        start.ry() = (maxTop + minBottom) / 2;
-                        start2.ry() = start.y();
+                        startPt.ry() = (maxTop + minBottom) / 2;
+                        start2Pt.ry() = startPt.y();
                     } else {
                         const bool startAboveEnd = startRect.top() > endRect.top();
-                        start.ry() = startAboveEnd ? endRect.bottom() : endRect.top();
-                        start2.ry() = startAboveEnd ? startRect.top() : startRect.bottom();
+                        startPt.ry() = startAboveEnd ? endRect.bottom() : endRect.top();
+                        start2Pt.ry() = startAboveEnd ? startRect.top() : startRect.bottom();
                     }
-                    end.ry() = start.y();
-                    end2.ry() = start.y();
+                    endPt.ry() = startPt.y();
+                    end2Pt.ry() = startPt.y();
 
                     // Set end staggered point
-                    if (anchor->mEndEdge == Hb::LeftEdge) {
-                        end2.rx() = endRect.left();
-                    } else if (anchor->mEndEdge == Hb::RightEdge) {
-                        end2.rx() = endRect.right();
+                    if (endEdge == Hb::LeftEdge) {
+                        end2Pt.rx() = endRect.left();
+                    } else if (endEdge == Hb::RightEdge) {
+                        end2Pt.rx() = endRect.right();
                     } else {
-                        end2.rx() = endRect.center().x();
+                        end2Pt.rx() = endRect.center().x();
                     }
                 }
                 break;
@@ -321,69 +294,64 @@
                 case Hb::BottomEdge:
                 case Hb::CenterVEdge:
                 {
-                    // Set arrow end point
-                    end.ry() = start.y() + anchor->mValue;
-
-                    // Set arrow direction
-                    arrowType = anchor->mValue < 0
-                        ? Hb::TopEdge
-                        : Hb::BottomEdge;
+                    // Set arrow end point and arrow direction
+                    if (positiveDirection) {
+                        endPt.ry() = startPt.y() + anchorLength;
+                        arrowType = Hb::BottomEdge;
+                    } else {
+                        endPt.ry() = startPt.y() - anchorLength;
+                        arrowType = Hb::TopEdge;
+                    }
 
                     // Set horizontal centering and staggered line point
                     qreal maxLeft = qMax(startRect.left(), endRect.left());
                     qreal minRight = qMin(startRect.right(), endRect.right());
                     if (maxLeft < minRight) {
-                        start.rx() = (maxLeft + minRight) / 2;
-                        start2.rx() = start.x();
+                        startPt.rx() = (maxLeft + minRight) / 2;
+                        start2Pt.rx() = startPt.x();
                     } else {
                         bool startLeftOfEnd = startRect.left() > endRect.left();
-                        start.rx() = startLeftOfEnd ? endRect.right() : endRect.left();
-                        start2.rx() = startLeftOfEnd ? startRect.left() : startRect.right();
+                        startPt.rx() = startLeftOfEnd ? endRect.right() : endRect.left();
+                        start2Pt.rx() = startLeftOfEnd ? startRect.left() : startRect.right();
                     }
-                    end.rx() = start.x();
-                    end2.rx() = start.x();
+                    endPt.rx() = startPt.x();
+                    end2Pt.rx() = startPt.x();
 
                     // Set end staggered point
-                    if (anchor->mEndEdge == Hb::TopEdge) {
-                        end2.ry() = endRect.top();
-                    } else if (anchor->mEndEdge == Hb::BottomEdge) {
-                        end2.ry() = endRect.bottom();
+                    if (endEdge == Hb::TopEdge) {
+                        end2Pt.ry() = endRect.top();
+                    } else if (endEdge == Hb::BottomEdge) {
+                        end2Pt.ry() = endRect.bottom();
                     } else {
-                        end2.ry() = endRect.center().y();
+                        end2Pt.ry() = endRect.center().y();
                     }
                 }
                 break;
-            }
+            } // end switch(startEdge)
 
             // Start painting block
-            QPen myPen;
-            QColor arrowColor = mLayout->isValid()
-                ? mValidColor
-                : mInvalidColor;
+            QColor arrowColor = mLayout->isValid() ? mValidColor : mInvalidColor;
             QColor centerColor = Qt::yellow; //krazy:exclude=qenums
 
-            myPen.setWidth(LINE_WIDTH);
-            myPen.setColor(arrowColor);
-            myPen.setStyle(Qt::DashLine);
-            painter->setPen(myPen);
-            painter->setBrush(arrowColor);
-            painter->drawLine(start2, start);
+            painter->setPen(QPen(arrowColor, LINE_WIDTH, Qt::DashLine));
+            //painter->drawLine(start2Pt, startPt);
 
-            myPen.setStyle(Qt::SolidLine);
-            painter->setPen(myPen);
-            painter->drawLine(start, end);
+            painter->setPen(QPen(arrowColor, LINE_WIDTH, Qt::SolidLine));
+            painter->drawLine(startPt, endPt);
 
-            if (anchor->mStartEdge == Hb::CenterHEdge || anchor->mStartEdge == Hb::CenterVEdge) {
+            if (startEdge == Hb::CenterHEdge || startEdge == Hb::CenterVEdge) {
                 painter->setBrush(centerColor);
+            } else {
+                painter->setBrush(arrowColor);
             }
 
             // Only draw the start box if the anchor is long enough to show 3 times the head size
             // (head, stalk, and tail) otherwise it turns into a mush,
             // so the best thing is to show the triangle which at least shows the direction
-            if (qAbs(anchor->mValue) > ARROW_HEAD_SIZE*3) {
+            if (anchorLength > ARROW_HEAD_SIZE*3) {
                 painter->drawRect(QRectF(
-                    start2.x() - ARROW_HEAD_SIZE,
-                    start2.y() - ARROW_HEAD_SIZE,
+                    start2Pt.x() - ARROW_HEAD_SIZE,
+                    start2Pt.y() - ARROW_HEAD_SIZE,
                     ARROW_HEAD_SIZE*2,
                     ARROW_HEAD_SIZE*2));
             }
@@ -392,32 +360,30 @@
             QPointF points[3] = {
                 QPointF(0.0, 0.0),
                 QPointF(0.0, 0.0),
-                QPointF(end.x(), end.y())
+                QPointF(endPt.x(), endPt.y())
             };
             if (arrowType == Hb::RightEdge) {
-                points[0] = QPointF(end.x()-ARROW_HEAD_SIZE*2, end.y()-ARROW_HEAD_SIZE);
-                points[1] = QPointF(end.x()-ARROW_HEAD_SIZE*2, end.y()+ARROW_HEAD_SIZE);
+                points[0] = QPointF(endPt.x()-ARROW_HEAD_SIZE*2, endPt.y()-ARROW_HEAD_SIZE);
+                points[1] = QPointF(endPt.x()-ARROW_HEAD_SIZE*2, endPt.y()+ARROW_HEAD_SIZE);
             } else if (arrowType == Hb::LeftEdge) {
-                points[0] = QPointF(end.x()+ARROW_HEAD_SIZE*2, end.y()-ARROW_HEAD_SIZE);
-                points[1] = QPointF(end.x()+ARROW_HEAD_SIZE*2, end.y()+ARROW_HEAD_SIZE);
+                points[0] = QPointF(endPt.x()+ARROW_HEAD_SIZE*2, endPt.y()-ARROW_HEAD_SIZE);
+                points[1] = QPointF(endPt.x()+ARROW_HEAD_SIZE*2, endPt.y()+ARROW_HEAD_SIZE);
             } else if (arrowType == Hb::TopEdge) {
-                points[0] = QPointF(end.x()-ARROW_HEAD_SIZE, end.y()+ARROW_HEAD_SIZE*2);
-                points[1] = QPointF(end.x()+ARROW_HEAD_SIZE, end.y()+ARROW_HEAD_SIZE*2);
-            } else {
-                points[0] = QPointF(end.x()-ARROW_HEAD_SIZE, end.y()-ARROW_HEAD_SIZE*2);
-                points[1] = QPointF(end.x()+ARROW_HEAD_SIZE, end.y()-ARROW_HEAD_SIZE*2);
+                points[0] = QPointF(endPt.x()-ARROW_HEAD_SIZE, endPt.y()+ARROW_HEAD_SIZE*2);
+                points[1] = QPointF(endPt.x()+ARROW_HEAD_SIZE, endPt.y()+ARROW_HEAD_SIZE*2);
+            } else { // arrowType == Hb::BottomEdge
+                points[0] = QPointF(endPt.x()-ARROW_HEAD_SIZE, endPt.y()-ARROW_HEAD_SIZE*2);
+                points[1] = QPointF(endPt.x()+ARROW_HEAD_SIZE, endPt.y()-ARROW_HEAD_SIZE*2);
             }
             painter->drawPolygon(points, 3);
 
             // Draw invalid difference
-            if (end != end2) {
-                myPen.setColor(mInvalidColor);
-                myPen.setStyle(Qt::DashLine);
-                painter->setPen(myPen);
-                painter->drawLine(end, end2);
+            if (endPt != end2Pt && !spacerAnchor) {
+                painter->setPen(QPen(mInvalidColor, LINE_WIDTH, Qt::DashLine));
+                painter->drawLine(endPt, end2Pt);
             }
 
-        } // End anchors for loop
+        } // End anchors foreach loop
     }
     painter->restore();
 #else
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbbackgrounditem.cpp
--- a/src/hbcore/gui/hbbackgrounditem.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbbackgrounditem.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -48,7 +48,6 @@
     mImageMode(Hb::ScaleBackgroundToFit)
 {
     setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
     mPrtImageName = defaultImageName(Qt::Vertical);
     mLscImageName = defaultImageName(Qt::Horizontal);
     updateBackgroundImage();
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbcontentwidget.cpp
--- a/src/hbcore/gui/hbcontentwidget.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbcontentwidget.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -49,6 +49,8 @@
     mHidingView(0),
     mMainWindow(mainWindow)
 {
+    // Do not defer this, it causes invalidation and updating.
+    setFocusPolicy(Qt::StrongFocus);
 }
 
 QSizeF HbContentWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
@@ -80,11 +82,6 @@
     return size;
 }
 
-void HbContentWidget::delayedConstruction()
-{
-    setFocusPolicy(Qt::StrongFocus);
-}
-
 void HbContentWidget::setTargetView(HbView *view)
 {
     mTargetView = view;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbcontentwidget_p.h
--- a/src/hbcore/gui/hbcontentwidget_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbcontentwidget_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -41,7 +41,6 @@
     ~HbContentWidget() {}
 
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;
-    void delayedConstruction();
     void setTargetView(HbView *view);
     void runViewSwitchEffectHide(HbView *viewToHide, Hb::ViewSwitchFlags flags);
     bool isSwitchingViews() const {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbcssinspector_p.cpp
--- a/src/hbcore/gui/hbcssinspector_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbcssinspector_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -26,7 +26,7 @@
 #include "hbcssinspector_p.h"
 
 #ifdef HB_CSS_INSPECTOR
-#include <hbanchor_p.h>
+#include <hbanchor.h>
 #include <hbanchorarrowdrawer_p.h>
 #include <hbcolorscheme.h>
 #include <hbcssformatter_p.h>
@@ -38,7 +38,6 @@
 #include <hblayeredstyleloader_p.h>
 #include <hbmainwindow_p.h>
 #include <hbmarqueeitem.h>
-#include <hbanchorlayoutdebug_p.h>
 #include <hbnamespace_p.h>
 #include <hbscreen_p.h>
 #include <hbtextitem.h>
@@ -173,9 +172,9 @@
                 if (!anchorLayout) {
                     return QString(); // Non-anchor layout
                 } else {
-                    foreach (HbAnchor *anchor, HbAnchorLayoutDebug::getAnchors(anchorLayout)) {
-                        itemsInLayout << anchor->mStartItem->graphicsItem();
-                        itemsInLayout << anchor->mEndItem->graphicsItem();
+                    foreach (HbAnchor *anchor, anchorLayout->effectiveAnchors()) {
+                        itemsInLayout << anchor->startItem()->graphicsItem();
+                        itemsInLayout << anchor->endItem()->graphicsItem();
                     }
                     itemCache[layout] = itemsInLayout;
                 }
@@ -323,18 +322,7 @@
             }
         }
         if ( name.isEmpty() ) {
-            // Check if it's a spacer
-            QGraphicsItem *asGraphicsItem = layout->parentLayoutItem()->graphicsItem();
-            if ( asGraphicsItem && asGraphicsItem->isWidget() ){
-                HbWidget *asWidget = qobject_cast<HbWidget*>( static_cast<QGraphicsWidget*>(asGraphicsItem) );
-                if( asWidget ) {
-                    HbWidgetPrivate*priv = static_cast<HbWidgetPrivate*>(HbWidgetBasePrivate::d_ptr(asWidget));
-                    name = priv->mSpacers.key(item);
-                }
-            }
-            if ( name.isEmpty() ) {
-                name = QString("<unknown>");
-            }
+            name = QString("<unknown>");
         }
     }
 
@@ -364,16 +352,10 @@
         syntax.lexemValue(HbXmlLoaderAbstractSyntax::LAYOUT_ANCHOR));
 
     if (anchorLayout) {
-        foreach (HbAnchor *anchor, HbAnchorLayoutDebug::getAnchors(anchorLayout)) {
+        foreach (HbAnchor *anchor, anchorLayout->effectiveAnchors()) {
             bool startIdBased, endIdBased;
-            QString startName(anchorItemName(anchor->mStartItem, anchorLayout, startIdBased));
-            QString endName(anchorItemName(anchor->mEndItem, anchorLayout, endIdBased));
-            QString spacingText;
-
-            QGraphicsItem *asGraphicsItem = anchorLayout->parentLayoutItem()->graphicsItem();
-            if (asGraphicsItem && (qAbs<qreal>(anchor->mValue) > 0.01)) {
-                spacingText = convertMeasurementToText(asGraphicsItem, anchor->mValue);
-            }
+            QString startName(anchorItemName(anchor->startItem(), anchorLayout, startIdBased));
+            QString endName(anchorItemName(anchor->endItem(), anchorLayout, endIdBased));
 
             xmlWriter.writeStartElement(syntax.lexemValue(HbXmlLoaderAbstractSyntax::AL_ANCHOR));
             xmlWriter.writeAttribute(
@@ -383,7 +365,7 @@
                         startName);
             xmlWriter.writeAttribute(
                 syntax.lexemValue(HbXmlLoaderAbstractSyntax::AL_SRC_EDGE), 
-                anchorEdgeName(anchor->mStartEdge));
+                anchorEdgeName(anchor->startEdge()));
             xmlWriter.writeAttribute(
                 syntax.lexemValue( endIdBased
                     ? HbXmlLoaderAbstractSyntax::AL_DST_ID
@@ -391,11 +373,13 @@
                         endName);
             xmlWriter.writeAttribute(
                 syntax.lexemValue(HbXmlLoaderAbstractSyntax::AL_DST_EDGE), 
-                anchorEdgeName(anchor->mEndEdge));
-            if ( !spacingText.isEmpty() ) {
-                xmlWriter.writeAttribute(syntax.lexemValue(HbXmlLoaderAbstractSyntax::AL_SPACING), spacingText);
+                anchorEdgeName(anchor->endEdge()));
+            if ( !anchor->anchorId().isEmpty() ) {
+                xmlWriter.writeAttribute(
+                    syntax.lexemValue(HbXmlLoaderAbstractSyntax::AL_SPACER),
+                    anchor->anchorId());
             }
-            xmlWriter.writeEndElement(); // meshitem
+            xmlWriter.writeEndElement(); // anchoritem
         }
 
     }
@@ -1294,7 +1278,7 @@
 
         if (hoveredItem) {
             // Ignore primitives
-            while (SKIPPED_CHILD_ITEMS.contains(itemClass(hoveredItem)))
+            while (hoveredItem && SKIPPED_CHILD_ITEMS.contains(itemClass(hoveredItem)))
                 hoveredItem = hoveredItem->parentItem();
 
             if (hoveredItem && hoveredItem != mCurrentItem) {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbdialog.cpp
--- a/src/hbcore/gui/hbdialog.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbdialog.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -177,7 +177,6 @@
 {
     Q_D(HbDialog);
     d->q_ptr = this;
-    d->init();
     d->timeout = HbPopupPrivate::timeoutValue(HbPopup::NoTimeout);
 }
 
@@ -189,7 +188,6 @@
 {
     Q_D(HbDialog);
     d->q_ptr = this;
-    d->init();
     d->timeout = HbPopupPrivate::timeoutValue(HbPopup::NoTimeout);
 }
 
@@ -259,12 +257,13 @@
         return;
     if (d->contentWidget)
         delete d->contentWidget;
+    prepareGeometryChange(); // needed to paint screen properly
     d->contentWidget = contentWidget;
     if (contentWidget) {
         contentWidget->setParentItem(this);
         HbStyle::setItemName(contentWidget,"content");
     }
-    repolish();
+    repolish();    
 }
 
 /*!
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbfadeitem.cpp
--- a/src/hbcore/gui/hbfadeitem.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbfadeitem.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -67,7 +67,7 @@
 {
     Q_Q(HbFadeItem);
 
-    q->setBackgroundItem(HbStyle::P_Fade_background);
+    setBackgroundItem(HbStyle::P_Fade_background);
 
     q->setAcceptHoverEvents(true);
     // This is needed to be able to block moving the focus to items behind background item by
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbmainwindow.cpp
--- a/src/hbcore/gui/hbmainwindow.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -61,6 +61,8 @@
 #include "hbmainwindoworientation_p.h"
 #include "hbfeaturemanager_r.h"
 #include "hboogmwatcher_p.h"
+#include "hbwindowobscured_p.h"
+#include "hbsleepmodelistener_p.h"
 
 #ifdef Q_OS_SYMBIAN
 #include <coecntrl.h>
@@ -197,6 +199,61 @@
  */
 
 /*!
+    \fn void HbMainWindow::obscured()
+
+    This signal is emited whenever the window is completely overlaped by another
+    window.
+
+    Application developers can use this signal to pause or stop painting when
+    the window is not visible to the user at all.
+
+    This signal has real implementation only for Symbian and X11 platforms. On
+    desktop platforms it is simulated via a settings window option.
+
+    The typical use case is to use the obscured() and revealed() signals in
+    connection with device dialogs (global pop-ups): When such a dialog is
+    shown, the application loses foreground (focus), but it may still be
+    partially visible because the dialogs will not fill the entire screen. To
+    get notified about such cases, combine your application's
+    foreground-background handling with handling also these signals.
+
+    Consider this as a best-effort solution only, the exact behavior depends on
+    the platform and may have limitations. For example on Symbian transparent
+    windows will never obscure another window, regardless of the content.
+
+    These signals are not a replacement to the focus-based ApplicationActivate
+    and ApplicationDeactivate events. An application may lose the focus
+    completely (i.e. lose foreground) even when it is still partially visible to
+    the user.
+
+    \sa revealed()
+    \sa isObscured()
+*/
+
+/*!
+    \fn void HbMainWindow::revealed()
+
+    This signal is emited whenever the window is visible to the user partially
+    or completely.
+
+    This signal has real implementation only for Symbian and X11 platforms. On
+    desktop platforms it is simulated via the settings option.
+
+    Consider this as a best-effort solution only, the exact behavior depends on
+    the platform and may have limitations. For example on Symbian transparent
+    windows may cause the revealed signal to be emitted even when the content is
+    not really visible.
+
+    These signals are not a replacement to the focus-based ApplicationActivate
+    and ApplicationDeactivate events. An application may lose the focus
+    completely (i.e. lose foreground) even when it is still partially visible to
+    the user.
+
+    \sa obscured()
+    \sa isObscured()
+*/
+
+/*!
   \class HbRootItem
 
   \brief The parent of all graphics items (including the clipping item (HbScreen)
@@ -230,6 +287,7 @@
 
     // No need for any default (e.g. blank white) background for this window.
     setAttribute(Qt::WA_NoSystemBackground);
+    setOptimizationFlag(QGraphicsView::DontSavePainterState);
 
     // Continue with basic initialization. Note: Prefer doing everything that is
     // not absolutely compulsory in _q_delayedConstruction instead.
@@ -274,7 +332,7 @@
 
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    setFrameShape(QFrame::NoFrame);
+    setFrameStyle(QFrame::NoFrame);
 
     // create scene and style
     d->mScene = new HbGraphicsScene(this);
@@ -337,6 +395,11 @@
     // are routed to it properly).
     HbOogmWatcher::instance();
 
+    // Make sure the sleep mode listener instance is created.
+    HbSleepModeListener::instance();
+
+    HbWindowObscured::installWindowEventFilter();
+
 #ifdef HB_GESTURE_FW
     // @todo remove after view auto-subscribes to gestures
     viewport()->grabGesture(Qt::TapGesture);
@@ -937,15 +1000,16 @@
                     d->mTheTestUtility = new HbTheTestUtility(this);
                 }
             }
-            // get rid of the splash screen widget (it is not visible to the user anyway at this point)
-            HbSplashScreen::destroy();
 #ifdef Q_OS_SYMBIAN
-            // disable surface transparency unless we were really asked to be transparent
+            // Disable surface transparency unless we were really asked to be transparent.
+            // Must be done before destroying the splash screen widget.
             if (!testAttribute(Qt::WA_TranslucentBackground)) {
                 RWindow *const window = static_cast<RWindow *>(effectiveWinId()->DrawableWindow());
                 window->SetSurfaceTransparency(false);
             }
 #endif
+            // Get rid of the splash screen widget. (it is not visible to the user anyway at this point)
+            HbSplashScreen::destroy();
         }
         // Notify that mainwindow is (most probably) ready.
         // The signal must be emitted always, even when there was no need to do anything.
@@ -1022,6 +1086,12 @@
         window->SetSurfaceTransparency(true);
     }
 #endif
+
+#if defined(Q_WS_X11)
+    Q_D(HbMainWindow);
+    d->x11HandleShowEvent(event);
+#endif // defined(Q_WS_X11)
+
     QGraphicsView::showEvent(event);
 }
 
@@ -1050,6 +1120,29 @@
     d->broadcastEvent(eventType);
 }
 
+/*!
+    True if the window is not visible to the user.  False if one or more pixels are visible.
+*/
+bool HbMainWindow::isObscured() const
+{
+    Q_D(const HbMainWindow);
+
+    return d->mObscuredState;
+}
+
+/*
+    // reimplemented from QWidget
+*/
+bool HbMainWindow::event(QEvent *event)
+{
+    Q_D(HbMainWindow);
+    if (event->type() == HbEvent::WindowObscuredChanged) {
+        HbWindowObscuredChangedEvent *wosEvent = static_cast<HbWindowObscuredChangedEvent *>(event);
+        d->setObscuredState(wosEvent->obscuredState());
+    }
+    return QGraphicsView::event(event);
+}
+
 HbRootItem::HbRootItem(QGraphicsItem *parent)
     : HbWidget(parent)
 {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbmainwindow.h
--- a/src/hbcore/gui/hbmainwindow.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow.h	Tue Jul 06 14:36:53 2010 +0300
@@ -49,6 +49,8 @@
                RESET unsetOrientation
                NOTIFY orientationChanged)
 
+    Q_PROPERTY(bool obscuredState READ isObscured)
+
 public:
     explicit HbMainWindow(QWidget *parent = 0, Hb::WindowFlags windowFlags = Hb::WindowFlagNone);
     ~HbMainWindow();
@@ -78,6 +80,8 @@
     void setAutomaticOrientationEffectEnabled(bool enabled = true);
     bool automaticOrientationEffectEnabled() const;
 
+    bool isObscured() const;
+
 public slots:
     void broadcastEvent(int eventType);
 
@@ -88,6 +92,8 @@
     void aboutToChangeOrientation();
     void aboutToChangeOrientation(Qt::Orientation newOrientation, bool animated);
     void orientationChanged(Qt::Orientation orientation);
+    void obscured();
+    void revealed();
 
 protected:
     void changeEvent(QEvent *event);
@@ -99,6 +105,7 @@
     void scrollContentsBy(int dx, int dy);
     void paintEvent(QPaintEvent *event);
     void showEvent(QShowEvent *event);
+    bool event(QEvent *event);
 
     HbMainWindowPrivate *const d_ptr;
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbmainwindow_p.cpp
--- a/src/hbcore/gui/hbmainwindow_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -47,22 +47,25 @@
 #include "hbcontentwidget_p.h"
 #include "hbscreen_p.h"
 #include "hbbackgrounditem_p.h"
-#include "hbforegroundwatcher_p.h"
-#include "hbcorepskeys_p.h"
-#include "hbmainwindoworientation_p.h"
+#include "hbcorepskeys_r.h"
 
 #include <QApplication>
 #include <QGraphicsLayout>
 #include <QLocale>
-#include <QDebug>
 
 #ifdef Q_OS_SYMBIAN
 #include "hbnativewindow_sym_p.h"
 #include "hbdevicedialogserverdefs_p.h"
+#include <qsymbianevent.h>
 
 const TUid deviceDialogUid = {0x20022FC5};
 #endif //Q_OS_SYMBIAN
 
+#if defined(Q_WS_X11)
+#include <X11/Xlib.h>
+#include <qx11info_x11.h>
+#endif // defined(Q_WS_X11)
+
 const int HbMainWindowPrivate::IdleEvent = QEvent::registerEventType();
 const int HbMainWindowPrivate::IdleOrientationEvent = QEvent::registerEventType();
 const int HbMainWindowPrivate::IdleOrientationFinalEvent = QEvent::registerEventType();
@@ -93,6 +96,7 @@
     mOrientationEffectFinished(false),
     mGVOrientationChangeEffectEnabled(false),
     mPendingPsPublish(false),
+    mMainWindowActive(false),
     mOrientation(Qt::Vertical),
     mRequestedOrientation(Qt::Vertical),
     mCurrentToolbar(0),
@@ -104,13 +108,19 @@
     mTheTestUtility(0),
     mIdleEventHandled(false),
     mToolbarWasAdded(false),
-    mAutomaticOrientationChangeAnimation(true)
+    mAutomaticOrientationChangeAnimation(true),
+    mObscuredState(true)
 #ifdef Q_OS_SYMBIAN
     ,
     mNativeWindow(0),
     mDevDlgClientSession(0)
 #endif
 {
+#if !defined(Q_WS_X11) && !defined(Q_WS_S60)
+    mObscuredState = false;  //For non-x11 and non-symbian we start with revealed state.
+#endif
+
+    qApp->installEventFilter(this);
 }
 
 HbMainWindowPrivate::~HbMainWindowPrivate()
@@ -297,7 +307,14 @@
         mOrientationEffectFinished = false;
         emit q->aboutToChangeOrientation();
         emit q->aboutToChangeOrientation(orientation, mAnimateOrientationSwitch);
-        HbInputSettingProxy::instance()->notifyScreenOrientationChange();
+        
+        // Notify settingproxy only when orientation is actually changing, when this
+        // happens the animate flag is enabled. This is quick fix to prevent wrong keyboard
+        // from opening after splashscreen update. Better and final solution needs to be
+        // designed.
+        if (animate) {
+            HbInputSettingProxy::instance()->notifyScreenOrientationChange();
+        }
     }
 
     mOrientation = orientation;
@@ -774,7 +791,7 @@
     if (view) {
         const Hb::SceneItems visibleItems(view->visibleItems());
         view->setTitleBarVisible(visibleItems & Hb::TitleBarItem); // also handles updating of the navigation button
-		view->setStatusBarVisible(visibleItems & Hb::StatusBarItem);
+        view->setStatusBarVisible(visibleItems & Hb::StatusBarItem);
 
         // ToolBar is a special case, since it depens on the current view's toolbar
         if (visibleItems & Hb::ToolBarItem) {
@@ -976,8 +993,6 @@
         addViewEffects();
         mClippingItem->delayedConstruction();
 
-        mViewStackWidget->delayedConstruction();
-
         connect(hbInstance->theme(), SIGNAL(changed()),
                 q, SLOT(_q_themeChanged()));
 
@@ -1061,12 +1076,64 @@
     return mClippingItem->size();
 }
 
+/*
+    Sets the obscured state of the window and emits a signal if nessasary.
+*/
+void HbMainWindowPrivate::setObscuredState(bool state)
+{
+    Q_Q(HbMainWindow);
+    if (state == true) {
+        if (mObscuredState == false) {
+            mObscuredState = true;
+            emit q->obscured();
+        }
+    } else {
+        if (mObscuredState == true) {
+            mObscuredState = false;
+            emit q->revealed();
+        }
+    }
+}
+
+bool HbMainWindowPrivate::eventFilter(QObject *watched, QEvent *event)
+{
+    switch (event->type()) {
+        case QEvent::ApplicationActivate:
+            mMainWindowActive = true;
+#ifdef Q_OS_SYMBIAN           
+            updateForegroundOrientationPSKey();
+#endif           
+            break;
+        case QEvent::ApplicationDeactivate:
+            mMainWindowActive = false;
+            break;
+        default:
+            break;
+    }
+    return QObject::eventFilter(watched, event);
+}
+
+#if defined(Q_WS_X11)
+bool HbMainWindowPrivate::x11HandleShowEvent(QShowEvent *)
+{
+    Q_Q(HbMainWindow);
+    Display *dpy = QX11Info::display();
+    WId id = q->effectiveWinId();
+    XWindowAttributes attr;
+    if (XGetWindowAttributes(dpy, id, &attr)) {
+        long allEventMask = attr.all_event_masks;
+        allEventMask |= VisibilityChangeMask;
+        XSelectInput(dpy, id, allEventMask);
+    }
+    return false;
+}
+#endif //Q_WS_X11
+
 #ifdef Q_OS_SYMBIAN
 void HbMainWindowPrivate::updateForegroundOrientationPSKey()
 {
-    // check current process is not devicedialog
-    RProcess process;
-    if (process.SecureId().iId != deviceDialogUid.iUid) {
+    RProcess process;    
+    if (process.SecureId().iId != deviceDialogUid.iUid && mMainWindowActive) {
         if (mDevDlgClientSession && !mPendingPsPublish) {
             int orie = mOrientation;
             if (!mAutomaticOrientationSwitch) {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbmainwindow_p.h
--- a/src/hbcore/gui/hbmainwindow_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -91,7 +91,8 @@
     QRectF contentRect() const;
     void setTransformedOrientation(Qt::Orientation orientation, bool animate = true);
     qreal rotation() const;
-
+    bool eventFilter(QObject *watched, QEvent *event);
+    
     void select(const HbDeviceProfile &profile, HbDeviceProfile *oldGlobalProfile = 0);
     HbDeviceProfile profile() const;
     HbDeviceProfile adjustedProfile(const HbDeviceProfile &profile) const;
@@ -114,6 +115,10 @@
 
     QGraphicsWidget *element(HbMainWindowPrivate::Element element) const;
 
+    void setObscuredState(bool state);
+#if defined(Q_WS_X11)
+    bool x11HandleShowEvent(QShowEvent *event);
+#endif
     HbGraphicsScene *mScene;
     HbBackgroundItem *mBgItem;
     HbScreen *mClippingItem;
@@ -136,6 +141,7 @@
     bool mAnimateOrientationSwitch;
     bool mGVOrientationChangeEffectEnabled;
     bool mPendingPsPublish;
+    bool mMainWindowActive;
     Qt::Orientation mOrientation;
     Qt::Orientation mRequestedOrientation;
     HbToolBar *mCurrentToolbar;
@@ -160,6 +166,7 @@
     bool mToolbarWasAdded;
     bool mAutomaticOrientationChangeAnimation;
     QTranslator mCommonTranslator;
+    bool mObscuredState;
 #ifdef Q_OS_SYMBIAN
     HbNativeWindow *mNativeWindow;
     RHbDeviceDialogClientSession *mDevDlgClientSession;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbmenu_p.h
--- a/src/hbcore/gui/hbmenu_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbmenu_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -71,12 +71,12 @@
 
     HbMenuListView *menuItemView;
     HbAction *subMenuAction;
-    HbMenu *activeSubMenu;
+    QPointer<HbMenu> activeSubMenu;
     bool actionTriggered;
     bool menuTimedOut(HbMenu* menu);
 
     HbMenu::MenuType menuType;
-    HbMenuItem *mSubMenuItem;
+    QPointer<HbMenuItem> mSubMenuItem;
 
     qreal mRightMargin;
     qreal mDownMargin;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbmenuitem_p.cpp
--- a/src/hbcore/gui/hbmenuitem_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbmenuitem_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -35,9 +35,14 @@
 #include "hbevent.h"
 #include "hbcolorscheme.h"
 #include "hbwidgetfeedback.h"
+#include "hbtapgesture.h"
+#include "hbnamespace_p.h"
+
+#include <QGraphicsScene>
 #ifdef HB_GESTURE_FW
 #include <QGesture>
 #endif
+
 Q_DECLARE_METATYPE (QAction*)
 
 /*!
@@ -266,19 +271,27 @@
 void HbMenuItem::gestureEvent(QGestureEvent *event)
 {
     //Q_D(HbMenuItem);
-    if(QTapGesture *gesture = qobject_cast<QTapGesture *>(event->gesture(Qt::TapGesture))) {
-        if (gesture->state() == Qt::GestureStarted) {           
+    if(HbTapGesture *gesture = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
+        if (gesture->state() == Qt::GestureStarted) {
+            if (scene())
+                scene()->setProperty(HbPrivate::OverridingGesture.latin1(),Qt::TapGesture);
+            gesture->setProperty(HbPrivate::ThresholdRect.latin1(), mapRectToScene(boundingRect()).toRect());
+
             // Tactile feedback                        
             HbWidgetFeedback::triggered(this, Hb::InstantPressed);
 
             pressStateChanged(true);
             event->accept();
         } else if (gesture->state() == Qt::GestureFinished) {
+            if (scene())
+                scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
             HbWidgetFeedback::triggered(this, Hb::InstantReleased);
             pressStateChanged(false);
             event->accept();            
             HbMenuPrivate::d_ptr(menu())->_q_triggerAction(this);
         } else if (gesture->state() == Qt::GestureCanceled) {
+            if (scene())
+                scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
             pressStateChanged(false);
         }
     }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbmenuitem_p.h
--- a/src/hbcore/gui/hbmenuitem_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbmenuitem_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -70,6 +70,7 @@
 #ifdef HB_GESTURE_FW
     void gestureEvent(QGestureEvent *event);
 #endif
+
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbMenuItem)
     Q_PRIVATE_SLOT(d_func(), void _q_updateItem())
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbpopup.cpp
--- a/src/hbcore/gui/hbpopup.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbpopup.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -34,6 +34,7 @@
 #include "hbtooltip.h"
 #include "hbglobal_p.h"
 #include "hbvgmaskeffect_p.h"
+#include "hbvgchainedeffect_p.h"
 #include <QTimer>
 #include <QGraphicsSceneMouseEvent>
 #include <QShowEvent>
@@ -42,6 +43,7 @@
 #include <QPointer>
 #include <QDebug>
 #include <QBitmap>
+#include <hbinstance_p.h>
 #include <QApplication> // krazy:exclude=qclasses
 
 #include <hbwidgetfeedback.h>
@@ -303,6 +305,8 @@
 
 HbPopupPrivate::~HbPopupPrivate()
 {
+    stopTimeout();
+    delete timeoutTimerInstance;
 }
 
 void HbPopupPrivate::init()
@@ -313,7 +317,9 @@
 
     // By default popups are focusable
     q->setFocusPolicy(Qt::StrongFocus);    
-    q->setBackgroundItem(HbStyle::P_Popup_background);    
+    setBackgroundItem(HbStyle::P_Popup_background);
+    q->updatePrimitives();
+
 
     // Only for popup without parent
     if (!q->parentItem()) {
@@ -323,21 +329,23 @@
         // Popup is invisible by default (explicit show or open call is required)
         q->setVisible(false);
     }
-    hidingInProgress = false;   
-
-    q->setFlag(QGraphicsItem::ItemClipsToShape);
-    q->setFlag(QGraphicsItem::ItemClipsChildrenToShape);
-
-#if QT_VERSION > 0x040602
-    q->grabGesture(Qt::TapGesture);
-    q->grabGesture(Qt::TapAndHoldGesture);
-    q->grabGesture(Qt::PanGesture);
-    q->grabGesture(Qt::SwipeGesture);
-    q->grabGesture(Qt::PinchGesture);
-#endif
-
+    hidingInProgress = false; 
+    QGraphicsItem::GraphicsItemFlags itemFlags = q->flags();
+    itemFlags |= QGraphicsItem::ItemClipsToShape;
+    itemFlags |= QGraphicsItem::ItemClipsChildrenToShape;
+    itemFlags |= QGraphicsItem::ItemSendsGeometryChanges;
+    //itemFlags |= QGraphicsItem::ItemIsPanel;
+    q->setFlags(itemFlags);  
+}
+void HbPopupPrivate::_q_appearEffectEnded(HbEffect::EffectStatus status)
+{
+	Q_UNUSED(status);
 }
 
+CSystemToneService* HbPopupPrivate::systemToneService()
+{
+	return HbInstancePrivate::d_ptr()->systemTone();
+}
 /*
  Sets the priority for a popup.
  A popup with higher priority is always shown on top of a popup with lower priority.
@@ -442,7 +450,7 @@
 {
     Q_Q(HbPopup);
     if (!timeoutTimerInstance) {
-        timeoutTimerInstance = new QTimer(q);
+        timeoutTimerInstance = new QTimer();
         timeoutTimerInstance->setSingleShot(true);
         q->connect(timeoutTimerInstance, SIGNAL(timeout()), q, SLOT(_q_timeoutFinished()));
     }
@@ -578,23 +586,38 @@
 {
 #if 0
     Q_Q(HbPopup);
+    // Contrary to the name, HbVgMaskEffect has a software
+    // implementation too, and we will actually force the usage of
+    // that here, ignoring the pure OpenVG version.
     if (!mVgMaskEffect) {
-        mVgMaskEffect = new HbVgMaskEffect();
-        mVgMaskEffect->install(q);
+        mVgMaskEffect = new HbVgMaskEffect;
+        // Masking does not work reliably on HW.
+        mVgMaskEffect->setForceSwMode(true);
+        // There may be children (like the scroll area in menus) that
+        // would mess up the masking so exclude those.
+        mVgMaskEffect->setIncludeSourceItemOnly(true);
+        if (!q->graphicsEffect()) {
+            // Attach the effect. Ownership is transferred to q.
+            mVgMaskEffect->install(q);
+        } else {
+            // Avoid replacing already set effects. Do not mask if
+            // this is not possible, otherwise we would unexpectedly
+            // delete the previously set graphics effect.
+            HbVgChainedEffect *c = qobject_cast<HbVgChainedEffect *>(q->graphicsEffect());
+            if (c) {
+                c->add(mVgMaskEffect);
+            } else {
+                delete mVgMaskEffect;
+            }
+        }
     }
-
     QPixmap image(QSize(static_cast<int>(q->backgroundItem()->boundingRect().width()),
-                            static_cast<int>(q->backgroundItem()->boundingRect().height())));
+                        static_cast<int>(q->backgroundItem()->boundingRect().height())));
     image.fill(Qt::transparent);
-
     QPainter imagePainter(&image);
-
     q->backgroundItem()->paint(&imagePainter, 0, 0);
-
     imagePainter.end();
-
     mVgMaskEffect->setMask(image);
-
 #endif
 }
 
@@ -789,11 +812,11 @@
     if ( d->frameType != frameType ) {
         switch( frameType ) {
         case HbPopup::Weak:
-            setBackgroundItem(HbStyle::P_Popup_background_weak);
+            d->setBackgroundItem(HbStyle::P_Popup_background_weak);
             break;
         case HbPopup::Strong:
         default:
-            setBackgroundItem(HbStyle::P_Popup_background);
+            d->setBackgroundItem(HbStyle::P_Popup_background);
             break;
         }
         d->frameType = frameType;
@@ -842,10 +865,11 @@
                                -boundingRect().height(),
                                boundingRect().width(),
                                0);
+                d->mStartEffect = true;
                 HbEffect::cancel(this);
-                HbEffect::start(this, d->effectType, "appear", 0, 0, QVariant(), extRect);
+                d->mStartEffect = false;
+                HbEffect::start(this, d->effectType, "appear", this, "_q_appearEffectEnded", QVariant(), extRect);
 #endif//HB_EFFECTS
-                d->mStartEffect = false;
             } else {
                 d->mStartEffect = true;
             }
@@ -885,6 +909,7 @@
                                          this, "_q_delayedHide",
                                          QVariant(), extRect)) {
                         d->delayedHide = false;
+                        return HbWidget::itemChange(change, value);
                     }
 #endif
                 }
@@ -907,6 +932,7 @@
             connect( w, SIGNAL(orientationChanged(Qt::Orientation)),
                      this, SLOT(_q_orientationChanged()) );
         }
+
     }
     return HbWidget::itemChange(change, value);
 }
@@ -985,6 +1011,7 @@
         if(d->addPopupToScene()) {
               d->duplicateShowEvent = true;
         }
+        //setActive(true);
         // Popup clears closed state
         d->closed = false;
         if (d->backgroundItem) {
@@ -1048,12 +1075,10 @@
 {    
     HbWidget::resizeEvent(event);
     updatePrimitives();
-#if 1
     Q_D(HbPopup);
     if (d->polished) {
         d->calculateShape();
     }
-#endif
 }
 
 /*!
@@ -1136,12 +1161,14 @@
                            -boundingRect().height(),
                            boundingRect().width(),
                            0);
+            d->mStartEffect = true;
             HbEffect::cancel(this);
-            HbEffect::start(this, d->effectType, "appear", 0, 0, QVariant(), extRect);            
+            d->mStartEffect = false;
+            HbEffect::start(this, d->effectType, "appear", this, "_q_appearEffectEnded", QVariant(), extRect);            
         }
 #endif//HB_EFFECTS
         //workaround ends
-    }    
+    }
     return HbWidget::event(event);
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbpopup.h
--- a/src/hbcore/gui/hbpopup.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbpopup.h	Tue Jul 06 14:36:53 2010 +0300
@@ -145,6 +145,7 @@
     Q_PRIVATE_SLOT(d_func(), void _q_delayedHide(HbEffect::EffectStatus status))
     Q_PRIVATE_SLOT(d_func(), void _q_orientationAboutToChange(Qt::Orientation orient, bool animate))
     Q_PRIVATE_SLOT(d_func(), void _q_orientationChanged())
+	Q_PRIVATE_SLOT(d_func(), void _q_appearEffectEnded(HbEffect::EffectStatus status))
 #endif // HB_EFFECTS
     Q_PRIVATE_SLOT(d_func(), void _q_timeoutFinished())
 };
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbpopup_p.h
--- a/src/hbcore/gui/hbpopup_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbpopup_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -30,12 +30,13 @@
 #include "hbpopup.h"
 #include "hbwidget_p.h"
 #include "hbnamespace_p.h"
-#include "hbvgmaskeffect_p.h"
 #ifdef HB_EFFECTS
 #include "hbeffect.h"
 #endif // HB_EFFECTS
 
+class HbVgMaskEffect;
 class HbPopupBackGround;
+class CSystemToneService;
 
 QT_FORWARD_DECLARE_CLASS(QEventLoop)
 QT_FORWARD_DECLARE_CLASS(QTimer)
@@ -62,6 +63,8 @@
         AlwaysOnTop = 255
     };
 
+	CSystemToneService *systemToneService();
+
 // Private features
 public:
     quint8 priority() const { return priorityValue; }
@@ -115,6 +118,7 @@
 public:
 #ifdef HB_EFFECTS
     void _q_delayedHide(HbEffect::EffectStatus status);
+	virtual void _q_appearEffectEnded(HbEffect::EffectStatus status);
     void _q_orientationAboutToChange(Qt::Orientation orient, bool animate);
 #endif // HB_EFFECTS
     void _q_timeoutFinished();
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbscreen.cpp
--- a/src/hbcore/gui/hbscreen.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbscreen.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -178,13 +178,6 @@
     }
 }
 
-void HbScreen::setGeometry(const QRectF &rect)
-{
-    prepareGeometryChange();
-    HbWidget::setGeometry(rect);
-}
-
-
 Qt::Orientation HbScreen::toolBarOrientation() const
 {
     return (Qt::Orientation)mToolBarOrientation;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbscreen_p.h
--- a/src/hbcore/gui/hbscreen_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbscreen_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -54,7 +54,6 @@
     bool contentUnderStatusBar() const;
     bool titleBarMinimizable() const;
     void delayedConstruction();
-    void setGeometry(const QRectF &rect);
     virtual bool event(QEvent *e);
 
 public slots:
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbscrollarea.cpp
--- a/src/hbcore/gui/hbscrollarea.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbscrollarea.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -31,6 +31,8 @@
 #include <hbwidgetfeedback.h>
 #include <hbevent.h>
 #include "hbglobal_p.h"
+#include <hbtapgesture.h>
+#include <hbnamespace_p.h>
 
 #include <QGesture>
 
@@ -142,7 +144,7 @@
 
 /*!
     \fn void HbScrollArea::scrollPositionChanged(QPointF newposition)
-    This signal is emitted when scroll position is changed.
+    This signal is emitted when scroll position is changed and someone is connected to the signal.
 */
 
 /*!
@@ -441,7 +443,13 @@
 
     bool isChanged = (d->mScrollDirections != value);
 
-    d->mScrollDirections = value;
+    d->mScrollDirections = value;        
+    if (d->mContents && isChanged) {
+        QPointF pos = d->mContents->pos();
+        QEvent layoutRequest(QEvent::LayoutRequest);
+        QCoreApplication::sendEvent(this, &layoutRequest);
+        d->mContents->setPos(pos);
+    }
 
     if (isChanged) {
         emit scrollDirectionsChanged( value );
@@ -691,10 +699,18 @@
                 d->stopAnimating();
             }
         } else if( event->type() == QEvent::GestureOverride ) {
-            if(static_cast<QGestureEvent *>(event)->gesture(Qt::TapGesture) &&
-                    d->mIsAnimating && !d->positionOutOfBounds() && !d->mMultiFlickEnabled) {
-                event->accept();
-                return true;
+            if(HbTapGesture *tap = qobject_cast<HbTapGesture*>(static_cast<QGestureEvent *>(event)->gesture(Qt::TapGesture))) {
+                if (d->mIsAnimating && !d->positionOutOfBounds() && !d->mMultiFlickEnabled) {
+                    event->accept();
+                    return true;
+                } else if (tap->state() == Qt::GestureStarted){
+                    if (d->mAbleToScrollY) {
+                        tap->setProperty(HbPrivate::VerticallyRestricted.latin1(), true);
+                    }
+                    if (d->mAbleToScrollX){
+                        tap->setProperty(HbPrivate::HorizontallyRestricted.latin1(), true);
+                    }
+                }
             }
         } else if (event->type() == QEvent::LayoutRequest) {
             if (d->mContents) {
@@ -768,6 +784,14 @@
         if (isVisible()) {            
             d->adjustContent();
         }
+
+        if (d->mAbleToScrollX && d->mHorizontalScrollBar->isVisible()) {
+            d->updateScrollBar(Qt::Horizontal);
+        }
+
+        if (d->mAbleToScrollY && d->mVerticalScrollBar->isVisible()) {
+            d->updateScrollBar(Qt::Vertical);
+        }
     }  // no else
 
     return false;
@@ -1050,12 +1074,15 @@
 */
 void HbScrollArea::scrollContentsTo (const QPointF& newPosition, int time) {
     Q_D(HbScrollArea);
+
+    if (!contentWidget())
+        return;
+
     if (time > 0){
         d->startTargetAnimation (newPosition, qMax (0, time));
     } else {
         scrollByAmount(newPosition - (-d->mContents->pos()));
         d->stopScrolling();
-
     }
 }
 
@@ -1107,4 +1134,45 @@
     }
 }
 
+/*!
+  \reimp
+
+ */
+void HbScrollArea::timerEvent(QTimerEvent *event)
+{
+    Q_D(HbScrollArea);
+    if (event->timerId() == d->mScrollTimerId) {
+        d->_q_animateScrollTimeout();
+    } else if (event->timerId() == d->mScrollBarHideTimerId) {
+        d->_q_hideScrollBars();
+    }
+}
+
+/*!
+    \reimp
+*/
+void HbScrollArea::disconnectNotify (const char *signal)
+{
+    Q_D(HbScrollArea);
+    if (d->mEmitPositionChangedSignal &&
+        QLatin1String(signal) == SIGNAL(scrollPositionChanged(QPointF))) {
+        if (receivers(SIGNAL(scrollPositionChanged(QPointF))) == 0) {
+            d->mEmitPositionChangedSignal = false;
+        }
+    }
+    HbWidget::disconnectNotify(signal);
+}
+
+/*!
+    \reimp
+*/
+void HbScrollArea::connectNotify(const char * signal)
+{
+    Q_D(HbScrollArea);
+    if (!d->mEmitPositionChangedSignal &&
+        QLatin1String(signal) == SIGNAL(scrollPositionChanged(QPointF))) {
+        d->mEmitPositionChangedSignal = true;
+    }
+    HbWidget::connectNotify(signal);
+}
 #include "moc_hbscrollarea.cpp"
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbscrollarea.h
--- a/src/hbcore/gui/hbscrollarea.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbscrollarea.h	Tue Jul 06 14:36:53 2010 +0300
@@ -127,7 +127,10 @@
     virtual void focusOutEvent(QFocusEvent *event);
     virtual bool scrollByAmount(const QPointF &delta);
     virtual void polish(HbStyleParameters &params);
+    virtual void timerEvent(QTimerEvent *event);
     virtual bool eventFilter(QObject *obj, QEvent *event);
+    virtual void connectNotify(const char *signal);
+    virtual void disconnectNotify(const char *signal);
 #ifdef HB_GESTURE_FW
     virtual void gestureEvent(QGestureEvent *event);    
 #endif
@@ -148,8 +151,6 @@
 
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbScrollArea)
-    Q_PRIVATE_SLOT(d_func(), void _q_animateScrollTimeout())
-    Q_PRIVATE_SLOT(d_func(), void _q_hideScrollBars())
     Q_PRIVATE_SLOT(d_func(), void _q_thumbPositionChanged(qreal value, Qt::Orientation orientation))
     Q_PRIVATE_SLOT(d_func(), void _q_groovePressed(qreal value, Qt::Orientation orientation))
     Q_PRIVATE_SLOT(d_func(), void _q_thumbPressed())
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbscrollarea_p.cpp
--- a/src/hbcore/gui/hbscrollarea_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbscrollarea_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -85,7 +85,7 @@
         mIsScrolling(false),
         mIsAnimating(false),
         mScrollSpeed (QPointF (0,0)),
-        mScrollTimer(0),
+        mScrollTimerId(0),
         mScrollElapsedTime(),
         mLastElapsedTime(0.0),
         mTargetAnimationInProgress(false),
@@ -94,7 +94,7 @@
         mTargetDelta(QPointF(0,0)),
         mAnimationInitialPosition (QPointF(0,0)),
         mAnimationShape (0),
-        mScrollBarHideTimer(0),
+        mScrollBarHideTimerId(0),
         mFrictionEnabled(true),
         mResetAlignment(true),
         mClampingStyle(HbScrollArea::BounceBackClamping),
@@ -105,6 +105,7 @@
         mLayoutDirection(Qt::LeftToRight),
         mAlignment(Qt::AlignLeft | Qt::AlignTop),
         mContinuationIndicators(false),
+        mEmitPositionChangedSignal(false),
         continuationIndicatorTopItem(0),
         continuationIndicatorBottomItem(0),
         continuationIndicatorLeftItem(0),
@@ -123,16 +124,13 @@
 
 HbScrollAreaPrivate::~HbScrollAreaPrivate()
 {    
+    delete mAnimationShape;
 }
 
 void HbScrollAreaPrivate::init()
 {
     Q_Q( HbScrollArea );
 
-    mScrollTimer.setParent(q);
-    mScrollBarHideTimer.setParent(q);
-    mScrollBarHideTimer.setSingleShot(true);
-
     q->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     q->setFlag( QGraphicsItem::ItemClipsChildrenToShape, true );
     q->setFocusPolicy(Qt::StrongFocus);
@@ -172,8 +170,7 @@
     QObject::connect(mHorizontalScrollBar, SIGNAL(valueChanged(qreal, Qt::Orientation)), q, SLOT(_q_thumbPositionChanged(qreal, Qt::Orientation)));
     QObject::connect(mHorizontalScrollBar, SIGNAL(valueChangeRequested(qreal, Qt::Orientation)), q, SLOT(_q_groovePressed(qreal, Qt::Orientation)));
 
-    QObject::connect(&(mScrollTimer), SIGNAL(timeout()), q, SLOT(_q_animateScrollTimeout()));
-    QObject::connect(&(mScrollBarHideTimer), SIGNAL(timeout()), q, SLOT(_q_hideScrollBars()));
+
 }
 
 void HbScrollAreaPrivate::replaceScrollBar(Qt::Orientation orientation, HbScrollBar *scrollBar)
@@ -294,9 +291,8 @@
         if (mAbleToScrollY && mVerticalScrollBarPolicy == HbScrollArea::ScrollBarAutoHide) {
             displayScrollBar(Qt::Vertical);
         }
-        if (mScrollBarHideTimer.isActive()) {
-            mScrollBarHideTimer.stop();
-        }
+        stopScrollbarHideTimer();
+
     } else {
 
         if (mAbleToScrollX && mHorizontalScrollBar->isVisible()) {
@@ -358,11 +354,16 @@
     // Launch the animation timer
     if (!mContents)
         return;
-    if (!mScrollTimer.isActive()) {
-        mScrollElapsedTime.restart();
-        mLastElapsedTime = 0.0;
-        mScrollTimer.start(ANIMATION_INTERVAL);
-        mIsAnimating = true;
+    if (mScrollTimerId == 0) {
+        Q_Q( HbScrollArea );
+        mScrollTimerId = q->startTimer(ANIMATION_INTERVAL);
+
+        //make sure we where able to start the timer
+        if (mScrollTimerId != 0) {
+            mScrollElapsedTime.restart();
+            mLastElapsedTime = 0.0;
+            mIsAnimating = true;
+        }
     }
 }
 
@@ -371,7 +372,7 @@
     Q_Q( HbScrollArea );
     if (mHorizontalScrollBarPolicy == HbScrollArea::ScrollBarAutoHide ||
         mVerticalScrollBarPolicy == HbScrollArea::ScrollBarAutoHide) {
-        mScrollBarHideTimer.start(SCROLLBAR_HIDE_TIMEOUT);
+        startScrollbarHideTimer();
     }
     if (mIsScrolling) {
         if (mScrollFeedbackOngoing) {
@@ -386,11 +387,37 @@
 
 void HbScrollAreaPrivate::stopAnimating()
 {
-    mScrollTimer.stop();
+    if (mIsAnimating) {
+        Q_Q( HbScrollArea );
+        q->killTimer(mScrollTimerId);
+        mScrollTimerId = 0;
+        mIsAnimating = false;
+        stopScrolling();
+    }
+}
+
+void HbScrollAreaPrivate::startScrollbarHideTimer()
+{
+    if (mScrollBarHideTimerId == 0){
+        Q_Q( HbScrollArea );
+        mScrollBarHideTimerId = q->startTimer(INITIAL_SCROLLBAR_HIDE_TIMEOUT);
+    }
 
-    mIsAnimating = false;
+}
 
-    stopScrolling();
+void HbScrollAreaPrivate::stopScrollbarHideTimer()
+{
+    if (mScrollBarHideTimerId != 0) {
+        Q_Q( HbScrollArea );
+        q->killTimer(mScrollBarHideTimerId);
+        mScrollBarHideTimerId = 0;
+    }
+}
+
+void HbScrollAreaPrivate::reStartScrollbarHideTimer()
+{
+  stopScrollbarHideTimer();
+  startScrollbarHideTimer();
 }
 
 /*
@@ -559,6 +586,7 @@
         Q_Q(HbScrollArea);
 
         mContents->setPos(newPosition);
+     if (mEmitPositionChangedSignal)
         emit q->scrollPositionChanged(-newPosition);
     }
 }
@@ -850,8 +878,8 @@
             mVerticalScrollBar->setVisible(false);
     }
 
-    if (scrollBarsVisible && !mScrollBarHideTimer.isActive()) {
-        mScrollBarHideTimer.start(INITIAL_SCROLLBAR_HIDE_TIMEOUT);
+    if (scrollBarsVisible) {
+        startScrollbarHideTimer();
     }
 }
 
@@ -906,9 +934,10 @@
     if (mHorizontalScrollBar && mHorizontalScrollBarPolicy == HbScrollArea::ScrollBarAutoHide) {
         if (HbScrollBarPrivate::d_ptr(mHorizontalScrollBar)->isPressed() ||
             (mVerticalScrollBar && HbScrollBarPrivate::d_ptr(mVerticalScrollBar)->isPressed())) {
-            mScrollBarHideTimer.start();
+            startScrollbarHideTimer();
         } else if(mHorizontalScrollBarPolicy != HbScrollArea::ScrollBarAlwaysOn
                   && mHorizontalScrollBar->isVisible()){
+            stopScrollbarHideTimer();
             mHorizontalScrollBar->setVisible(false);
 
         }
@@ -916,9 +945,10 @@
     if (mVerticalScrollBar && mVerticalScrollBarPolicy == HbScrollArea::ScrollBarAutoHide) {
         if (HbScrollBarPrivate::d_ptr(mVerticalScrollBar)->isPressed() ||
             (mHorizontalScrollBar && HbScrollBarPrivate::d_ptr(mHorizontalScrollBar)->isPressed())) {
-            mScrollBarHideTimer.start();
+            startScrollbarHideTimer();
         } else if(mVerticalScrollBarPolicy != HbScrollArea::ScrollBarAlwaysOn
                   && mVerticalScrollBar->isVisible()){
+            stopScrollbarHideTimer();
             mVerticalScrollBar->setVisible(false);
         }
     }
@@ -947,10 +977,7 @@
 
     setContentPosition(value, orientation, false);
 
-    if (mScrollBarHideTimer.isActive()) {
-        mScrollBarHideTimer.stop();
-        mScrollBarHideTimer.start();
-    }
+    reStartScrollbarHideTimer();
     if (mContinuationIndicators) {
         updateIndicators(-mContents->pos());
     }
@@ -976,10 +1003,7 @@
 
     setContentPosition(value, orientation, true);
 
-    if (mScrollBarHideTimer.isActive()) {
-        mScrollBarHideTimer.stop();
-        mScrollBarHideTimer.start();
-    }
+    reStartScrollbarHideTimer();
     if (mContinuationIndicators) {
         updateIndicators(-mContents->pos());
     }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbscrollarea_p.h
--- a/src/hbcore/gui/hbscrollarea_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbscrollarea_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -73,6 +73,9 @@
 
     void startAnimating();
     void stopAnimating();
+    void startScrollbarHideTimer();
+    void stopScrollbarHideTimer();
+    void reStartScrollbarHideTimer();
     virtual void stopScrolling();
 
     void animateScroll(QPointF speed); // speed in pixels per millisecond
@@ -157,7 +160,7 @@
     bool mIsAnimating;
 
     QPointF mScrollSpeed; // in pixels per ms
-    QTimer mScrollTimer;
+    int mScrollTimerId;
     QTime mScrollElapsedTime;
     qreal mLastElapsedTime;
 
@@ -168,7 +171,7 @@
     QPointF mAnimationInitialPosition;
     QEasingCurve* mAnimationShape;
 
-    QTimer mScrollBarHideTimer;
+    int mScrollBarHideTimerId;
 
     bool mFrictionEnabled;
     bool mResetAlignment;
@@ -192,6 +195,7 @@
 
     Qt::Alignment mAlignment;
     bool mContinuationIndicators;
+    bool mEmitPositionChangedSignal;
     QGraphicsItem *continuationIndicatorTopItem;
     QGraphicsItem *continuationIndicatorBottomItem;
     QGraphicsItem *continuationIndicatorLeftItem;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbsettingswindow_p.cpp
--- a/src/hbcore/gui/hbsettingswindow_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbsettingswindow_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -103,6 +103,9 @@
     mAnimationButton = new QPushButton(tr("&Animation on"), this); //krazy:exclude=qclasses
     mViewPortSizeButton = new QPushButton(tr("&Set custom ViewPortSize"), this); //krazy:exclude=qclasses
 
+    mWindowObscured = false;
+    mWindowObscuredButton = new QPushButton(tr("Obscure"), this);
+
     resolutionComboBox->addItems(HbDeviceProfile::profileNames());
     directionComboBox->addItems(QStringList() << tr("Left to right") << tr("Right to left"));
     dragToResizeComboBox->addItems(QStringList() << tr("Disabled") << tr("Enabled"));
@@ -120,7 +123,7 @@
     connect(mLightsButton, SIGNAL(pressed()), SLOT(toggleLights()));
     connect(mAnimationButton, SIGNAL(pressed()), SLOT(toggleAnimation()));
     connect(mViewPortSizeButton, SIGNAL(pressed()), SLOT(resizeViewPort()));
-
+    connect(mWindowObscuredButton, SIGNAL(pressed()), SLOT(toggleWindowObscured()));
     QVBoxLayout *boxLayout = new QVBoxLayout(this); //krazy:exclude=qclasses
 
     QGroupBox *mainGroup = new QGroupBox(this); //krazy:exclude=qclasses
@@ -130,6 +133,7 @@
     layout->addRow(tr("&Direction"), directionComboBox);
     layout->addRow(tr("&Drag to resize"), dragToResizeComboBox);
     layout->addRow(mViewPortSizeButton);
+    layout->addRow(mWindowObscuredButton);
 
     mainGroup->setLayout(layout);
     boxLayout->addWidget(mainGroup);
@@ -412,3 +416,20 @@
 
 }
 
+void HbSettingsWindow::toggleWindowObscured()
+{
+    if (!mWindowObscured) {
+        mWindowObscured = true;
+        mWindowObscuredButton->setText(tr("Reveal"));
+    } else {
+        mWindowObscured = false;
+        mWindowObscuredButton->setText(tr("Obscure"));
+    }
+
+    QList<HbMainWindow *> mainWindowList = hbInstance->allMainWindows();
+    for (int i = 0; i < mainWindowList.count(); ++i) {
+        HbEvent *obscureChangedEvent = new HbWindowObscuredChangedEvent(mWindowObscured);
+        QCoreApplication::postEvent(mainWindowList[i], obscureChangedEvent);
+    }
+}
+
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbsettingswindow_p.h
--- a/src/hbcore/gui/hbsettingswindow_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbsettingswindow_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -58,6 +58,7 @@
     void toggleLights();
     void toggleAnimation();
     void resizeViewPort();
+    void toggleWindowObscured();
 
 private:
     void initStartUpValues();
@@ -79,9 +80,11 @@
     QPushButton *mLightsButton;
     QPushButton *mAnimationButton;
     QPushButton *mViewPortSizeButton;
+    QPushButton *mWindowObscuredButton;
     bool mLights;
     bool mAnimation;
     bool mCustomViewPortSize;
+    bool mWindowObscured;
     QSizeF mViewPortOriginalSize;
 
 #ifdef HB_CSS_INSPECTOR
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbtoolbar_p.cpp
--- a/src/hbcore/gui/hbtoolbar_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbtoolbar_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -44,7 +44,6 @@
 #include <QWidget> // for QWIDGETSIZE_MAX
 #include <QActionEvent>
 #include <QDebug>
-#include <QGesture>
 
 #ifdef HB_EFFECTS
 #include "hbeffectinternal_p.h"
@@ -93,8 +92,6 @@
 
 void HbToolBarPrivate::init()
 {
-    Q_Q(HbToolBar);
-    q->grabGesture(Qt::PanGesture);
 }
 
 void HbToolBarPrivate::doLazyInit()
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbtoolbarextension.cpp
--- a/src/hbcore/gui/hbtoolbarextension.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbtoolbarextension.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -41,7 +41,6 @@
 #include <QDebug>
 #include <QGraphicsGridLayout>
 #include <QEventLoop>
-#include <QPainter>
 #include <QGraphicsLinearLayout> 
 
 /*!
@@ -112,9 +111,8 @@
 
 void HbToolBarExtensionPrivate::doLazyInit()
 {
-    Q_Q(HbToolBarExtension);
     if ( !lazyInitDone ) {
-        q->setBackgroundItem( HbStyle::P_ToolBarExtension_background );
+        setBackgroundItem(HbStyle::P_ToolBarExtension_background);
 #ifdef HB_EFFECTS
         if (!extensionEffectsLoaded){
             HbEffectInternal::add("HB_TBE", "tbe_button_click", "clicked");
@@ -214,6 +212,9 @@
     HbAction *hbAction = qobject_cast<HbAction *>( event->action() );
 
     if (hbAction) {
+        if (!q->contentWidget()) {
+            initialiseContent(); // create now to prevent mem leak below
+        }
         button = new HbToolButton(hbAction, q->contentWidget());
     } else {
         button = new HbToolButton(q->contentWidget());
@@ -338,7 +339,6 @@
  */
 HbToolBarExtension::~HbToolBarExtension()
 {
-    disconnect();
 }
 
 /*!
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbtoolbutton.cpp
--- a/src/hbcore/gui/hbtoolbutton.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbtoolbutton.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -243,11 +243,12 @@
     Q_Q(HbToolButton);
     mRepolishRequested = true;
     polishPending = false;
-    q->updateGeometry();
-    QSizeF size = q->minimumSize();
     //Workaround (causing extra polish)
     mSizeHintPolish = false;
     //workaround ends
+    q->updateGeometry();
+    QCoreApplication::sendPostedEvents(q, QEvent::LayoutRequest);
+    QSizeF size = q->minimumSize();
     return size;
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbtooltiplabel_p.cpp
--- a/src/hbcore/gui/hbtooltiplabel_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbtooltiplabel_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -57,7 +57,7 @@
 void HbToolTipLabelPrivate::init()
 {
     Q_Q(HbToolTipLabel);
-    q->setBackgroundItem(HbStyle::P_ToolTip_background);
+    setBackgroundItem(HbStyle::P_ToolTip_background);
 
     q->setFocusPolicy(Qt::NoFocus);
     q->setTimeout(HbPopup::NoTimeout);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbwidget.cpp
--- a/src/hbcore/gui/hbwidget.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbwidget.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -33,7 +33,8 @@
 #include "hbgraphicsscene.h"
 #include "hbgraphicsscene_p.h"
 #include "hbdeviceprofile.h"
-#include "hbspaceritem_p.h"
+#include "hbtapgesture.h"
+#include "hbnamespace_p.h"
 #include <QCoreApplication>
 #include <QMetaType>
 #include <QAction>
@@ -67,8 +68,8 @@
     polishPending(false),
     themingPending(true),
     repolishOutstanding(false),
+    mHandlingRepolishSynchronously(false),
     notifyScene(false),
-    pluginBaseId(0),
     focusGroup(0),
     focusActiveType(HbStyle::P_None),
     focusResidualType(HbStyle::P_None),
@@ -89,68 +90,28 @@
         delete backgroundItem;
         backgroundItem = 0;
     }
-
-    // need to delete the hash values
-    QList<QGraphicsLayoutItem *> deletedSpacers = mSpacers.values();
-    mSpacers.clear();
-    qDeleteAll( deletedSpacers );            
-}
-
-/*!
-    Creates a new spacer item with the given \a name.
-
-    Returns a pointer to the newly created spacer item. Widget keeps the ownership.
-*/
-QGraphicsLayoutItem *HbWidgetPrivate::createSpacerItem( const QString &name )
-{
-#ifndef Q_OS_SYMBIAN
-    Q_ASSERT( !name.isEmpty() );
-    // check in desktop environments that the item does not exist already
-    Q_ASSERT( !mSpacers.contains( name ) );
-#endif
-
-    HbSpacerItem *newSpacer = new HbSpacerItem();
-    mSpacers.insert( name, newSpacer );
-    return newSpacer;
 }
 
-/*!
-    
-    \deprecated HbWidget::setBackgroundItem(HbStyle::Primitive, int)
-    is deprecated. Use HbWidget::setBackgroundItem(QGraphicsItem *item, int zValue) instead.
-    
-    Creates background item to the widget from style primitive.
-    
-    Creates a new background item to the widget and the reparents it to
-    be child of the widget. Also Z-value of the background item will be 
-    changed to zValue. By default the zValue is -1, which should be 
-    behind other widget content. Background item will be always resized 
-    to be same size as the widgets bounding rect. 
-    
-    If type is HbStyle::P_None, the background item will be removed from
-    widget.
-    
-    Previously set background item will be deleted.
- */
-void HbWidget::setBackgroundItem(HbStyle::Primitive type, int zValue)
+void HbWidgetPrivate::setBackgroundItem(HbStyle::Primitive type, int zValue)
 {
-    Q_D(HbWidget);
-    if(type!=d->backgroundPrimitiveType || type == HbStyle::P_None) {
-        if (d->backgroundItem) {
-            delete d->backgroundItem;
-            d->backgroundItem = 0;
+    Q_Q(HbWidget);
+    if(type!=backgroundPrimitiveType || type == HbStyle::P_None) {
+        if (backgroundItem) {
+            delete backgroundItem;
+            backgroundItem = 0;
         }
-        d->backgroundPrimitiveType = type;
-        d->backgroundItem = style()->createPrimitive(d->backgroundPrimitiveType, const_cast<HbWidget*>(this));
-        if(d->backgroundItem) {
-            d->backgroundItem->setParentItem(this);
+        backgroundPrimitiveType = type;
+        backgroundItem = q->style()->createPrimitive(backgroundPrimitiveType, const_cast<HbWidget*>(q));
+        if(backgroundItem) {
+            backgroundItem->setParentItem(q);
         }
-        updatePrimitives();
+    q->updatePrimitives();
+}
+    if(backgroundItem && zValue != backgroundItem->zValue()) {
+        backgroundItem->setZValue(zValue);
     }
-    if(d->backgroundItem && zValue != d->backgroundItem->zValue()) {
-        d->backgroundItem->setZValue(zValue);
-    }
-}
+} 
+
 
 /*!
     Sets background item to the widget.
@@ -182,6 +143,7 @@
         d->backgroundItem->setZValue(zValue);
         d->updateBackgroundItemSize();
     }
+    updatePrimitives();
 }
 
 /*!
@@ -343,30 +305,6 @@
     }
 }
 
-/*!
-    Test if some item in our parent hierarchy has
-    the Hb::InputMethodNeutral flag set.
-*/
-bool HbWidgetPrivate::isInputMethodNeutral()
-{
-    Q_Q(HbWidget);
-
-    // Test the widget itself...
-    if(q->testAttribute(Hb::InputMethodNeutral)) {
-        return true;
-    }
-
-    // and then all parents
-    QGraphicsWidget* i = q->parentWidget();
-    while(i) {
-        HbWidget* w = qobject_cast<HbWidget *>(i);
-        if(w && w->testAttribute(Hb::InputMethodNeutral)) {
-            return true;
-        }
-        i = i->parentWidget();
-    }
-    return false;
-}
 
 /*!
     \class HbWidget
@@ -464,6 +402,7 @@
 {
     Q_D( HbWidget );
     d->q_ptr = this;
+    setAttribute(Hb::Widget, true);
 
 #ifdef HB_TESTABILITY 
 	if(d->testabilitySignal) {
@@ -482,6 +421,7 @@
 {
     Q_D( HbWidget );
     d->q_ptr = this;
+    setAttribute(Hb::Widget, true);
 
 #ifdef HB_TESTABILITY 
 	if (d->testabilitySignal) {
@@ -523,21 +463,6 @@
         QCoreApplication::sendEvent( parentWidget(), &event1 );        
         //End of snippet 1
     }
-
-#if QT_VERSION >= 0x040600
-    if(!d->isInputMethodNeutral() && !(flags() & QGraphicsItem::ItemAcceptsInputMethod)) {
-        // Make sure the input panel is closed if this widget is not input method neutral or
-        // it does not accept input method
-        // Send close input panel event.
-        QInputContext *ic = qApp->inputContext();
-        if (ic) {
-            QEvent *closeEvent = new QEvent(QEvent::CloseSoftwareInputPanel);
-            ic->filterEvent(closeEvent);
-            delete closeEvent;
-        }
-    }
-#endif
-
 }
 
 /*! 
@@ -619,22 +544,21 @@
 }
 
 /*!
-    This function returns the base id of the style plugin of the widget or
-	\c 0 if the widget is not plugin based.
+    \deprecated HbWidget::pluginBaseId()
+        is deprecated. Style plugins are deprecated.
 */
 int HbWidget::pluginBaseId() const
 {
-    Q_D(const HbWidget);
-    return d->pluginBaseId;
+    return 0; // deprecated
 }
 
 /*!
-    Sets the base id of the style plugin of the widget.
+    \deprecated HbWidget::setPluginBaseId(int)
+        is deprecated. Style plugins are deprecated.
 */
 void HbWidget::setPluginBaseId( int baseId )
 {
-    Q_D(HbWidget);
-    d->pluginBaseId = baseId;
+    Q_UNUSED(baseId); // deprecated
 }
 
 /*!
@@ -697,7 +621,6 @@
         }
         d->updateBackgroundItemSize();
     }
-
     if (d->focusPrimitive(HbWidget::FocusHighlightResidual)) {
         style()->updatePrimitive(d->focusPrimitive(HbWidget::FocusHighlightResidual),
             d->focusResidualType, &option);        
@@ -860,6 +783,15 @@
             d->polishPending = false;
             HbStyleParameters params;
             polish( params );
+            if (scene()) {
+             // The widget is polished again or is beign polished now. As we set layout to widget in polishEvent,
+             // inform scene to polish any new child items and handle any resulting layoutrequest
+             // events before drawing.
+                HbGraphicsScene *hbscene = qobject_cast<HbGraphicsScene*>(scene());
+                if (hbscene) {
+                    HbGraphicsScenePrivate::d_ptr(hbscene)->mPolishWidgets = true;
+                }
+            }
         }
     }
     else if (change == QGraphicsItem::ItemChildAddedChange) {
@@ -932,12 +864,9 @@
     backend). When overriding, always call the base classes 
     impelentation.
 
-    If you are implementing a custom widget that has a style plugin
-    you must make sure that pluginBaseId is set.
-
     \param params, For querying (custom) style parameters from HbStyle.
 
-    \sa polish(), pluginBaseId()
+    \sa polish()
 */
 void HbWidget::polish( HbStyleParameters& params )
 {
@@ -975,6 +904,17 @@
         d->repolishOutstanding = true;
         QEvent* polishEvent = new QEvent( QEvent::Polish );
         QCoreApplication::postEvent(this, polishEvent);
+        // If no one is handling repolish synchronously, lets make sure they are handled
+        // before painting. For example view items handle them synchronously.
+        if (scene() && !d->mHandlingRepolishSynchronously) {
+            // The widget needs to be polished again. As we set layout to widget in polishEvent,
+            // inform scene to handle polish and any resulting layoutrequest
+            // events before drawing.
+            HbGraphicsScene *hbscene = qobject_cast<HbGraphicsScene*>(scene());
+            if (hbscene) {
+                HbGraphicsScenePrivate::d_ptr(hbscene)->mRepolishWidgets = true;
+            }
+        }
     }
 }
 
@@ -1034,17 +974,15 @@
 /*!
     Returns primitive which HbStyle::itemName equals to \a itemName.
     
-    If the \a itemName is empty, the layout is returned. 
+    If the \a itemName is empty, the layout is returned, otherwise
+    returns the primitive that matches the \a itemName.
     
-    If the \a itemName does not match any primitive, \a itemName is mapped to owned spacers.
-
     If the \a itemName cannot be mapped to any of the above, returns 0.
 
     \sa HbStyle::itemName()
 */
 QGraphicsLayoutItem *HbWidget::layoutPrimitive(const QString &itemName) const
 {
-    Q_D(const HbWidget);
     if ( itemName == "" ) {
         return layout();
     } else {
@@ -1056,11 +994,6 @@
             }
         }
     }
-
-    if ( d->mSpacers.contains(itemName) ) {
-        return d->mSpacers.value(itemName); 
-    }
- 
     return 0;
 }
 
@@ -1367,3 +1300,18 @@
     }
     return primitive;
 }
+
+bool HbWidget::sceneEventFilter (QGraphicsItem *watched, QEvent *event)
+{
+    if(event->type() == QEvent::Gesture && watched->type() == Hb::ItemType_TouchArea) {
+        QGestureEvent* ge = static_cast<QGestureEvent*>(event);
+        HbTapGesture* tap = qobject_cast<HbTapGesture*>(ge->gesture(Qt::TapGesture));
+
+        if (tap && tap->state() == Qt::GestureStarted) {
+            tap->setProperty(HbPrivate::ThresholdRect.latin1(), watched->mapRectToScene(watched->boundingRect()).toRect());
+        }
+        sceneEvent(event);
+        return true;
+    }
+    return HbWidgetBase::sceneEventFilter(watched, event);
+}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbwidget.h
--- a/src/hbcore/gui/hbwidget.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbwidget.h	Tue Jul 06 14:36:53 2010 +0300
@@ -116,7 +116,6 @@
     void setFocusHighlight(HbStyle::Primitive type, HbWidget::FocusHighlight focusHighlight);
     HbStyle::Primitive focusHighlight(HbWidget::FocusHighlight focusHighlight);
 
-    void setBackgroundItem(HbStyle::Primitive type, int zValue = -1);
     void setBackgroundItem(QGraphicsItem *item, int zValue = -1);
     QGraphicsItem *backgroundItem() const;
 
@@ -139,6 +138,8 @@
 
     void setPluginBaseId(int baseId);
 
+    bool sceneEventFilter (QGraphicsItem *watched, QEvent *event);
+
 protected:
     HbWidget(HbWidgetPrivate &dd, QGraphicsItem *parent, Qt::WindowFlags wFlags=0);
 private:
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbwidget_p.h
--- a/src/hbcore/gui/hbwidget_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbwidget_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -75,10 +75,7 @@
 
     void updateBackgroundItemSize();
 
-    bool isInputMethodNeutral();
-
-    QGraphicsLayoutItem *createSpacerItem( const QString &name );
-    
+    void setBackgroundItem(HbStyle::Primitive type, int zValue = -1);
     HbWidget *q_ptr;
     HbStyle *style;
 
@@ -91,13 +88,13 @@
     bool polishPending; 
     bool themingPending;
     bool repolishOutstanding;
+    bool mHandlingRepolishSynchronously;
     bool notifyScene;
     int pluginBaseId;
     HbFocusGroup *focusGroup;
     HbStyle::Primitive focusActiveType;
     HbStyle::Primitive focusResidualType;
     bool highlightExpired;
-    QHash<QString,QGraphicsLayoutItem *> mSpacers;
 private:
     mutable QGraphicsItem *backgroundItem;
     mutable QGraphicsItem *focusActiveItem;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbwidgetbase.cpp
--- a/src/hbcore/gui/hbwidgetbase.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbwidgetbase.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -45,6 +45,12 @@
     \brief HbWidgetBase is a common base for all Hb widgets and primitives. 
     It contains common functionality shared between these two types.
 
+    HbWidgetBase disables the ItemSendsGeometryChanges and ItemUsesExtendedStyleOption flags
+    by default for performance reasons.
+    Custom widget should enable ItemSendsGeometryChanges flag to receive notifications for position
+    and transform changes.You should enable ItemUsesExtendedStyleOption if widget uses QStyleOptionGraphicsItem
+    i.eduring painting.
+
     Currently HbWidgetBase offers the following functionality:
         - Layout direction locking                 
 */
@@ -64,6 +70,12 @@
 {
     Q_Q( HbWidgetBase );
     QGraphicsItem *item = q->parentItem();
+    QGraphicsItem::GraphicsItemFlags itemFlags = q->flags();
+#if QT_VERSION >= 0x040600
+    itemFlags &=  ~QGraphicsItem::ItemSendsGeometryChanges;
+#endif
+    itemFlags &= ~QGraphicsItem::ItemUsesExtendedStyleOption;
+    q->setFlags(itemFlags);
     if ( item ) {
         handleInsidePopup(item);
     }
@@ -192,7 +204,25 @@
 {
     Q_D(HbWidgetBase);
 
-    if( change == QGraphicsItem::ItemParentChange) {
+    if( change == QGraphicsItem::ItemVisibleChange) {
+        if (value.toBool()) {
+            // Applies same initialisation for Hb widgets as QGraphicsWidget.
+            // For Hb primitives size is not set as they will be later layouted by Hb widgets.
+            // This is done to avoid flickering as primitives tend to paint themselves before layouting, 
+            // if they are added to existing layout.
+            // If Hb primitives are used standalone, their size and position must be set explicitly.
+
+            // Send Show event before the item has been shown.
+            QShowEvent event;
+            QApplication::sendEvent(this, &event);
+            bool resized = testAttribute(Qt::WA_Resized);
+            if (!resized && testAttribute(Hb::Widget)) {
+                adjustSize();
+                setAttribute(Qt::WA_Resized, false);
+            } 
+            return QGraphicsItem::itemChange(change, value);
+        }
+    } else if( change == QGraphicsItem::ItemParentChange) {
         d->handleInsidePopup(value.value<QGraphicsItem *>());
     }
     return QGraphicsWidget::itemChange(change, value);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbwidgetbase_p.h
--- a/src/hbcore/gui/hbwidgetbase_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/gui/hbwidgetbase_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -90,13 +90,14 @@
             case Hb::InteractionDisabled: bit = 1; break;
         case Hb::InsidePopup: bit = 2; break;
         case Hb::InputMethodNeutral: bit = 3; break;
+        case Hb::Widget: bit = 4; break;
         default: break;
         }
         return bit;
     }
 
     quint32 mApiProtectionFlags;
-    quint32 attributes : 4;
+    quint32 attributes : 5;
     HbFontSpec fontSpec;
     HbWidgetBase *q_ptr;
 
@@ -109,6 +110,7 @@
     friend class HbStylePrivate;
     friend class HbDocumentLoaderActions;
     friend class HbWidgetLoaderActions;
+    friend class HbInputCheckBoxList; // for accessing setBackgroundItem
 #ifdef HB_CSS_INSPECTOR
     friend class HbCssInspectorWindow;
 #endif
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbwindowobscured_p.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gui/hbwindowobscured_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,120 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include <qdebug.h>
+
+#include "hbmainwindow.h"
+#include "hbwindowobscured_p.h"
+#include "hbinstance.h"
+#include "hbevent.h"
+
+#if defined(Q_WS_X11)
+#include <X11/Xlib.h>
+#include <qx11info_x11.h>
+#endif // defined(Q_WS_X11)
+
+
+#if defined(Q_OS_SYMBIAN)
+#include <qsymbianevent.h>
+#include <coecntrl.h>
+#endif
+
+bool HbWindowObscured::filterInstalled = false;
+QCoreApplication::EventFilter HbWindowObscured::prevEventFilter = 0;
+
+void HbWindowObscured::installWindowEventFilter()
+{
+    //Install only one eventfilter, HbMainWindow can be created multiple times.
+    if (!filterInstalled) {
+        prevEventFilter = qApp->setEventFilter(eventFilter);
+        filterInstalled = true;
+    }
+}
+
+#if defined(Q_WS_X11) //eventfilter implementation for xlib
+bool HbWindowObscured::eventFilter(void *message, long *result)
+{
+    XEvent *xEvent = (XEvent *)message;
+
+    if (xEvent->type == VisibilityNotify) {
+        XVisibilityEvent *event = (XVisibilityEvent *)xEvent;
+        QList<HbMainWindow *> mainWindows = hbInstance->allMainWindows();
+        int mainWindowCount = mainWindows.size();
+        for (int index = 0; index < mainWindowCount; ++index) {
+            HbMainWindow *window = mainWindows[index];
+            if (window != 0 && window->effectiveWinId() == event->window) {
+                bool obscuredState = (event->state == VisibilityFullyObscured);
+
+                HbWindowObscuredChangedEvent obscureChangedEvent(obscuredState);
+                QCoreApplication::sendEvent(window, &obscureChangedEvent);
+                break;
+            }
+        }
+
+    }
+    //Call the previous event filter if there is one, else return false with no filtering.
+    return prevEventFilter ? prevEventFilter(message, result) : false;
+}
+#elif defined(Q_WS_S60) //eventfilter implementation for symbian.
+bool HbWindowObscured::eventFilter(void *message, long *result)
+{
+    QSymbianEvent *symEvent = static_cast<QSymbianEvent *>(message);
+    if (symEvent->type() == QSymbianEvent::WindowServerEvent) {
+        const TWsEvent *wsEvent = symEvent->windowServerEvent();
+        switch (wsEvent->Type()) {
+        case EEventWindowVisibilityChanged: {
+            // we need to generate an HbWindowObscuredChanged event.
+            CCoeControl *control = reinterpret_cast<CCoeControl *>(wsEvent->Handle());
+            RDrawableWindow *rWindow = control->DrawableWindow();
+            QList<HbMainWindow *> mainWindows = hbInstance->allMainWindows();
+            int mainWindowCount = mainWindows.size();
+            for (int index = 0; index < mainWindowCount; ++index) {
+                HbMainWindow *window = mainWindows[index];
+                if (window != 0
+                        && window->effectiveWinId()->DrawableWindow() == rWindow) {
+
+                    const TWsVisibilityChangedEvent *visChangedEvent = wsEvent->VisibilityChanged();
+                    bool obscuredState =
+                        (visChangedEvent->iFlags & TWsVisibilityChangedEvent::ENotVisible) ?
+                        true : false;
+
+                    HbWindowObscuredChangedEvent obscureChangedEvent(obscuredState);
+                    QCoreApplication::sendEvent(window, &obscureChangedEvent);
+                    break;
+                }
+            }
+        }
+        }
+    }
+    //Call the previous event filter if there is one, else return false with no filtering.
+    return prevEventFilter ? prevEventFilter(message, result) : false;
+}
+#else //defined(Q_WS_S60)
+//Generic evenfilter for non-supported platform i.e windows. Do nothing.
+bool HbWindowObscured::eventFilter(void *, long *)
+{
+    return false;
+}
+#endif
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/gui/hbwindowobscured_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/gui/hbwindowobscured_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBWINDOWOBSCURED_P_H
+#define HBWINDOWOBSCURED_P_H
+
+#include <QApplication>
+#include <hbglobal.h>
+
+class HB_CORE_PRIVATE_EXPORT HbWindowObscured 
+{
+public:
+    HbWindowObscured() { };
+    ~HbWindowObscured() { };
+
+public:
+    static void installWindowEventFilter();
+
+private:
+    static bool eventFilter(void *message, long *result);
+
+private:
+    static bool filterInstalled;
+    static QCoreApplication::EventFilter prevEventFilter;
+};
+
+#endif //HBWINDOWOBSCURED_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/hbcore.pro
--- a/src/hbcore/hbcore.pro	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/hbcore.pro	Tue Jul 06 14:36:53 2010 +0300
@@ -177,6 +177,7 @@
     LIBS += -lws32
     LIBS += -lapgrfx
     LIBS += -lcone
+    LIBS += -lsystemtoneservice
 
     # central repository
     BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C304.txt $${EPOCROOT}epoc32/data/z/private/10202BE9/2002C304.txt"
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/i18n/hbdntxmlreader.cpp
--- a/src/hbcore/i18n/hbdntxmlreader.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/i18n/hbdntxmlreader.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -199,6 +199,7 @@
                 
                 localizedStr = QCoreApplication::translate(0,charPtr);
                 delete ba;
+                ba = 0;
                 
                 if( localizedStr == t ){
 					localizedStr = "";                
@@ -235,6 +236,9 @@
 			validElement = false;    				
 		}
 	}
+    if (ba) {
+        delete ba;
+    }
     return true;
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/i18n/hbdntxmlreader_p.h
--- a/src/hbcore/i18n/hbdntxmlreader_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/i18n/hbdntxmlreader_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
-#ifndef HBDNTXMLREADER_H
-#define HBDNTXMLREADER_H
+#ifndef HBDNTXMLREADER_P_H
+#define HBDNTXMLREADER_P_H
 
 #include <QMap>
 #include <QString>
@@ -82,4 +82,4 @@
 	bool twoDone;
 };
 
-#endif // HBDNTXMLREADER_H
+#endif // HBDNTXMLREADER_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/i18n/hbextendedlocale.cpp
--- a/src/hbcore/i18n/hbextendedlocale.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/i18n/hbextendedlocale.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -1067,7 +1067,7 @@
 
     HBufC *bufPtr = HBufC::New(bufferMinSize);
 
-    if ( bufPtr == NULL ) {
+    if ( !bufPtr ) {
         return QString();
     }
 
@@ -1090,7 +1090,7 @@
 
         HBufC *newBufPtr = bufPtr->ReAlloc(fSize);
 
-        if ( newBufPtr == NULL ) {
+        if ( !newBufPtr ) {
             delete bufPtr;
             return QString();
         }
@@ -1102,8 +1102,10 @@
         _symbianLocale.LoadSystemSettings();
         _symbianLocale.GetLocale()->FormatCurrency(modifiableBufPtr, overflow, TInt64(amount));
      }
-
-    return QString::fromUtf16(bufPtr->Ptr(), bufPtr->Length());
+    QString value = QString::fromUtf16(bufPtr->Ptr(), bufPtr->Length());
+    delete bufPtr;
+    bufPtr = 0;
+    return value;
 
 #else
     return QString::number(amount);
@@ -1195,7 +1197,9 @@
     Mapping from Symbian to ISO locale
 */
 struct symbianToISO {
+    // enumeration of symbian language
     int symbian_language;
+    // string of ISO value 
     char iso_name[8];
 };
 
@@ -1204,75 +1208,170 @@
     Mapping from Symbian to ISO locale
 */
 static const symbianToISO symbian_to_iso_list[] = {
-    { ELangEnglish,             "en_GB" },
-    { ELangFrench,              "fr_FR" },
-    { ELangGerman,              "de_DE" },
-    { ELangSpanish,             "es_ES" },
-    { ELangItalian,             "it_IT" },
-    { ELangSwedish,             "sv_SE" },
-    { ELangDanish,              "da_DK" },
-    { ELangNorwegian,           "no_NO" },
-    { ELangFinnish,             "fi_FI" },
-    { ELangAmerican,            "en_US" },
-    { ELangPortuguese,          "pt_PT" },
-    { ELangTurkish,             "tr_TR" },
-    { ELangIcelandic,           "is_IS" },
-    { ELangRussian,             "ru_RU" },
-    { ELangHungarian,           "hu_HU" },
-    { ELangDutch,               "nl_NL" },
-    { ELangCzech,               "cs_CZ" },
-    { ELangSlovak,              "sk_SK" },
-    { ELangPolish,              "pl_PL" },
-    { ELangSlovenian,           "sl_SI" },
-    { ELangTaiwanChinese,       "zh_TW" },
-    { ELangHongKongChinese,     "zh_HK" },
-    { ELangPrcChinese,          "zh_CN" },
-    { ELangJapanese,            "ja_JP" },
-    { ELangThai,                "th_TH" },
-    { ELangArabic,              "ar_AE" },
-    { ELangTagalog,             "tl_PH" },
-    { ELangBengali,             "bn_IN" }, // Bangladesh/India
-    { ELangBulgarian,           "bg_BG" },
-    { ELangCatalan,             "ca_ES" },
-    { ELangCroatian,            "hr_HR" },
-    { ELangEstonian,            "et_EE" },
-    { ELangFarsi,               "fa_IR" },
-    { ELangCanadianFrench,      "fr_CA" },
-    { ELangGreek,               "el_GR" },
-    { ELangGujarati,            "gu_IN" },
-    { ELangHebrew,              "he_IL" },
-    { ELangHindi,               "hi_IN" },
-    { ELangIndonesian,          "id_ID" },
-    { ELangKannada,             "kn_IN" },
-    { ELangKorean,              "ko_KR" },
-    { ELangLatvian,             "lv_LV" },
-    { ELangLithuanian,          "lt_LT" },
-    { ELangMalay,               "ms_MY" },
-    { ELangMalayalam,           "ml_IN" },
-    { ELangMarathi,             "mr_IN" },
-    { ELangBrazilianPortuguese, "pt_BR" },
-    { ELangRomanian,            "ro_RO" },
-    { ELangSerbian,             "sr_YU" },
-    { ELangLatinAmericanSpanish, "es_MX" },
-    { ELangTamil,               "ta_IN" },
-    { ELangTelugu,              "te_IN" },
-    { ELangUkrainian,           "uk_UA" },
-    { ELangUrdu,                "ur_PK" }, // India/Pakistan
-    { ELangVietnamese,          "vi_VN" },
+        { ELangEnglish,             "en_GB" },
+        { ELangFrench,              "fr_FR" },
+        { ELangGerman,              "de_DE" },
+        { ELangSpanish,             "es_ES" },
+        { ELangItalian,             "it_IT" },
+        { ELangSwedish,             "sv_SE" },
+        { ELangDanish,              "da_DK" },
+        { ELangNorwegian,           "nb_NO" },
+        { ELangFinnish,             "fi_FI" },
+        { ELangAmerican,            "en_US" },
+        { ELangSwissFrench,         "fr_CH" },
+        { ELangSwissGerman,         "de_CH" },
+        { ELangPortuguese,          "pt_PT" },
+        { ELangTurkish,             "tr_TR" },
+        { ELangIcelandic,           "is_IS" },
+        { ELangRussian,             "ru_RU" },
+        { ELangHungarian,           "hu_HU" },
+        { ELangDutch,               "nl_NL" },
+        { ELangBelgianFlemish,      "nl_BE" },
+        { ELangAustralian,          "en_AU" },
+        { ELangBelgianFrench,       "fr_AU" },
+        { ELangAustrian,            "de_AT" },
+        { ELangNewZealand,          "en_NZ" },
+        { ELangInternationalFrench, "fr_ZZ" },
+        { ELangCzech,               "cs_CZ" },
+        { ELangSlovak,              "sk_SK" },
+        { ELangPolish,              "pl_PL" },
+        { ELangSlovenian,           "sl_SI" },
+        { ELangTaiwanChinese,       "zh_TW" },
+        { ELangHongKongChinese,     "zh_HK" },
+        { ELangPrcChinese,          "zh_CN" },
+        { ELangJapanese,            "ja_JP" },
+        { ELangThai,                "th_TH" },
+        { ELangAfrikaans,           "af_ZA" },
+        { ELangAlbanian,            "sq_AL" },
+        { ELangAmharic,             "am_ET" },
+        { ELangArabic,              "ar_AE" },
+        { ELangArmenian,            "hy_AM" },
+        { ELangTagalog,             "tl_PH" },
+        { ELangBelarussian,         "be_BY" },
+        { ELangBengali,             "bn_IN" },
+        { ELangBulgarian,           "bg_BG" },
+        { ELangBurmese,             "my_MM" },
+        { ELangCatalan,             "ca_ES" },
+        { ELangCroatian,            "hr_HR" },
+        { ELangCanadianEnglish,     "en_CA" },
+        { ELangInternationalEnglish,"en_ZZ" },
+        { ELangSouthAfricanEnglish, "en_ZA" },
+        { ELangEstonian,            "et_EE" },
+        { ELangFarsi,               "fa_IR" },
+        { ELangCanadianFrench,      "fr_CA" },
+        { ELangScotsGaelic,         "gd_GB" },
+        { ELangGeorgian,            "ka_GE" },
+        { ELangGreek,               "el_GR" },
+        { ELangCyprusGreek,         "el_CY" },
+        { ELangGujarati,            "gu_IN" },
+        { ELangHebrew,              "he_IL" },
+        { ELangHindi,               "hi_IN" },
+        { ELangIndonesian,          "id_ID" },
+        { ELangIrish,               "ga_IE" },
+        { ELangSwissItalian,        "it_CH" },
+        { ELangKannada,             "kn_IN" },
+        { ELangKazakh,              "kk_KZ" },
+        { ELangKhmer,               "km_KH" },
+        { ELangKorean,              "ko_KR" },
+        { ELangLao,                 "lo_LA" },
+        { ELangLatvian,             "lv_LV" },
+        { ELangLithuanian,          "lt_LT" },
+        { ELangMacedonian,          "mk_MK" },
+        { ELangMalay,               "ms_MY" },
+        { ELangMalayalam,           "ml_IN" },
+        { ELangMarathi,             "mr_IN" },
+        { ELangMoldavian,           "ro_MD" },
+        { ELangMongolian,           "mn_MN" },
+        { ELangNorwegianNynorsk,    "nn_NO" },
+        { ELangBrazilianPortuguese, "pt_BR" },
+        { ELangPunjabi,             "pa_IN" },
+        { ELangRomanian,            "ro_RO" },
+        { ELangSerbian,             "sr_YU" },
+        { ELangSinhalese,           "si_LK" },
+        { ELangSomali,              "so_SO" },
+        { ELangInternationalSpanish,"es_ZZ" },
+        { ELangLatinAmericanSpanish,"es_419" },
+        { ELangSwahili,             "sw_KE" },
+        { ELangFinlandSwedish,      "sv_FI" },
+        { ELangTamil,               "ta_IN" },
+        { ELangTelugu,              "te_IN" },
+        { ELangTibetan,             "bo_CN" },
+        { ELangTigrinya,            "ti_ER" },
+        { ELangCyprusTurkish,       "tr_CY" },
+        { ELangTurkmen,             "tk_TM" },
+        { ELangUkrainian,           "uk_UA" },
+        { ELangUrdu,                "ur_PK" },
+        { ELangVietnamese,          "vi_VN" },
+        { ELangWelsh,               "cy_GB" },
+        { ELangZulu,                "zu_ZA" },
+        { ELangManufacturerEnglish, "en_XZ" },
+        { ELangSouthSotho,          "st_LS" },
 #ifdef __E32LANG_H__
 // 5.0
-    { ELangBasque,              "eu_ES" },
-    { ELangGalician,            "gl_ES" },
+        { ELangBasque,              "eu_ES" },
+        { ELangGalician,            "gl_ES" },
 #endif
-    { ELangEnglish_Apac,        "en_APAC" },
-    { ELangEnglish_Taiwan,      "en_TW" },
-    { ELangEnglish_HongKong,    "en_HK" },
-    { ELangEnglish_Prc,         "en_CN" },
-    { ELangEnglish_Japan,       "en_JP"},
-    { ELangEnglish_Thailand,    "en_TH" },
-    { ELangEnglish_India,       "en_IN" },
-    { ELangMalay_Apac,          "ms_APAC" },
-    { ELangIndonesian_Apac,     "id_APAC" }
+        { ELangJavanese,            "jv_ID" },	
+        { ELangMaithili,            "bh_IN" },
+        { ELangAzerbaijani_Latin,   "az_AZ" }, 
+        { ELangOriya,               "or_IN" },
+        { ELangBhojpuri,            "bh_IN" },
+        { ELangSundanese,           "su_ID" },
+        { ELangKurdish_Latin,       "ku_TR" },
+        { ELangKurdish_Arabic,      "ku_IQ" },
+        { ELangPashto,              "ps_AF" },
+        { ELangHausa,               "ha_NG" }, 
+        { ELangOromo,               "om_ET" },
+        { ELangUzbek_Latin,         "uz_UZ" },
+        { ELangSindhi_Arabic,       "sd_PK" },
+        { ELangSindhi_Devanagari,   "sd_IN" },
+        { ELangYoruba,              "yo_NG" },
+        { ELangIgbo,                "ig_NG" },
+        { ELangMalagasy,            "mg_MG" },
+        { ELangNepali,              "ne_NP" },
+        { ELangAssamese,            "as_IN" },
+        { ELangShona,               "sn_ZW" },
+        { ELangZhuang,              "za_CN" },
+        { ELangEnglish_Taiwan,      "en_TW" },
+        { ELangEnglish_HongKong,    "en_HK" },
+        { ELangEnglish_Prc,         "en_CN" },
+        { ELangEnglish_Japan,       "en_JP" },
+        { ELangEnglish_Thailand,    "en_TH" },
+        { ELangFulfulde,            "ff_NE" },
+        { ELangBolivianQuechua,     "qu_BO" },
+        { ELangPeruQuechua,         "qu_PE" },
+        { ELangEcuadorQuechua,      "qu_EC" },
+        { ELangTajik_Cyrillic,      "tg_TJ" },
+        { ELangNyanja,              "ny_MW" },
+        { ELangHaitianCreole,       "ht_HT" },
+        { ELangKoongo,              "kg_CG" },
+        { ELangAkan,                "ak_GH" },
+        { ELangYi,                  "ii_CN" },
+        { ELangUyghur,              "ug_CN" },
+        { ELangRwanda,              "rw_RW" },
+        { ELangXhosa,               "xh_ZA" },
+        { ELangGikuyu,              "ki_KE" },
+        { ELangRundi,               "rn_BI" },
+        { ELangTswana,              "tn_BW" },
+        { ELangKanuri,              "kr_NE" },
+        { ELangKashmiri_Devanagari, "ks_ZZ" },
+        { ELangKashmiri_PersoArabic,"ks_XZ" },
+        { ELangWolof,               "wo_SN" },
+        { ELangTsonga,              "ts_ZA" },
+        { ELangYiddish,             "yi_IL" },
+        { ELangKirghiz,             "ky_KG" },
+        { ELangGanda,               "lg_UG" },
+        { ELangBambara,             "bm_ML" },
+        { ELangCentralAymara,       "ay_BO" },
+        { ELangLingala,             "ln_CG" },
+        { ELangBashkir,             "ba_RU" },
+        { ELangChuvash,             "cv_RU" },
+        { ELangSwati,               "ss_SZ" },
+        { ELangTatar,               "tt_RU" },
+        { ELangSouthernNdebele,     "nr_ZA" },
+        { ELangSardinian,           "sc_IT" },
+        { ELangWalloon,             "wa_BE" },
+        { ELangEnglish_India,       "en_IN" }
 };
 #endif
 
@@ -1297,8 +1396,7 @@
     int cmp = code - symbian_to_iso_list[0].symbian_language;
     if (cmp < 0) {
         return QString();
-    }
-    else {
+    } else {
         if (cmp == 0) {
             return symbian_to_iso_list[0].iso_name;
         }
@@ -1627,6 +1725,9 @@
                 case 'A': {
                     // quickie to get capitalization, can't use s60 string as is because Qt 'hh' format's am/pm logic
                     TAmPmName ampm = TAmPmName();
+                    if ( ampm.Size() == 0 ) {
+                        return QString();
+                    }
                     TChar first(ampm[0]);
                     QString qtampm = QString::fromLatin1(first.IsUpper() ? "AP" : "ap");
 
@@ -1719,7 +1820,12 @@
                     if ( n_mode ) {
                         offset += 10;
                     }
-
+                    
+                    // 'offset + (c.digitValue()-1' cannot be bigger than us_locale_dep, eu_locale_dep or jp_locale_dep table
+                    if ( (offset + (c.digitValue()-1)) > 19 ) {
+                        return QString();
+                    }
+                    
                     result += QLatin1String(locale_dep[offset + (c.digitValue()-1)]);
                     }
                     break;
@@ -1949,6 +2055,13 @@
 }
 
 /*! 
+    \enum HbExtendedLocale::DaylightSavingZone
+     Enumeration for "daylight saving time" settings.
+
+    \sa setHomeDaylightSavingZone(), homeHasDaylightSavingOn()
+ */
+
+/*! 
     Returns the daylight saving zone in which the home city is located.
     
     \attention Symbian specific API
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/i18n/hbextendedlocale.h
--- a/src/hbcore/i18n/hbextendedlocale.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/i18n/hbextendedlocale.h	Tue Jul 06 14:36:53 2010 +0300
@@ -144,4 +144,4 @@
     QString format( const QTime &time, const QString &timeFormat );
 };
 
-#endif
+#endif // HBEXTENDEDLOCALE_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/i18n/hbfindfile.cpp
--- a/src/hbcore/i18n/hbfindfile.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/i18n/hbfindfile.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -35,6 +35,14 @@
 #include <qbasicatomic.h>
 #include <QDir>
 
+#if defined(Q_OS_SYMBIAN)
+    #define PLATFORM_WITH_DRIVES
+#elif defined(Q_OS_WIN32)
+    #define PLATFORM_WITH_DRIVES
+#else
+    #undef PLATFORM_WITH_DRIVES
+#endif
+
 #ifdef Q_OS_SYMBIAN
 /*!
     Convert path to Symbian version
@@ -55,8 +63,16 @@
     @hbcore
     \class HbFindFile
     \brief Checks from which drive a certain file is found.
+     
+    Example:
+
+    \snippet{unittest_hbfindfile/unittest_hbfindfile.cpp,1} 
+    
+*/
+
+/*!
     Scans drives through and adds drive information to \a str if file is found.
-    
+
     \attention Cross-Platform API
 
     \param str is file and path beginning with "/"
@@ -66,7 +82,7 @@
 */
 bool HbFindFile::hbFindFile(QString &str, const QChar &defaultDrive)
 {
-#ifdef Q_OS_SYMBIAN
+#if defined(Q_OS_SYMBIAN)
     RFs& fs = CCoeEnv::Static()->FsSession();
     TFindFile ff(fs);
     QString str2 = str;
@@ -92,7 +108,7 @@
     else {
         return false;
     }
-#else
+#elif defined(Q_OS_WIN32)
     QString file = str;
     if (!defaultDrive.isNull()) {
         file = defaultDrive + QString(":") + str;
@@ -116,10 +132,14 @@
         }
     }
     return false;
-#endif
-    
+#else
+    Q_UNUSED(defaultDrive);
+    QFileInfo info(str);
+    return info.exists();
+#endif   
 }
 
+#ifdef PLATFORM_WITH_DRIVES
 /*!
     Helper class
 */
@@ -137,6 +157,10 @@
     RFs& fs = CCoeEnv::Static()->FsSession();
     TDriveList driveList;
     fs.DriveList(driveList);
+    if ( driveList.Size() == 0 ) {
+        return;
+    }
+    
     TChar driveLetter;
     
     // add first C and then Y..A and then Z.
@@ -150,8 +174,7 @@
     for (driveNumber = EDriveY; driveNumber >= EDriveA; --driveNumber) {
         if (driveNumber == EDriveC) {
             continue;
-        }
-        else {
+        } else {
             if (driveList[driveNumber]) {
                 fs.DriveToChar(driveNumber, driveLetter);
                 QChar c = static_cast<QChar>(driveLetter);
@@ -164,22 +187,24 @@
         fs.DriveToChar(driveNumber, driveLetter);
         QChar cZ = static_cast<QChar>(driveLetter);
         this->append(cZ);
-    }
-
-    
-#else            
+    }  
+#else // Q_OS_SYMBIAN           
      QFileInfoList fil = QDir::drives();
      for (int j=0; j< fil.length(); j++) {
          QString fp = fil.at(j).filePath();
+         if ( fp.isEmpty() ) {
+            return;
+        }
          
-         if ((!fp.isEmpty()) && (fp[0] != '/') && (fp[0] != '\\')) {                
+         if ( (fp[0] != '/') && (fp[0] != '\\') ) {                
          this->append(fp[0]);
          }        
      }
-#endif     
+#endif // Q_OS_SYMBIAN    
 }
 
 Q_GLOBAL_STATIC(AvailableDrives, gs_AvailableDrives)
+#endif  // PLATFORM_WITH_DRIVES 
 
 /*!
     \attention Cross-Platform API
@@ -189,11 +214,14 @@
 */
 QString HbFindFile::availableDrives()
 {
+#ifdef PLATFORM_WITH_DRIVES
      QString *str = gs_AvailableDrives();
      if (str) {
          return *str;         
-     }
-     else {
+     } else {
          return QString(); 
      }
+#else // PLATFORM_WITH_DRIVES           
+     return QString(); 
+#endif  // PLATFORM_WITH_DRIVES 
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/i18n/hbi18ndef.h
--- a/src/hbcore/i18n/hbi18ndef.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/i18n/hbi18ndef.h	Tue Jul 06 14:36:53 2010 +0300
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
-#ifndef HB_I18N_DEF_H
-#define HB_I18N_DEF_H
+#ifndef HBI18NDEF_H
+#define HBI18NDEF_H
 
 #include <QtGlobal>
 #include <hbglobal.h>
@@ -85,4 +85,4 @@
 // 13:15, 03:05 (minutes with leading zero and seconds) // separators are locale dependent.
 #define r_qtn_time_durat_min_sec_with_zero "%:0%T%:2%S%:3"
 
-#endif // HB_I18N_DEF_H
+#endif // HBI18NDEF_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/i18n/hblocaleutil.cpp
--- a/src/hbcore/i18n/hblocaleutil.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/i18n/hblocaleutil.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -187,21 +187,21 @@
 */ 
 QString HbLocaleUtil::currentLanguage()
 {
-    #if defined(Q_OS_SYMBIAN)
-        TLanguage l = User::Language();
-        
-        if(mappingList.isEmpty()) {
-            readMappings();
+#if defined(Q_OS_SYMBIAN)
+    TLanguage l = User::Language();
+    
+    if(mappingList.isEmpty()) {
+        readMappings();
+    }
+    
+    for (int i = 0; i < mappingList.count(); ++i) {
+        HbLocaleMapping mapping = mappingList.at(i);
+        if (mapping.symLangValue == l) {
+            return mapping.langName;
         }
-        
-        for (int i = 0; i < mappingList.count(); ++i) {
-            HbLocaleMapping mapping = mappingList.at(i);
-            if (mapping.symLangValue == l) {
-                return mapping.langName;
-            }
-        }
-   #endif
-   return QString("");
+    }
+#endif
+   return QString();
 }
 
 /*!
@@ -217,7 +217,6 @@
 QStringList HbLocaleUtil::supportedLanguages()
 {
 #if defined(Q_OS_SYMBIAN)   
-  
     QStringList languages; 
     CArrayFixFlat<TInt>* systemEpocLanguageCodes = 0;
     TInt error = SysLangUtil::GetInstalledLanguages( systemEpocLanguageCodes );
@@ -244,8 +243,7 @@
     delete systemEpocLanguageCodes;
     return languages;
 #else 
-    QStringList dummy; 
-    return dummy;
+    return QStringList();
 #endif
 }
 
@@ -284,7 +282,7 @@
     return translated;
 #else 
     Q_UNUSED(language); 
-    return QString("");
+    return QString();
 #endif
 }
 
@@ -405,9 +403,9 @@
     }
     
     if(mappingList.isEmpty())
-        {
+    {
         readMappings();
-        }
+    }
     int regCount = regions.count();
     for(int i = 0; i < regCount; i++)
     {
@@ -458,20 +456,20 @@
 
         QCoreApplication::installTranslator(&translator);
             
-        if(availRegions.isEmpty())
+        if(mappingList.isEmpty()) 
         {
-            readRegions();
+            readMappings();
         }
-        int cnt = availRegions.count();
+        int cnt = mappingList.count();
         for(int i = 0 ; i < cnt; i++ )
         {
-            QString reg = availRegions.at(i); 
+            HbLocaleMapping map = mappingList.at(i);
             QString regionName = QString(REGION_ID_PREFIX);
             regionName += '_';
-            regionName += reg;
+            regionName += map.regName;
             QString locRegName = hbTrId(regionName.toAscii().constData());
             if(locRegName != regionName)
-                locRegionNames.insert(reg, locRegName);
+                locRegionNames.insert(map.regName, locRegName);
         }
     }
     
@@ -553,10 +551,8 @@
             return mapping.regName;
         }
     }
+#endif    
     return QString();
-#else
-    return QString();
-#endif    
 }
 
 #if defined(Q_OS_SYMBIAN)      
@@ -614,9 +610,9 @@
     }
     
     if(mappingList.isEmpty())
-        {
+    {
         readMappings();
-        }
+    }
     int colCount = collations.count();
     for(int i = 0; i < colCount; i++)
     {
@@ -667,20 +663,20 @@
 
         QCoreApplication::installTranslator(&translator);
             
-        if(availCollations.isEmpty())
+        if(mappingList.isEmpty()) 
         {
-            readCollations();
+            readMappings();
         }
-        int cnt = availCollations.count();
+        int cnt = mappingList.count();
         for(int i = 0 ; i < cnt; i++ )
         {
-            QString col = availCollations.at(i); 
+            HbLocaleMapping map = mappingList.at(i);
             QString collationName = QString(COLLATION_ID_PREFIX);
             collationName += '_';
-            collationName += col;
+            collationName += map.collName;
             QString locColName = hbTrId(collationName.toAscii().constData());
             if(locColName != collationName)
-                locCollationNames.insert(col, locColName);
+                locCollationNames.insert(map.collName, locColName);
         }
     }
     
@@ -773,10 +769,8 @@
             return mapping.collName;
         }
     }
+#endif    
     return QString();    
-#else
-    return QString();
-#endif    
 }
 
 /*!
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/i18n/hbngnormalnumber_p.h
--- a/src/hbcore/i18n/hbngnormalnumber_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/i18n/hbngnormalnumber_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
-#ifndef HBNGNORMALNUMBER_H
-#define HBNGNORMALNUMBER_H
+#ifndef HBNGNORMALNUMBER_P_H
+#define HBNGNORMALNUMBER_P_H
 
 #include <QLocale>
 #include <QHash>
@@ -63,4 +63,4 @@
 								   const QList<int> &patternBlockSizes );
 };
 
-#endif
+#endif // HBNGNORMALNUMBER_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/i18n/hbnumbergrouping.h
--- a/src/hbcore/i18n/hbnumbergrouping.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/i18n/hbnumbergrouping.h	Tue Jul 06 14:36:53 2010 +0300
@@ -40,4 +40,4 @@
                                                 QLocale::Country country = QLocale::AnyCountry );
 };
 
-#endif
+#endif // HBNUMBERGROUPING_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/i18n/hbparameterlengthlimiter.h
--- a/src/hbcore/i18n/hbparameterlengthlimiter.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/i18n/hbparameterlengthlimiter.h	Tue Jul 06 14:36:53 2010 +0300
@@ -92,4 +92,4 @@
         HbParameterLengthLimiterPrivate* p;
 };
 
-#endif // HbParameterLengthLimiter_H
+#endif // HBPARAMETERLENGTHLIMITER_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/i18n/hbparameterlengthlimiter_p.h
--- a/src/hbcore/i18n/hbparameterlengthlimiter_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/i18n/hbparameterlengthlimiter_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -25,7 +25,7 @@
 
 
 #ifndef HBPARAMETERLENGTHLIMITER_P_H
-#define HbPARAMETERLENGTHLIMITER_P_H
+#define HBPARAMETERLENGTHLIMITER_P_H
 
 #include <QString>
 
@@ -41,4 +41,4 @@
         QString str;
 };
 
-#endif // HbParameterLengthLimiter_H
+#endif // HBPARAMETERLENGTHLIMITER_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/i18n/hbstringutil.cpp
--- a/src/hbcore/i18n/hbstringutil.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/i18n/hbstringutil.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -324,7 +324,7 @@
  */
 static QChar nativeDigitBase(QChar ch)
 {
-	DigitType d[] = { WesternDigit, ArabicIndicDigit, EasternArabicIndicDigit, DevanagariDigit, ThaiDigit };
+    DigitType d[] = { WesternDigit, ArabicIndicDigit, EasternArabicIndicDigit, DevanagariDigit, ThaiDigit };
     int i = 0;
     int num = sizeof(d)/sizeof(d[0]);
     while(i<num) {
@@ -365,7 +365,7 @@
 QString HbStringUtil::convertDigitsTo( const QString str, const DigitType digitType ) 
 {
     QString convDigit;
-	int length = str.length();
+    int length = str.length();
     for(int i=0; i<length; i++) 
        {
        ushort digit = str[i].unicode();
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/i18n/hbstringutil.h
--- a/src/hbcore/i18n/hbstringutil.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/i18n/hbstringutil.h	Tue Jul 06 14:36:53 2010 +0300
@@ -64,4 +64,4 @@
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(HbStringUtil::Options)
 
-#endif
+#endif // HBSTRINGUTIL_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/i18n/hbtranslator.cpp
--- a/src/hbcore/i18n/hbtranslator.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/i18n/hbtranslator.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -33,12 +33,20 @@
 #include <hbtranslator.h>
 #include <hbtranslator_p.h>
 
+#if defined(Q_OS_SYMBIAN)
+    #define PLATFORM_WITH_DRIVES
+#elif defined(Q_OS_WIN32)
+    #define PLATFORM_WITH_DRIVES
+#else
+    #undef PLATFORM_WITH_DRIVES
+#endif
+
 #ifdef Q_OS_SYMBIAN
 const char* defaultPath   = "/resource/qt/translations/";
 const char* defaultDrive  = "Z:";
 const char* defaultCommon = "common_";
 #else
-const QString defaultPath = "";
+const char* defaultPath = "";
 const char* defaultDrive  = "";
 const char* defaultCommon = "common_";
 
@@ -89,12 +97,10 @@
                return false;
            }        
            // else continue
-        } 
-        else {
+        } else {
             if (err != KErrNone ) { // if some other error return error, don't look anymore
                 return false;
-            }
-            else {
+            } else {
                 break; // file was found
             }
         }
@@ -104,8 +110,7 @@
         err= fl.Open(fs, ptrFName, EFileShareReadersOrWriters | EFileRead | EFileStream );
         if (err == KErrNone) {
             break;
-        }
-        else {
+        } else {
             if (err != KErrNotFound) {
                 return false;
             }
@@ -119,7 +124,6 @@
             }    
         }
 
-        // no truncations? fail
         if (rightmost==0) {
             return false;
         }
@@ -151,15 +155,24 @@
 }
 
 /*!
-    @beta
+    @stable
     @hbcore
     \class HbTranslator
     \brief HbTranslator installs QTranslator(s) automatically needed in localisation
     and loads translation files into QTranslator.
+
+    Note: file name should be given without language and .qm postfix.
+    Eg. if English qm file name is testapp_en.qm
+    \code
+    HbTranslator trans("testapp");
+    \endcode
+    which loads correct testapp_xx.qm file from default location, where xx is postfix for current system locale, eg "en".
+
+    \sa hbTrId
 */
 
 /*!
-    Default case: searches translation file from default location (/resource/qt/translations/) with default name, which is EXECUTABLENAME.qm
+    Default case: searches translation file from default location (/resource/qt/translations/) with default name, which is EXECUTABLENAME_xx.qm
     
     \attention Cross-Platform API
 */
@@ -167,6 +180,8 @@
 {
     QFileInfo info(qApp->applicationFilePath());
     QString defaultName = info.baseName();  // defaultname = <executablename>
+    d->translatorPath=defaultPath;
+    d->translatorFile=defaultName;
     d->installTranslator(defaultPath, defaultName);
 }
 
@@ -177,6 +192,8 @@
 */
 HbTranslator::HbTranslator(const QString &file): d(new HbTranslatorPrivate())
 {
+    d->translatorPath=defaultPath;
+    d->translatorFile=file;    
     d->installTranslator(defaultPath, file);
 }
 
@@ -191,28 +208,71 @@
 */
 HbTranslator::HbTranslator(const QString &path, const QString &file): d(new HbTranslatorPrivate())
 {
+    d->translatorPath=defaultPath;
+    d->translatorFile=file;    
     d->installTranslator(path, file);
 }
 
+/*!
+    Destructor  
+*/ 
 HbTranslator::~HbTranslator()
 {
     delete d;
 }
 
+static bool commonTr = false;
+#include <QMutex>
+#include <QMutexLocker>
+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, gs_CommonTrMutex, (QMutex::Recursive) )
+
 /*!
     Loads common.ts translations from default location.
     
     \attention Cross-Platform API
 */
 void HbTranslator::loadCommon()
-{    
-    QString lang = QLocale::system().name();
-    QString commonts = QString(defaultDrive) + QString(defaultPath) + QString(defaultCommon) + lang;
-    bool loaded;
-    loaded = loadTranslatorData(d->common, commonts, d->commonData);
-    if (loaded) {
-        qApp->installTranslator(&d->common);    
+{   
+    QMutexLocker ml(gs_CommonTrMutex());
+    if (!commonTr) {
+        QString lang = QLocale::system().name();
+        d->languageDowngrade(lang);    
+        QString commonts;
+        commonts += QString(defaultDrive);
+        commonts += QString(defaultPath);
+        commonts += QString(defaultCommon);
+        commonts += lang;
+#ifdef Q_OS_SYMBIAN        
+        toSymbianPath(commonts);
+#endif    
+        bool loaded;
+        uchar *commonData=0;
+        loaded = loadTranslatorData(d->common, commonts, d->commonData);
+        if (loaded) {
+            d->commonData = commonData;
+            d->commonTr=true;
+            qApp->installTranslator(&d->common);    
+            commonTr=true;
+        }
+    }    
+}
+
+/*!
+    Destructor  
+*/ 
+HbTranslatorPrivate::~HbTranslatorPrivate()
+{
+    qApp->removeTranslator(&translator);    
+    if (translatorData) {
+        delete [] translatorData;
     }
+    qApp->removeTranslator(&common);    
+    if (commonData) {        
+        delete [] commonData;
+    }
+    if (commonTr) {
+       ::commonTr=false;
+    }    
 }
 
 /*!
@@ -227,12 +287,18 @@
     QString lang2 = lang;
     languageDowngrade(lang);
     QString path(pth);
+    if (path.isNull() || path.isEmpty()) {
+        return;
+    }
     if (path.at(0) == ':') {
         QString tsfile = path + name + QString("_") + lang;
-        translator.load(tsfile);
-        qApp->installTranslator(&translator);
+        if ( translator.load(tsfile) ) {
+            qApp->installTranslator(&translator);
+        }
         return;
     }
+    
+#ifdef PLATFORM_WITH_DRIVES
 #ifdef Q_OS_SYMBIAN        
     toSymbianPath(path);
 #endif    
@@ -277,6 +343,12 @@
     if (loaded) {
         qApp->installTranslator(&translator);
     }
+#else    
+    QString tsfile2 = path + name + QString("_") + lang;
+    if ( translator.load(tsfile2) ) {
+        qApp->installTranslator(&translator);
+    }
+#endif    
 }
 
 /*!
@@ -288,6 +360,9 @@
     LanguageHash();    
 };
 
+/*!
+    Table for downgrade.  
+*/ 
 LanguageHash::LanguageHash(){
     (*this)["en_GB"] = "en";
     (*this)["fr_FR"] = "fr";
@@ -333,7 +408,7 @@
     (*this)["pt_BR"] = "pt_BR";
     (*this)["ro_RO"] = "ro";
     (*this)["sr_YU"] = "sr";
-    (*this)["es_MX"] = "es_MX"; //!!
+    (*this)["es_MX"] = "es_MX";
     (*this)["uk_UA"] = "uk";
     (*this)["ur_PK"] = "ur";
     (*this)["vi_VN"] = "vi";
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/i18n/hbtranslator_p.h
--- a/src/hbcore/i18n/hbtranslator_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/i18n/hbtranslator_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -23,23 +23,26 @@
 **
 ****************************************************************************/
 
-#ifndef HBTRANSLATORPRIVATE_H
-#define HBTRANSLATORPRIVATE_H
+#ifndef HBTRANSLATOR_P_H
+#define HBTRANSLATOR_P_H
 
 class QTranslator;
 
 class HB_CORE_PRIVATE_EXPORT HbTranslatorPrivate
 {
 public:
-	void installTranslator(const QString &name, const QString &path);
-	bool languageDowngrade(QString &lang);
-	HbTranslatorPrivate(): translatorData(0), commonData(0){}
-	~HbTranslatorPrivate()  { delete [] translatorData; delete [] commonData; }
-    QTranslator translator;
-    QTranslator common;
+    void installTranslator(const QString &name, const QString &path);
+    bool languageDowngrade(QString &lang);
+    HbTranslatorPrivate(): translatorData(0), commonData(0), commonTr(false){}
+    ~HbTranslatorPrivate();
+    QTranslator translator;    
+    QTranslator common;    
     uchar *translatorData;
     uchar *commonData;
+    bool commonTr;
+    QString translatorPath;
+    QString translatorFile;
 };
 
-#endif
+#endif // HBTRANSLATOR_P_H
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/image/hbbadgeicon.cpp
--- a/src/hbcore/image/hbbadgeicon.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbbadgeicon.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -73,16 +73,18 @@
  */
 void HbBadgeIcon::addBadge(Qt::Alignment alignment,
                            const HbIcon &icon,
-                           int zValue)
+                           int zValue,
+                           const QSizeF &sizeFactor,
+                           Qt::AspectRatioMode aspectRatio)
 {
-    HbBadgeIconInfo info(icon, alignment, zValue);
-    int size = mBadgeIcons.size();
-    if (size == 0) {
+    HbBadgeIconInfo info(icon, alignment, zValue, sizeFactor, aspectRatio);
+    int badgeCount = mBadgeIcons.count();
+    if (badgeCount == 0) {
         mBadgeIcons.append(info);
     } else {
         bool added = false;
         //Find a spot to insert the badgeinfo in the list.
-        for (int i = size - 1; i >= 0; i--) {
+        for (int i = badgeCount - 1; i >= 0; i--) {
             if (mBadgeIcons[i].zValue() > zValue) {
                 mBadgeIcons.insert(i + 1, info);
                 added = true;
@@ -154,12 +156,12 @@
     int count = mBadgeIcons.count();
 
     for (int i = count - 1; i >= 0; i--) {
-        HbBadgeIconInfo aIcon = mBadgeIcons[i];
-        Qt::Alignment align = aIcon.alignment();
+        HbBadgeIconInfo badge = mBadgeIcons.at(i);
+        // Fix the alignment.
+        Qt::Alignment align = badge.alignment();
         Qt::Alignment absAlign = align;
         if (mirror) {
             absAlign = align & ~(Qt::AlignRight | Qt::AlignLeft);
-
             if (align & Qt::AlignLeft) {
                 absAlign |= Qt::AlignRight;
             }
@@ -167,10 +169,22 @@
                 absAlign |= Qt::AlignLeft;
             }
         }
-        // ... and then draw at the specified location.
-        aIcon.icon().paint(painter,
+        // Update the size.
+        QSizeF sizeFactor = badge.sizeFactor();
+        if (!sizeFactor.isNull()) {
+            QSizeF targetSizeF(sizeFactor.width() * rect.width(), sizeFactor.height() * rect.height());
+            QSize targetSize = targetSizeF.toSize();
+            HbIcon icon = badge.icon();
+            if (targetSize != icon.size().toSize()) {
+                icon.setSize(targetSize);
+                badge.setIcon(icon);
+                mBadgeIcons[i] = badge;
+            }
+        }
+        // And finally draw the badge.
+        badge.icon().paint(painter,
                            rect,
-                           Qt::KeepAspectRatio,
+                           badge.aspectRatio(),
                            absAlign,
                            mode,
                            state);
@@ -182,15 +196,17 @@
  */
 void HbBadgeIcon::externalize(QDataStream &stream)
 {
-    int size = mBadgeIcons.size();
+    int count = mBadgeIcons.count();
     // Write out how many badges we'll save first
-    stream << size;
+    stream << count;
     // And write each item
-    for (int i = 0; i < size; i++) {
-        HbBadgeIconInfo aIcon = mBadgeIcons[i];
-        stream << aIcon.icon();
-        stream << (qint32)(aIcon.alignment());
-        stream << aIcon.zValue();
+    for (int i = 0; i < count; i++) {
+        const HbBadgeIconInfo &badge(mBadgeIcons.at(i));
+        stream << badge.icon();
+        stream << (qint32) badge.alignment();
+        stream << badge.zValue();
+        stream << badge.sizeFactor();
+        stream << (qint32) badge.aspectRatio();
     }
 }
 
@@ -206,11 +222,16 @@
         qint32 align;
         qint32 zValue;
         HbIcon icon;
+        QSizeF sizeFactor;
+        qint32 aspectRatio;
         stream >> icon;
         stream >> align;
         stream >> zValue;
+        stream >> sizeFactor;
+        stream >> aspectRatio;
 
-        HbBadgeIconInfo info(icon, (Qt::Alignment)align, zValue);
+        HbBadgeIconInfo info(icon, (Qt::Alignment) align, zValue,
+                             sizeFactor, (Qt::AspectRatioMode) aspectRatio);
         mBadgeIcons.append(info);
-    };
+    }
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/image/hbbadgeicon_p.h
--- a/src/hbcore/image/hbbadgeicon_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbbadgeicon_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -30,6 +30,7 @@
 #include "hbicon.h"
 #include <QList>
 #include <QIcon>
+#include <QPointF>
 
 class HbBadgeIcon
 {
@@ -40,7 +41,9 @@
 public:
     void addBadge(Qt::Alignment alignment,
                   const HbIcon &badge,
-                  int zValue = 0);
+                  int zValue,
+                  const QSizeF &sizeFactor,
+                  Qt::AspectRatioMode aspectRatio);
     bool removeBadge(const HbIcon &badge);
     void removeAllBadges();
     bool isBadged() const;
@@ -57,11 +60,7 @@
 
 
 private:
-    QRectF badgeLocation(const HbBadgeIconInfo &iconInfo,
-                         const QRectF &parentRect,
-                         bool mirror);
     QList<HbBadgeIconInfo> mBadgeIcons;
 };
 
 #endif /* HBBADGEICON_P_H */
-
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/image/hbbadgeiconinfo.cpp
--- a/src/hbcore/image/hbbadgeiconinfo.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbbadgeiconinfo.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -28,19 +28,15 @@
 #include "hbbadgeicon_p.h"
 #include <QPainter>
 #include <QDebug>
+#include <QPointF>
 
 HbBadgeIconInfo::HbBadgeIconInfo(const HbIcon &badge,
                                  Qt::Alignment alignment,
-                                 int zValue): mIcon(badge), mAlignment(alignment), mZValue(zValue)
-{
-}
-
-HbBadgeIconInfo::HbBadgeIconInfo(const HbBadgeIconInfo &other)
-{
-    *this = other;
-}
-
-HbBadgeIconInfo::~HbBadgeIconInfo()
+                                 int zValue,
+                                 const QSizeF &sizeFactor,
+                                 Qt::AspectRatioMode aspectRatio)
+    : mIcon(badge), mAlignment(alignment), mZValue(zValue),
+      mSizeFactor(sizeFactor), mAspectRatio(aspectRatio)
 {
 }
 
@@ -61,32 +57,27 @@
     return false;
 }
 
-HbIcon HbBadgeIconInfo::icon() const
-{
-    return mIcon;
-}
-
 void HbBadgeIconInfo::setIcon(const HbIcon &icon)
 {
     mIcon = icon;
 }
 
-int HbBadgeIconInfo::zValue() const
-{
-    return mZValue;
-}
-
 void HbBadgeIconInfo::setZValue(int zValue)
 {
     mZValue = zValue;
 }
 
-Qt::Alignment HbBadgeIconInfo::alignment() const
-{
-    return mAlignment;
-}
-
 void HbBadgeIconInfo::setAlignment(Qt::Alignment align)
 {
     mAlignment = align;
 }
+
+void HbBadgeIconInfo::setSizeFactor(const QSizeF &sizeFactor)
+{
+    mSizeFactor = sizeFactor;
+}
+
+void HbBadgeIconInfo::setAspectRatio(Qt::AspectRatioMode aspectRatio)
+{
+    mAspectRatio = aspectRatio;
+}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/image/hbbadgeiconinfo_p.h
--- a/src/hbcore/image/hbbadgeiconinfo_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbbadgeiconinfo_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -29,6 +29,7 @@
 #include <hbglobal.h>
 #include <qnamespace.h>
 #include <hbicon.h>
+#include <QSizeF>
 
 class HbBadgeIconInfoPrivate;
 
@@ -36,25 +37,36 @@
 {
 public:
     HbBadgeIconInfo(const HbIcon &badge,
-                    Qt::Alignment alignment = Qt::AlignCenter,
-                    int zValue = 0);
-    HbBadgeIconInfo(const HbBadgeIconInfo &other);
-    ~HbBadgeIconInfo();
+                    Qt::Alignment alignment,
+                    int zValue,
+                    const QSizeF &sizeFactor,
+                    Qt::AspectRatioMode aspectRatio);
 
     bool operator==(const HbBadgeIconInfo &other) const;
     bool operator!=(const HbBadgeIconInfo &other) const;
 
-    HbIcon icon() const;
-    void setIcon(const HbIcon &);
-    int zValue() const;
-    void setZValue(int);
-    Qt::Alignment alignment() const;
+    HbIcon icon() const { return mIcon; }
+    void setIcon(const HbIcon &icon);
+
+    int zValue() const { return mZValue; }
+    void setZValue(int z);
+
+    Qt::Alignment alignment() const { return mAlignment; }
     void setAlignment(Qt::Alignment align);
 
+    QSizeF sizeFactor() const { return mSizeFactor; }
+    void setSizeFactor(const QSizeF &sizeFactor);
+
+    Qt::AspectRatioMode aspectRatio() const { return mAspectRatio; }
+    void setAspectRatio(Qt::AspectRatioMode aspectRatio);
+
 private:
     HbIcon mIcon;
+    HbIcon mSizedIcon;
     Qt::Alignment mAlignment;
     int mZValue;
+    QSizeF mSizeFactor;
+    Qt::AspectRatioMode mAspectRatio;
 };
 
 #endif
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/image/hbframedrawer.h
--- a/src/hbcore/image/hbframedrawer.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbframedrawer.h	Tue Jul 06 14:36:53 2010 +0300
@@ -104,7 +104,7 @@
     HbFrameDrawerPrivate *d;
 
     friend class HbStylePrivate;
+    friend class HbFrameDrawerPrivate;
 };
 
 #endif // HBFRAMEDRAWER_H
-
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/image/hbframedrawer_p.h
--- a/src/hbcore/image/hbframedrawer_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbframedrawer_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -66,6 +66,10 @@
 
     void themeChange(const QStringList &updatedFiles);
 
+    static HbFrameDrawerPrivate *d_ptr(HbFrameDrawer *frameDrawer) {
+        return frameDrawer->d;
+    }
+
 private:
     void calculateShrinkedNinePieceCorners(
         HbMultiPartSizeData &data,
@@ -78,6 +82,7 @@
     // disabled
     HbFrameDrawerPrivate &operator=(const HbFrameDrawerPrivate &other);
     HbIconFormatType iconType;
+
 public:
     QString frameGraphicsName;
     HbFrameDrawer::FrameType type;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/image/hbicon.cpp
--- a/src/hbcore/image/hbicon.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbicon.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -345,17 +345,19 @@
 */
 bool HbIconPrivate::addBadge(Qt::Alignment align,
                              const HbIcon &icon,
-                             int z)
+                             int z,
+                             const QSizeF &sizeFactor,
+                             Qt::AspectRatioMode aspectRatio)
 {
     if (icon.isBadged()) {
         return false;
     } else if (engine) {
-        engine->addBadge(align, icon, z);
+        engine->addBadge(align, icon, z, sizeFactor, aspectRatio);
     } else {
         if (!badgeInfo) {
             badgeInfo = new HbBadgeIcon();
         }
-        badgeInfo->addBadge(align, icon, z);
+        badgeInfo->addBadge(align, icon, z, sizeFactor, aspectRatio);
     }
     return true;
 }
@@ -683,11 +685,13 @@
 QSizeF HbIcon::size() const
 {
     if ((static_cast<int>(flags()) & HbIcon::ResolutionCorrected)) {
+        if (d->engine) {
+            d->size = d->engine->size();
+        }
         if (d->size.isValid()) {
             return d->size;
         } else {
             QSizeF defSize(defaultSize());
-            HbIconLoader::global()->applyResolutionCorrection(defSize);
             return defSize;
         }
     } else if (d->size.isValid()) {
@@ -908,13 +912,53 @@
  * Adds a badge icon to the existing icon. The badge icons
  * are drawn relative to the alignment you specify with the
  * z-order you provide.
+ * 
+ * By default the badge icon will use its default size.  If this is
+ * not suitable (which is typical in case of vector graphics) then
+ * call setSize() explicitly on \a badge before passing it to this
+ * function.
+ *
+ * The aspect ratio for the badge is kept by default, but this can be
+ * changed in the \a aspectRatio argument.
+ *
+ * \sa addProportionalBadge()
  */
 bool HbIcon::addBadge(Qt::Alignment alignment,
                       const HbIcon &badge,
-                      int z)
+                      int z,
+                      Qt::AspectRatioMode aspectRatio)
 {
     d.detach();
-    return d->addBadge(alignment, badge, z);
+    return d->addBadge(alignment, badge, z, QSizeF(), aspectRatio);
+}
+
+/*!
+ * Adds a badge icon to the existing icon. The badge icons
+ * are drawn relative to the alignment you specify with the
+ * z-order you provide.
+ *
+ * With this function the size of the badge icon will be proportional
+ * to the size of the badged icon.  If the size needs to be explicitly
+ * specified then use addBadge() instead.
+ *
+ * \a sizeFactor's x and y values must be between 0 and 1. They
+ * specify how much space the badge takes. For example (0.25, 0.25)
+ * causes both the width and height to be 1/4 of the full icon width
+ * and height.
+ *
+ * The aspect ratio for the badge is kept by default, but this can be
+ * changed in the \a aspectRatio argument.
+ *
+ * \sa addBadge()
+ */
+bool HbIcon::addProportionalBadge(Qt::Alignment alignment,
+                                  const HbIcon &badge,
+                                  const QSizeF &sizeFactor,
+                                  int z,
+                                  Qt::AspectRatioMode aspectRatio)
+{
+    d.detach();
+    return d->addBadge(alignment, badge, z, sizeFactor, aspectRatio);
 }
 
 /*!
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/image/hbicon.h
--- a/src/hbcore/image/hbicon.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbicon.h	Tue Jul 06 14:36:53 2010 +0300
@@ -31,6 +31,7 @@
 #include <QIcon> //krazy:exclude=qclasses
 #include <QMetaType>
 #include <QString>
+#include <QSizeF>
 #include <QExplicitlySharedDataPointer>
 
 class HbIconPrivate;
@@ -112,7 +113,13 @@
 
     bool addBadge(Qt::Alignment alignment,
                   const HbIcon &badge,
-                  int z = 0);
+                  int z = 0,
+                  Qt::AspectRatioMode aspectRatio = Qt::KeepAspectRatio);
+    bool addProportionalBadge(Qt::Alignment alignment,
+                              const HbIcon &badge,
+                              const QSizeF &sizeFactor = QSizeF(0.25, 0.25),
+                              int z = 0,
+                              Qt::AspectRatioMode aspectRatio = Qt::KeepAspectRatio);
     bool removeBadge(const HbIcon &badge);
     void removeAllBadges();
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/image/hbicon_p.h
--- a/src/hbcore/image/hbicon_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbicon_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -45,7 +45,9 @@
     void clearStoredIconContent();
     bool addBadge(Qt::Alignment alignment,
                   const HbIcon &badge,
-                  int z = 0);
+                  int z,
+                  const QSizeF &sizeFactor,
+                  Qt::AspectRatioMode aspectRatio);
     bool removeBadge(const HbIcon &badge);
     void removeAllBadges();
     bool isBadged() const;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/image/hbiconengine.cpp
--- a/src/hbcore/image/hbiconengine.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbiconengine.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -70,7 +70,9 @@
 
     void addBadge(Qt::Alignment alignment,
                   const HbIcon &badge,
-                  int z = 0);
+                  int z,
+                  const QSizeF &sizeFactor,
+                  Qt::AspectRatioMode aspectRatio);
     bool removeBadge(const HbIcon &badge);
     void removeAllBadges();
     const QList<HbBadgeIconInfo> badges() const;
@@ -439,12 +441,14 @@
 
 void HbIconEnginePrivate::addBadge(Qt::Alignment align,
                                    const HbIcon &icon,
-                                   int z)
+                                   int z,
+                                   const QSizeF &sizeFactor,
+                                   Qt::AspectRatioMode aspectRatio)
 {
     if (!badgeInfo) {
         badgeInfo = new HbBadgeIcon();
     }
-    badgeInfo->addBadge(align, icon, z);
+    badgeInfo->addBadge(align, icon, z, sizeFactor, aspectRatio);
 }
 
 bool HbIconEnginePrivate::removeBadge(const HbIcon &badge)
@@ -778,6 +782,9 @@
         } else {
             HbIconLoader *loader = HbIconLoader::global();
             d->defaultSize = loader->defaultSize(name, QString(), d->iconLoaderOptions());
+            if (d->flags & HbIcon::ResolutionCorrected) {
+                HbIconLoader::global()->applyResolutionCorrection(d->defaultSize);
+            }
         }
         // If default size could not get retrieved,
         // store information about that so it does not need to be checked again.
@@ -1175,9 +1182,11 @@
 
 void HbIconEngine::addBadge(Qt::Alignment align,
                             const HbIcon &icon,
-                            int z)
+                            int z,
+                            const QSizeF &sizeFactor,
+                            Qt::AspectRatioMode aspectRatio)
 {
-    d->addBadge(align, icon, z);
+    d->addBadge(align, icon, z, sizeFactor, aspectRatio);
 }
 
 bool HbIconEngine::removeBadge(const HbIcon &badge)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/image/hbiconengine_p.h
--- a/src/hbcore/image/hbiconengine_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbiconengine_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -99,7 +99,9 @@
     bool isMirrored() const;
     void addBadge(Qt::Alignment alignment,
                   const HbIcon &badge,
-                  int z = 0);
+                  int z,
+                  const QSizeF &sizeFactor,
+                  Qt::AspectRatioMode aspectRatio);
     bool removeBadge(const HbIcon &badge);
     void removeAllBadges();
     const QList<HbBadgeIconInfo> badges() const;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/image/hbiconloader.cpp
--- a/src/hbcore/image/hbiconloader.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbiconloader.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -924,13 +924,6 @@
 #ifdef HB_ICON_TRACES
     qDebug() << params.cleanIconName << " => " << iconPath;
 #endif
-    // If not found then it can still be a normal file specified with a relative path.
-    if (!iconFound) {
-        iconFound = QFile::exists(params.iconName);
-        if (iconFound) {
-            iconPath = params.iconName;
-        }
-    }
     // Use the 'unknown' icon, if needed, when the queried icon was not found.
     if (!iconFound) {
         if (params.options.testFlag(ReturnUnknownIcon)) {
@@ -949,7 +942,6 @@
  */
 HbIconImpl *HbIconLoader::getIconFromServer(HbIconLoadingParams &params)
 {
-
     HbIconImpl *icon = 0;
 
 #ifdef HB_ICON_TRACES
@@ -1353,10 +1345,12 @@
             return ptr;
         }
 #endif
+
+        // Resolve used icon filename. It uses themeindex for themed icons.
+        params.iconFileName = resolveIconFileName(params);
+
         if (HbThemeUtils::isLogicalName(iconName)) {
             params.iconFileName = resolveIconFileName(params);
-        } else {
-            params.iconFileName = iconName;
         }
 
         // If icon filename could not be resolved, return
@@ -1368,6 +1362,11 @@
             return icon;
         }
 
+#ifdef Q_OS_SYMBIAN
+        // Check whether icon is in a private directory which cannot be accessed by the theme server
+        bool privateDirectory = isInPrivateDirectory(iconName);
+#endif // Q_OS_SYMBIAN
+
         QString format = formatFromPath(params.iconFileName);
 
 // Theme server on desktop was found very slow (probably due to IPC with QLocalServer/QLocalSocket).
@@ -1379,6 +1378,7 @@
                 && format != "MNG"
                 && format != "GIF"
                 && !iconName.startsWith(':') // not using server for app's own resources (iconName is a logical name for theme elements)
+                && !privateDirectory // server cannot load from protected private dir
                 && manager) {
 
             //Initiate an IPC to themeserver to get the icon-data from the server.
@@ -1817,4 +1817,22 @@
     }
 }
 
+bool HbIconLoader::isInPrivateDirectory(const QString &filename)
+{
+    Q_UNUSED(filename);
+    bool isPrivate = false;
+    
+#ifdef Q_OS_SYMBIAN
+    if (filename.length() > 11) {
+        // Private dir starts with e.g. "z:/private/"
+        if (filename[1] == ':' && (filename[2] == '/' || filename[2] == '\\') &&
+           (filename[10] == '/' || filename[10] == '\\') && filename.mid(3, 7).compare("private"), Qt::CaseInsensitive) {
+            isPrivate = true;
+        }
+    }
+#endif
+
+    return isPrivate;
+}
+
 // End of File
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/image/hbiconloader_p.h
--- a/src/hbcore/image/hbiconloader_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbiconloader_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -151,6 +151,8 @@
 
     void handleForegroundLost();
 
+    static bool isInPrivateDirectory(const QString &filename);
+
 signals:
     void defaultSizeAdjustmentChanged();
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/image/hbiconsource.cpp
--- a/src/hbcore/image/hbiconsource.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbiconsource.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -303,6 +303,7 @@
 QImageReader *HbIconSource::imageReader()
 {
     if (!mImageReader) {
+        type(); // make sure type is initialized
         mImageReader = new QImageReader(mFilename, mType.toLatin1());
     }
     return mImageReader && mImageReader->canRead() ? mImageReader : 0;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/image/hbsgimageiconimpl_p.cpp
--- a/src/hbcore/image/hbsgimageiconimpl_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbsgimageiconimpl_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -280,7 +280,7 @@
 
     if (vgImageRenderer) {
         vgImageRenderer->draw(painter, topLeft, clipPath);
-        eglWaitClient();
+        //eglWaitClient();
         return;
     }
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/image/hbvgimageiconrenderer.cpp
--- a/src/hbcore/image/hbvgimageiconrenderer.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/image/hbvgimageiconrenderer.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -205,10 +205,10 @@
 
 void HbVgImageIconRenderer::updatePainterTransformation(QPainter *painter, const QPointF &pos)
 {
-    VGfloat devh = painter->device()->height() - 1;
+    VGfloat devh = painter->device()->height();
     QTransform viewport(1.0f, 0.0f, 0.0f,
                         0.0f, -1.0f, 0.0f,
-                        0.5f, devh + 0.5f, 1.0f);
+                        0.0f, devh, 1.0f);
     QTransform imageTransform = painter->transform() * viewport;
     imageTransform.translate(pos.x(), pos.y());
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/indicatorplugins/hbindicatorpluginmanager.cpp
--- a/src/hbcore/indicatorplugins/hbindicatorpluginmanager.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/indicatorplugins/hbindicatorpluginmanager.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -49,8 +49,9 @@
     int readOnlyPaths;
     mPluginPathList = HbDeviceDialogPluginManager::pluginPathList("/indicators/", readOnlyPaths);
 
-    // Scan only read-only drives at startup to ensure installed plugins cannot affect device boot
-    for(int i = 0; i < readOnlyPaths; i++) {
+    // Scan only read-only drives + allow eclipsing at startup to ensure installed plugins cannot
+    // affect device boot
+    for(int i = 0; i < mPluginPathList.count(); i++) {
         updateCachePath(mPluginPathList.at(i), true);
     }
 }
@@ -358,47 +359,80 @@
 
     // Check if plugin file name is in cache
     int index = -1;
-    const QString filePath = mNameCache.find(indicatorType);
+    QString filePath = mNameCache.find(indicatorType, QString());
     if (!filePath.isEmpty()) {
-        TRACE("cache hit")
+        TRACE("icache hit")
         index = loadPlugin(indicatorType, filePath);
         // If plugin wasn't loaded, the cache has stale information. Rescan the directory.
         if (index < 0) {
-            TRACE("cache stale")
+            TRACE("icache stale")
             updateCachePath(filePath);
         }
     }
     if (index < 0) {
-        TRACE("cache miss")
+        TRACE("icache miss")
         // Plugin name wasn't in cache, try to find it
-        index = scanPlugins(indicatorType);
-        if (index >= 0) {
-            // Plugin was found, update plugin name cache by scanning the directory
-            updateCachePath(mPlugins[index].mLoader->fileName());
+        filePath = scanPlugins(indicatorType);
+        if (!filePath.isEmpty()) {
+            index = loadPlugin(indicatorType, filePath);
+            if (index >= 0) {
+                // Plugin was found, update plugin name cache by scanning the directory
+                updateCachePath(mPlugins[index].mLoader->fileName());
+            }
         }
     }
     TRACE_EXIT
     return index;
 }
 
-// Scan for and load plugin in file system
-int HbIndicatorPluginManager::scanPlugins(const QString &indicatorType)
+// Scan plugins to find one implementing the indicator type
+QString HbIndicatorPluginManager::scanPlugins(const QString &indicatorType)
 {
     TRACE_ENTRY
     const QString fileNameFilter = HbDeviceDialogPluginManager::pluginFileNameFilter();
-    int index = -1;
+    QString pluginFileName;
 
-    foreach (const QString &path, mPluginPathList) {
+    // Scan plugins. All paths in the list are scanned. Eclipsing is allowed only if file names
+    // are the same.
+    QString result;
+    foreach(const QString &path, mPluginPathList) {
         QDir pluginDir(path, fileNameFilter, QDir::NoSort, QDir::Files | QDir::Readable);
         foreach (const QString &fileName, pluginDir.entryList()) {
-            index = loadPlugin(indicatorType, pluginDir.absoluteFilePath(fileName));
-            if (index >= 0) {
-                break;
+            if (pluginFileName.isEmpty() || HbPluginNameCache::compare(pluginFileName, fileName) == 0) {
+                const QString current(pluginDir.absoluteFilePath(fileName));
+                if (scanPlugin(indicatorType, current)) {
+                    result = current;
+                    if (pluginFileName.isEmpty()) {
+                        pluginFileName = fileName;
+                    }
+                }
             }
         }
     }
     TRACE_EXIT
-    return index;
+    return result;
+}
+
+// Scan a plugin to find if it implements the indicator type
+bool HbIndicatorPluginManager::scanPlugin(const QString &indicatorType, const QString &filePath)
+{
+    TRACE_ENTRY
+
+    HbLockedPluginLoader *loader = new HbLockedPluginLoader(mNameCache, filePath);
+    QObject *pluginInstance = loader->instance();
+
+    bool result = false;
+    if (pluginInstance) {
+        HbIndicatorPluginInterface *plugin =
+            qobject_cast<HbIndicatorPluginInterface*>(pluginInstance);
+        if (plugin) {
+            result = plugin->indicatorTypes().contains(indicatorType);
+        }
+    }
+    loader->unload();
+    delete loader;
+    TRACE_EXIT
+    return result;
 }
 
 // Load plugin from file path name
@@ -484,17 +518,26 @@
 }
 
 // Update plugin name cache watch/scan list
-void HbIndicatorPluginManager::updateCachePath(const QString &path, bool updateReadOnly)
+void HbIndicatorPluginManager::updateCachePath(const QString &path, bool firstScan)
 {
     QString dirPath = HbPluginNameCache::directoryPath(path);
     QFileInfo fileInfo(dirPath);
     if (fileInfo.exists()) {
         // If directory is writable, watch it. Otherwise scan it only once.
         if (fileInfo.isWritable()) {
-            mNameCache.addWatchPath(dirPath);
+            HbPluginNameCache::ScanParameters::Options scanOptions =
+                HbPluginNameCache::ScanParameters::NoOptions;
+            Q_UNUSED(firstScan)
+#if defined(Q_OS_SYMBIAN)
+            if (firstScan) {
+                scanOptions = HbPluginNameCache::ScanParameters::LimitToSet;
+            }
+#endif // defined(Q_OS_SYMBIAN)
+            mNameCache.addWatchPath(HbPluginNameCache::ScanParameters(dirPath, scanOptions));
         } else {
-            if (updateReadOnly) {
-                mNameCache.scanDirectory(dirPath);
+            if (firstScan) {
+                HbPluginNameCache::ScanParameters parameters(path, HbPluginNameCache::ScanParameters::AddToLimitSet);
+                mNameCache.scanDirectory(parameters);
             }
         }
     } else {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/indicatorplugins/hbindicatorpluginmanager_p.h
--- a/src/hbcore/indicatorplugins/hbindicatorpluginmanager_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/indicatorplugins/hbindicatorpluginmanager_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -103,14 +103,15 @@
         const QVariantMap &securityCredentials);    
     int loadPlugin(const QString &indicatorType);
     int loadPlugin(const QString &indicatorType, const QString &filePath);
-    int scanPlugins(const QString &indicatorType);
+    QString scanPlugins(const QString &indicatorType);
+    bool scanPlugin(const QString &indicatorType, const QString &filePath);
     int findPlugin(const QString &indicatorType) const;
     int findPlugin(const QString &indicatorType,
                    IndicatorInfo **indicatorInfo, int *infoIndex = 0);
     QString statusAreaIconPath(
             const HbIndicatorInterface *indicator) const;
 
-    void updateCachePath(const QString &path, bool updateReadOnly = false);
+    void updateCachePath(const QString &path, bool firstScan = false);
     static QStringList pluginKeys(QObject *pluginInstance);
 
     bool hasMenuData(const HbIndicatorInterface &indicator) const;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputcontextplugin.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/inputfw/hbinputcontextplugin.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include "hbinputcontextplugin.h"
+
+/*!
+@proto
+@hbcore
+\class HbInputContextPlugin
+\brief Extends QInputContextPlugin to support HbInputMethod input method selection UI elements.
+
+Sometimes an input method may want to display several options in input method selection dialog. 
+This class extends QInputContextPlugin and provides a way to specify several display names instead of one.
+Standard input method selection UI sidplays them all and notifies the HbInputMethod in question 
+which one was selected. This class also makes it possible to asign an icon to each display name.
+The icons are then displayed by the default input method selection dialog.
+*/
+
+HbInputContextPlugin::HbInputContextPlugin(QObject *parent) : QInputContextPlugin(parent)
+{
+}
+
+/*!
+\fn QStringList HbInputContextPlugin::displayNames(const QString &key)
+
+Sometimes an input context may want to display more than one option in input method selection
+dialog (or in similar mechanism). This method is a version of base class method displayName and returns a list of strings
+instead of just one string. See input method selection widget for details how the default input method selection
+dialog passes selected item to the input context.
+
+\sa displayName
+*/
+
+/*!
+\fn HbIcon HbInputContextPlugin::icon(const QString &key)
+
+Returns input context specific icon. It may be shown for example in input method selection dialog.
+*/
+
+/*!
+\fn QList<HbIcon> HbInputContextPlugin::icons(const QString &key)
+
+In case input context has more than one display name, it may also want to asign individual icon to
+those display names. This method returns a list of icons. It should return same number of items as displayNames method.
+
+\sa displayNames
+\sa icons
+*/
+
+// End of file
+
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputcontextplugin.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/inputfw/hbinputcontextplugin.h	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBINPUTCONTEXTPLUGIN_H
+#define HBINPUTCONTEXTPLUGIN_H
+
+#include <QInputContextPlugin>
+
+#include <hbinputdef.h>
+#include <hbicon.h>
+
+class HB_CORE_EXPORT HbInputContextPlugin : public QInputContextPlugin
+{
+    Q_OBJECT
+
+public:
+    HbInputContextPlugin(QObject *parent = 0);
+
+    virtual QStringList displayNames(const QString &key) = 0;
+    virtual HbIcon icon(const QString &key) = 0;   
+    virtual QList<HbIcon> icons(const QString &key) = 0;
+};
+
+#endif // HBINPUTCONTEXTPLUGIN_H
+
+// End of file
+
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputcontextproxy.cpp
--- a/src/hbcore/inputfw/hbinputcontextproxy.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/inputfw/hbinputcontextproxy.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -98,6 +98,10 @@
         if (!widget) {
             mTarget->setFocusObject(0);
         } else if (HbInputFocusObject::isEditor(widget) && !HbInputFocusObject::isReadOnlyWidget(widget)) {
+            if (mTarget->focusObject() && mTarget->focusObject()->object() == widget) {
+                // Already focused to given widget.                 
+                return;
+            } 
             mTarget->setFocusObject(new HbInputFocusObject(widget));
         }
     }
@@ -110,12 +114,11 @@
 bool HbInputContextProxy::filterEvent(const QEvent *event)
 {
     if (mTarget) {
-#if QT_VERSION >= 0x040600
         bool orientationCompleted = HbInputSettingProxy::instance()->orientationChangeCompleted();
         if (event->type() == QEvent::CloseSoftwareInputPanel && orientationCompleted) {
             setInputFrameworkFocus(0);
             return true;
-        } else if (event->type() == QEvent::RequestSoftwareInputPanel && orientationCompleted) {           
+        } else if (event->type() == QEvent::RequestSoftwareInputPanel && orientationCompleted) {
             if (QWidget *focusedWidget =  qApp->focusWidget()) {
                 // see if the focused widget is graphics view, if so get the focused graphics item in the view
                 // and acivate inputmethod for the focused graphics item
@@ -138,7 +141,6 @@
             }
             return true;
         }
-#endif
 
 #ifdef Q_OS_SYMBIAN
         const quint32 HbInputContextProxyExternalKeyboardModifier = 0x00200000;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputdef.h
--- a/src/hbcore/inputfw/hbinputdef.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/inputfw/hbinputdef.h	Tue Jul 06 14:36:53 2010 +0300
@@ -198,6 +198,7 @@
     HbEditorConstraintLatinAlphabetOnly    = 0x08    /**< Editor allows only languages and input modes that produce latin alphabets. */
 };
 Q_DECLARE_FLAGS(HbEditorConstraints, HbEditorConstraint)
+Q_DECLARE_OPERATORS_FOR_FLAGS(HbEditorConstraints)
 
 /*!
 \enum HbInputDigitType
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputeditorinterface.cpp
--- a/src/hbcore/inputfw/hbinputeditorinterface.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/inputfw/hbinputeditorinterface.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -572,7 +572,7 @@
 void HbEditorInterface::setUpAsCompletingEmailField()
 {
     setMode(HbInputModeNone);
-    setInputConstraints((HbEditorConstraint)(HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField));
+    setInputConstraints(HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField);
     setFilter(HbEmailAddressFilter::instance());
     setEditorClass(HbInputEditorClassEmail);
     setExtraDictionaryId(HbInputEditorClassEmail);
@@ -586,7 +586,7 @@
 void HbEditorInterface::setUpAsCompletingUrlField()
 {
     setMode(HbInputModeNone);
-    setInputConstraints((HbEditorConstraint)(HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField));
+    setInputConstraints(HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField);
     setFilter(HbUrlFilter::instance());
     setEditorClass(HbInputEditorClassUrl);
     setExtraDictionaryId(HbInputEditorClassUrl);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputfocusobject.cpp
--- a/src/hbcore/inputfw/hbinputfocusobject.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/inputfw/hbinputfocusobject.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -39,7 +39,7 @@
 #include "hbinputstandardfilters.h"
 #include "hbinpututils.h"
 #include "hbnamespace_p.h"
-
+#include "hbevent.h"
 /*!
 @alpha
 @hbcore
@@ -96,11 +96,24 @@
 HbInputFocusObject::HbInputFocusObject(QObject *focusedObject)
     : d_ptr(new HbInputFocusObjectPrivate(focusedObject))
 {
+    if (focusedObject) {
+        HbEvent *event = new HbEvent(HbEvent::InputMethodFocusIn);
+        QCoreApplication::sendEvent(focusedObject, event);
+        delete event;
+    }
 }
 
 
 HbInputFocusObject::~HbInputFocusObject()
 {
+    Q_D(HbInputFocusObject);
+
+    if (d->mFocusedObject) {
+        HbEvent *event = new HbEvent(HbEvent::InputMethodFocusOut);
+        QCoreApplication::sendEvent(d->mFocusedObject, event);
+        delete event;
+    }
+
     delete d_ptr;
 }
 
@@ -379,7 +392,15 @@
 */
 QRectF HbInputFocusObject::microFocus() const
 {
-    return inputMethodQuery(Qt::ImMicroFocus).toRectF();
+    Q_D(const HbInputFocusObject);
+
+    QRectF rect = inputMethodQuery(Qt::ImMicroFocus).toRectF();
+    QGraphicsObject *editorWidget = qobject_cast<QGraphicsObject*>(d->mFocusedObject);
+    if (editorWidget) {
+        rect = editorWidget->mapRectToScene(rect);
+    }
+
+    return rect;
 }
 
 /*!
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputmainwindow.cpp
--- a/src/hbcore/inputfw/hbinputmainwindow.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmainwindow.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -70,7 +70,7 @@
 HbInputTransparentWindow::HbInputTransparentWindow(QGraphicsItem *parent) :
     HbWidget(parent)
 {
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
+	setFlag(QGraphicsItem::ItemUsesExtendedStyleOption, true);
 }
 
 
@@ -300,8 +300,7 @@
     // this is done to come on top of all the controls in symbian OS, done to overlap soft keys as well.
     RWindow *rWindow = static_cast<RWindow *>(effectiveWinId()->DrawableWindow());
     const int positionForeground(0);
-    rWindow->SetOrdinalPosition(positionForeground,
-                                ECoeWinPriorityAlwaysAtFront);
+    rWindow->SetOrdinalPosition(positionForeground);
 #endif
 }
 
@@ -316,7 +315,7 @@
 #if defined(Q_OS_SYMBIAN)
         RWindow *rWindow = static_cast<RWindow *>(effectiveWinId()->DrawableWindow());
         const int positionBackground(-1);
-        rWindow->SetOrdinalPosition(positionBackground, ECoeWinPriorityNormal);
+        rWindow->SetOrdinalPosition(positionBackground);
 #endif
     }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputmethod.cpp
--- a/src/hbcore/inputfw/hbinputmethod.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -119,7 +119,7 @@
 Then we have Chinese touch input method for both portrait and landscape orientations and also
 Chinese handwriting recognition input mode for portrait mode.
 
-Touch input methods resolve to language range, which means that they will be handle all
+Touch input methods resolve to language range, which means that they will handle all
 the other languages, except Chinese, which has its own designated input method.
 
 Touch input methods also implement support for numeric mode. Because Chinese language uses
@@ -237,7 +237,7 @@
 }
 
 /*!
-Lists custom input methods.
+Lists all custom input methods.
 */
 QList<HbInputMethodDescriptor> HbInputMethod::listCustomInputMethods()
 {
@@ -245,6 +245,22 @@
 }
 
 /*!
+Lists custom input methods for given parameters.
+*/
+QList<HbInputMethodDescriptor> HbInputMethod::listCustomInputMethods(Qt::Orientation orientation, const HbInputLanguage &language)
+{
+    return HbInputModeCache::instance()->listCustomInputMethods(orientation, language);
+}
+
+/*!
+Returns default input method for given orientation.
+*/
+HbInputMethodDescriptor HbInputMethod::defaultInputMethod(Qt::Orientation orientation)
+{
+    return HbInputModeCache::instance()->defaultInputMethod(orientation);
+}
+
+/*!
 Activates given input method. Returns false if input method was not found
 or the framework was not able to activate it.
 */
@@ -258,7 +274,7 @@
             return true;
         } else {
             HbInputMethod *customMethod = HbInputModeCache::instance()->loadInputMethod(inputMethod);
-            if (customMethod) {
+            if (customMethod && HbInputModeCache::instance()->acceptsState(customMethod, d->mInputState)) {
                 d->contextSwitch(customMethod);
                 return true;
             }
@@ -385,20 +401,30 @@
         return;
     }
 
-    // attach focuswidget to prxoy inputcontext as proxy is
-    // the only inputcotext known to qt framework.
-    d->proxy()->QInputContext::setFocusWidget(widget);
+    if (!widget) {
+        bool unfocus = true;
 
-    if (!widget) {
+        if (d->mFocusObject) {
+            // If the input focus is inside HbGraphicsScene then do not unfocus automatically.
+            if (d->ignoreFrameworkFocusRelease(d->mFocusObject->object())) {
+                unfocus = false;
+            }
+        }
+
         // Losing focus.
-        if (d->mFocusObject) {
+        if (d->mFocusObject && unfocus) {
             focusLost(false);
             d->hideMainWindow();
             delete d->mFocusObject;
             d->mFocusObject = 0;
         }
+
         return;
     }
+		
+    // attach focuswidget to prxoy inputcontext as proxy is 
+    // the only inputcotext known to qt framework.
+    d->proxy()->QInputContext::setFocusWidget(widget);
 
     QGraphicsView *gView = qobject_cast<QGraphicsView *>(widget);
     if (gView) {
@@ -476,6 +502,7 @@
         // passing to actual QInputContext which is attached to Qt framework.
         // which will internally set QInputContext::focusWidget to Null.
         d->proxy()->QInputContext::widgetDestroyed(widget);
+        d->proxy()->QInputContext::setFocusWidget(0);
     }
 }
 
@@ -511,13 +538,7 @@
 
     if (d->compareWithCurrentFocusObject(focusObject)) {
         // The incoming focus object is either same or points to same
-        // widget that the framework is already focused to and nothing needs to be done here.
-        // But because the ownership of the focus object is transferred to the
-        // the framework, we need to delete the the incoming focus object in case it is
-        // dirrefent than current one.
-        if (d->mFocusObject != focusObject) {
-            delete focusObject;
-        }
+        // widget that the framework is already focused to and nothing needs to be done here.      
         return;
     }
 
@@ -743,7 +764,9 @@
 void HbInputMethod::orientationAboutToChange()
 {
     Q_D(HbInputMethod);
-    reset();
+	if(isActiveMethod()) {
+		reset();
+	}
     d->inputStateToEditor(d->mInputState);
     if (d->mFocusObject) {
         d->mOldFocusObject = d->mFocusObject;
@@ -799,13 +822,15 @@
 (such as touch keypads). This may be needed in some special cases where the underlying
 application wants to make sure that there are no input related elements on the screen.
 
-This is a if-all-else fails backup method. Same can be done (more efficiently) by doing
+This is a if-all-else fails backup method. Same can be done by doing
 following.
 
 \code
-QInputContext* inputContext = qApp->inputContext();
-if (inputContext) {
-    inputContext->setFocusWidget(0);
+QInputContext* ic = qApp->inputContext();
+if (ic) {
+    QEvent *closeEvent = new QEvent(QEvent::CloseSoftwareInputPanel);
+    ic->filterEvent(closeEvent);
+    delete closeEvent;
 }
 \endcode
 */
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputmethod.h
--- a/src/hbcore/inputfw/hbinputmethod.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod.h	Tue Jul 06 14:36:53 2010 +0300
@@ -50,6 +50,8 @@
     static void forceUnfocus();
     static HbInputMethod *activeInputMethod();
     static QList<HbInputMethodDescriptor> listCustomInputMethods();
+    static QList<HbInputMethodDescriptor> listCustomInputMethods(Qt::Orientation orientation, const HbInputLanguage &language);
+    static HbInputMethodDescriptor defaultInputMethod(Qt::Orientation orientation);
 
     virtual void focusReceived();
     virtual void focusLost(bool focusSwitch = true);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputmethod_p.cpp
--- a/src/hbcore/inputfw/hbinputmethod_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -41,6 +41,7 @@
 #include "hbinpututils.h"
 #include "hbinputstandardfilters.h"
 #include "hbinputmainwindow_p.h"
+#include "hbgraphicsscene.h"
 #include <hbcssinspector_p.h>
 #include <hbsettingswindow_p.h>
 
@@ -542,6 +543,12 @@
         mInputState = source->d_ptr->mInputState;
 
         // we need to transfer focuswidget from current proxy to the next proxy.
+        // Qt may clear the flag in case the focus widget is scene scene with an editor and
+        // the editor is unfocused. Hb input framework does not lose focus in this way, so
+        // we reset the flag if it is unset.
+        if (source->d_ptr->proxy()->focusWidget() && !source->d_ptr->proxy()->focusWidget()->testAttribute(Qt::WA_InputMethodEnabled)) {
+            source->d_ptr->proxy()->focusWidget()->setAttribute(Qt::WA_InputMethodEnabled);
+        }
         proxy()->QInputContext::setFocusWidget(source->d_ptr->proxy()->focusWidget());
 
         // Set this one active.
@@ -563,6 +570,8 @@
     Q_Q(HbInputMethod);
 
     if (q == toBeActive) {
+        // Already same input context, just notify focus received
+        q->focusReceived();
         return;
     }
 
@@ -791,10 +800,9 @@
     }
 }
 
-/// @endcond
-
-/*
-create an instance of HbInputMainWindow which is a transparent window.
+/*!
+\internal
+Create an instance of HbInputMainWindow which is a transparent window.
 */
 void HbInputMethodPrivate::showMainWindow()
 {
@@ -804,7 +812,8 @@
     mInsideVanillaWindow = true;
 }
 
-/*
+/*!
+\internal
  This function checks if focused object is inside a hbmainwindow, if it is inside a HbMainWindow
  then it doesn't do anything. And if it finds that focused object is inside a vanilla window (windw != HbMainWindow)
  then it creates a transparent window.
@@ -855,7 +864,8 @@
     }
 }
 
-/*
+/*!
+\internal
 hides HbInputMainWindow.
 */
 void HbInputMethodPrivate::hideMainWindow()
@@ -867,4 +877,27 @@
     }
 }
 
+/*!
+\internal
+Returns true if given object lives inside HbGraphicsScene. In that case,
+Qt-level setFocusWidget(0) calls should be ignored because input focusing rules inside
+that scene variant are different.
+*/
+bool HbInputMethodPrivate::ignoreFrameworkFocusRelease(QObject *object) const
+{
+    QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject*>(object);
+    if (graphicsObject) {
+        return (qobject_cast<HbGraphicsScene*>(graphicsObject->scene()) != 0);
+    }
+
+    QWidget *widget = qobject_cast<QWidget*>(object);
+    if (widget && widget->graphicsProxyWidget()) {
+        return (qobject_cast<HbGraphicsScene*>(widget->graphicsProxyWidget()->scene()) != 0);
+    }
+
+    return false;
+}
+
+/// @endcond
+
 // End of file
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputmethod_p.h
--- a/src/hbcore/inputfw/hbinputmethod_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -92,6 +92,8 @@
     void checkAndShowMainWindow();
     void showMainWindow();
     void hideMainWindow();
+    bool ignoreFrameworkFocusRelease(QObject *object) const;
+
 public:
     HbInputMethod *q_ptr;
     QPointer<HbInputContextProxy > mProxy;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputmethoddescriptor.cpp
--- a/src/hbcore/inputfw/hbinputmethoddescriptor.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethoddescriptor.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -48,6 +48,9 @@
     mPluginNameAndPath = desc.mPluginNameAndPath;
     mKey = desc.mKey;
     mDisplayName = desc.mDisplayName;
+    mDisplayNames = desc.mDisplayNames;
+    mIcon = desc.mIcon;
+    mIcons = desc.mIcons;
 }
 
 /*!
@@ -100,6 +103,54 @@
 }
 
 /*!
+Returns the display names of the input method.
+*/
+QStringList HbInputMethodDescriptor::displayNames() const
+{
+    return mDisplayNames;
+}
+
+/*!
+Sets the display names of the input method.
+*/
+void HbInputMethodDescriptor::setDisplayNames(const QStringList &names)
+{
+    mDisplayNames = names;
+}
+
+/*!
+Returns the icon of the input method.
+*/
+HbIcon HbInputMethodDescriptor::icon() const
+{
+    return mIcon;
+}
+
+/*!
+Sets the icon of the input method.
+*/
+void HbInputMethodDescriptor::setIcon(const HbIcon &icon)
+{
+    mIcon = icon;
+}
+
+/*!
+Returns the icons of the input method.
+*/
+QList<HbIcon> HbInputMethodDescriptor::icons() const
+{
+    return mIcons;
+}
+
+/*!
+Sets the icons of the input method.
+*/
+void HbInputMethodDescriptor::setIcons(const QList<HbIcon> &icons)
+{
+    mIcons = icons;
+}
+
+/*!
 Returns true if the descriptor is empty and doesn't point to an input plugin.
 */
 bool HbInputMethodDescriptor::isEmpty() const
@@ -108,13 +159,16 @@
 }
 
 /*!
-Asign operator.
+Assign operator.
 */
 void HbInputMethodDescriptor::operator=(const HbInputMethodDescriptor &descriptor)
 {
     mPluginNameAndPath = descriptor.mPluginNameAndPath;
     mKey = descriptor.mKey;
     mDisplayName = descriptor.mDisplayName;
+    mDisplayNames = descriptor.mDisplayNames;
+    mIcon = descriptor.mIcon;
+    mIcons = descriptor.mIcons;
 }
 
 /*!
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputmethoddescriptor.h
--- a/src/hbcore/inputfw/hbinputmethoddescriptor.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethoddescriptor.h	Tue Jul 06 14:36:53 2010 +0300
@@ -27,6 +27,7 @@
 
 #include <QString>
 #include <hbinputdef.h>
+#include <hbicon.h>
 
 class HB_CORE_EXPORT HbInputMethodDescriptor
 {
@@ -40,6 +41,12 @@
     void setKey(const QString &newKey);
     QString displayName() const;
     void setDisplayName(const QString &name);
+    QStringList displayNames() const;
+    void setDisplayNames(const QStringList &names);
+    HbIcon icon() const;
+    void setIcon(const HbIcon &icon);
+    QList<HbIcon> icons() const;
+    void setIcons(const QList<HbIcon> &icons);
     bool isEmpty() const;
     void operator=(const HbInputMethodDescriptor &descriptor);
     void setDefault();
@@ -49,6 +56,9 @@
     QString mPluginNameAndPath;
     QString mKey;
     QString mDisplayName;
+    QStringList mDisplayNames;
+    HbIcon mIcon;
+    QList<HbIcon> mIcons;
 };
 
 #endif // HB_INPUT_METHOD_DESCRIPTOR_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputmodecache.cpp
--- a/src/hbcore/inputfw/hbinputmodecache.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmodecache.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -33,6 +33,7 @@
 
 #include "hbinpututils.h"
 #include "hbinputmethod.h"
+#include "hbinputcontextplugin.h"
 #include "hbinputsettingproxy.h"
 #include "hbinputmodeproperties.h"
 #include "hbinputkeymapfactory.h"
@@ -151,6 +152,13 @@
                     listItem.descriptor.setKey(key);
                     listItem.descriptor.setDisplayName(inputContextPlugin->displayName(key));
 
+                    HbInputContextPlugin *extension = qobject_cast<HbInputContextPlugin *>(inputContextPlugin);
+                    if (extension) {
+                        listItem.descriptor.setDisplayNames(extension->displayNames(key));
+                        listItem.descriptor.setIcon(extension->icon(key));
+                        listItem.descriptor.setIcons(extension->icons(key));
+                    }
+
                     int index = mMethods.indexOf(listItem);
                     if (index >= 0) {
                         // The method is already in the list, the situation hasn't changed.
@@ -364,7 +372,7 @@
 
 /*!
 \internal
-Lists custom input methods.
+Lists all custom input methods.
 */
 QList<HbInputMethodDescriptor> HbInputModeCache::listCustomInputMethods()
 {
@@ -387,6 +395,61 @@
 
 /*!
 \internal
+Lists custom input methods for given parameters.
+*/
+QList<HbInputMethodDescriptor> HbInputModeCache::listCustomInputMethods(Qt::Orientation orientation, const HbInputLanguage &language)
+{
+    Q_D(HbInputModeCache);
+
+    QList<HbInputMethodDescriptor> result;
+
+    foreach (const HbInputMethodListItem &item, d->mMethods) {
+        foreach (const QString &lang, item.languages) {
+            HbInputModeProperties properties = d->propertiesFromString(lang);
+            
+            // Find custom methods that supports given language or any language and
+            // supports given orientation
+            if (properties.inputMode() == HbInputModeCustom &&
+                (properties.language() == language || properties.language() == HbInputLanguage()) &&
+                ((orientation == Qt::Vertical && properties.keyboard() == HbKeyboardTouchPortrait) ||
+                (orientation == Qt::Horizontal && properties.keyboard() == HbKeyboardTouchLandscape))) {
+                result.append(item.descriptor);
+                break;
+            }
+        }
+    }
+
+    return result;
+}
+
+/*!
+\internal
+Returns default input method for given orientation.
+*/
+HbInputMethodDescriptor HbInputModeCache::defaultInputMethod(Qt::Orientation orientation)
+{
+    Q_D(HbInputModeCache);
+
+    HbInputMethodDescriptor result;
+    foreach (const HbInputMethodListItem &item, d->mMethods) {
+        foreach (const QString &language, item.languages) {
+            HbInputModeProperties properties = d->propertiesFromString(language);
+
+            // Find default method that supports given orientation
+            if (properties.inputMode() == HbInputModeDefault &&
+                ((orientation == Qt::Vertical && properties.keyboard() == HbKeyboardTouchPortrait) ||
+                (orientation == Qt::Horizontal && properties.keyboard() == HbKeyboardTouchLandscape))) {
+                result = item.descriptor;
+                break;
+            }
+        }
+    }
+
+    return result;
+}
+
+/*!
+\internal
 Find correct handler for given input state.
 */
 HbInputMethod *HbInputModeCache::findStateHandler(const HbInputState &state)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputmodecache_p.h
--- a/src/hbcore/inputfw/hbinputmodecache_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmodecache_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -50,6 +50,8 @@
 public:
     HbInputMethod *loadInputMethod(const HbInputMethodDescriptor &inputMethod);
     QList<HbInputMethodDescriptor> listCustomInputMethods();
+    QList<HbInputMethodDescriptor> listCustomInputMethods(Qt::Orientation orientation, const HbInputLanguage &language);
+    HbInputMethodDescriptor defaultInputMethod(Qt::Orientation orientation);
     HbInputMethod *findStateHandler(const HbInputState &state);
     HbInputMethod *activeMethod() const;
     QList<HbInputLanguage> listInputLanguages() const;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputpredictionengine.h
--- a/src/hbcore/inputfw/hbinputpredictionengine.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/inputfw/hbinputpredictionengine.h	Tue Jul 06 14:36:53 2010 +0300
@@ -132,8 +132,14 @@
 class HB_CORE_EXPORT HbPredictionEngineChinese : public HbPredictionEngine
 {
 public:
+    virtual void updateCnInputMode() = 0;
+    // HbInputModeType deprecated, int are used currently
     virtual void setInputMode(HbInputModeType imMode) = 0;
+    virtual bool setCnInputMode(int imMode) = 0;
+
+    // HbInputModeType deprecated, int are used currently
     virtual HbInputModeType inputMode() const = 0;
+    virtual int cnInputMode() = 0;
 
     virtual bool spelling(int index, QString &out) = 0;
     virtual bool selectSpelling(int index) = 0;
@@ -146,10 +152,17 @@
     virtual bool candidateExist(int index) = 0;
 
     virtual bool pressKey(const int keycode, const Qt::KeyboardModifiers modifiers, const int textCase = 0) = 0;
+
+    // HbInputModeType deprecated, int are used currently
     virtual bool isInputModeSupported(HbInputModeType imMode) = 0;
+    virtual bool isCnInputModeSupported(int imMode) = 0;
+
     // used for hwr engine
     virtual bool addStroke(const QList<QPointF>& traceData) = 0;
     virtual bool inlineSpelling(int idx, QString &out) = 0;
+    virtual QByteArray itutZhuyinKeySequences() = 0;
+    virtual int setInputAreaSize(QSize &size) = 0;
+    virtual int setScreenSize(QSize &size) = 0;
 };
 
 #endif // HB_INPUT_PREDICTION_ENGINE_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/hbinputvirtualkeyboard.h
--- a/src/hbcore/inputfw/hbinputvirtualkeyboard.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/inputfw/hbinputvirtualkeyboard.h	Tue Jul 06 14:36:53 2010 +0300
@@ -24,7 +24,7 @@
 ****************************************************************************/
 
 #ifndef HB_INPUT_VIRTUAL_KEYBOARD_H
-#define HB_INPUT_VIRTUAL_KEYBAORD_H
+#define HB_INPUT_VIRTUAL_KEYBOARD_H
 
 #include <QSizeF>
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/inputfw/inputfw.pri
--- a/src/hbcore/inputfw/inputfw.pri	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/inputfw/inputfw.pri	Tue Jul 06 14:36:53 2010 +0300
@@ -53,6 +53,7 @@
 PUBLIC_HEADERS += $$PWD/hbinputstandardfilters.h
 PUBLIC_HEADERS += $$PWD/hbinputmethoddescriptor.h
 PUBLIC_HEADERS += $$PWD/hbinputvkbhostbridge.h
+PUBLIC_HEADERS += $$PWD/hbinputcontextplugin.h
 
 # private framework headers
 PRIVATE_HEADERS += $$PWD/hbinputmodecache_p.h
@@ -92,4 +93,5 @@
 SOURCES += $$PWD/hbinputmethoddescriptor.cpp
 SOURCES += $$PWD/hbinputvkbhostbridge.cpp
 SOURCES += $$PWD/hbinputmainwindow.cpp
+SOURCES += $$PWD/hbinputcontextplugin.cpp
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/layouts/hbanchor.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/layouts/hbanchor.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,428 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include "hbanchor.h"
+#include "hbanchor_p.h"
+#include "hbanchorlayout.h"
+
+#ifndef HB_BOOTSTRAPPED
+#include <QWidget> // QWIDGETSIZE_MAX
+#else
+#define QWIDGETSIZE_MAX ((1<<24)-1)
+#endif
+
+/*!
+    \class HbAnchor
+    \brief HbAnchor class represents anchors used by HbAnchorLayout.
+
+    HbAnchor instance has own size hints and size policy. It can have
+    minimum/maximum/preferred sizes and any of size policies supported by Qt.
+    By default size policy is QSizePolicy::Fixed and anchor size is zero.
+
+    HbAnchor cannot have negative size hints, instead you can use
+    HbAnchor::Direction for turning anchor to opposite side.
+
+    Note: when you pass negative number to size hint, direction is
+    changed automatically to HbAnchor::Negative, and absolute value
+    is for requested size hint.
+
+    \stable
+*/
+
+/*!
+    internal
+*/
+HbAnchorPrivate::HbAnchorPrivate()
+    : mStartItem(0), mStartId(), mEndItem(0), mEndId(), mMinValue(0), mPrefValue(0), mMaxValue(QWIDGETSIZE_MAX),
+      mPolicy(QSizePolicy::Fixed), mDir(HbAnchor::Positive), mParent(0), mAnchorId()
+    {
+    }
+
+
+/*!
+    internal
+*/
+void HbAnchorPrivate::setInitialLength( qreal length )
+{
+    mDir = (length < 0) ? HbAnchor::Negative : HbAnchor::Positive;
+    mPrefValue = qAbs(length);
+}
+
+/*!
+    Constructor.
+*/
+HbAnchor::HbAnchor( const QString& startNodeId, Hb::Edge startEdge, const QString& endNodeId, Hb::Edge endEdge, qreal length ) : d_ptr( new HbAnchorPrivate )
+{
+    Q_D( HbAnchor );
+    d->mStartEdge = startEdge;
+    d->mStartId = startNodeId;
+    d->mEndEdge = endEdge;
+    d->mEndId = endNodeId;
+
+    d->setInitialLength( length );
+}
+
+/*!
+    Constructor.
+*/
+HbAnchor::HbAnchor( const QString& startNodeId, Hb::Edge startEdge, QGraphicsLayoutItem *endItem, Hb::Edge endEdge, qreal length ) : d_ptr( new HbAnchorPrivate )
+{
+    Q_D( HbAnchor );
+    d->mStartId = startNodeId;
+    d->mStartEdge = startEdge;
+    d->mEndEdge = endEdge;
+    d->mEndItem = endItem;
+
+    d->setInitialLength( length );
+}
+
+/*!
+    Constructor.
+*/
+HbAnchor::HbAnchor( QGraphicsLayoutItem *startItem, Hb::Edge startEdge, const QString& endNodeId, Hb::Edge endEdge, qreal length ) : d_ptr( new HbAnchorPrivate )
+{
+    Q_D( HbAnchor );
+    d->mStartEdge = startEdge;
+    d->mStartItem = startItem;
+    d->mEndEdge = endEdge;
+    d->mEndId = endNodeId;
+
+    d->setInitialLength( length );
+}
+
+/*!
+    Constructor.
+*/
+HbAnchor::HbAnchor( QGraphicsLayoutItem *startItem, Hb::Edge startEdge, QGraphicsLayoutItem *endItem, Hb::Edge endEdge, qreal length ) : d_ptr( new HbAnchorPrivate )
+{
+    Q_D( HbAnchor );
+    d->mStartEdge = startEdge;
+    d->mStartItem = startItem;
+    d->mEndEdge = endEdge;
+    d->mEndItem = endItem;
+
+    d->setInitialLength( length );
+}
+
+
+/*!
+    Destructor.
+*/
+HbAnchor::~HbAnchor()
+{
+    delete d_ptr;
+}
+
+
+/*!
+    Returns reference to HbAnchorLayout, where this anchor is set. If this anchor has not
+    been set to any layout yet, then this function returns zero.
+
+    \return reference to HbAnchorLayout, or zero.
+*/
+HbAnchorLayout *HbAnchor::parent() const
+{
+    Q_D( const HbAnchor );
+    return d->mParent;
+}
+
+/*!
+    Assigns other to this anchor and returns a reference to this anchor.
+*/
+HbAnchor &HbAnchor::operator=(const HbAnchor &other)
+{
+    Q_D( HbAnchor );
+    if (this != &other) {
+        d->mStartItem = other.startItem();
+        d->mStartId = other.startNodeId();
+        d->mStartEdge = other.startEdge();
+        d->mEndItem = other.endItem();
+        d->mEndId = other.endNodeId();
+        d->mEndEdge = other.endEdge();
+        d->mMinValue = other.minimumLength();
+        d->mPrefValue = other.preferredLength();
+        d->mMaxValue = other.maximumLength();
+        d->mPolicy = other.sizePolicy();
+        setDirection( other.direction() );
+        d->mParent = other.parent();
+    }
+    return *this;
+}
+
+
+/*!
+    Sets size policy to this anchor.
+
+    \param policy size policy to be set
+*/
+void HbAnchor::setSizePolicy( QSizePolicy::Policy policy )
+{
+    Q_D( HbAnchor );
+    if ( d->mPolicy != policy ) {
+        d->mPolicy = policy;
+        if( d->mParent ) {
+            d->mParent->updateGeometry();
+        }
+    }
+}
+
+
+/*!
+    Returns current size policy. By default size policy is QSizePolicy::Fixed
+
+    \return current size policy
+*/
+QSizePolicy::Policy HbAnchor::sizePolicy() const
+{
+    Q_D( const HbAnchor );
+    return d->mPolicy;
+}
+
+/*!
+    Sets minimum length to this anchor.
+
+    Note: only non-negative values accepted.
+
+    \param length minimum length to be set
+*/
+void HbAnchor::setMinimumLength( qreal length )
+{
+    Q_D( HbAnchor );
+    Q_ASSERT( length >= 0 );
+    if ( d->mMinValue != length ) {
+        d->mMinValue = length;
+        if( d->mParent ) {
+            d->mParent->updateGeometry();
+        }
+    }
+}
+
+/*!
+    Sets preferred length to this anchor.
+
+    Note: only non-negative values accepted.
+
+    \param length preferred length to be set
+*/
+void HbAnchor::setPreferredLength( qreal length )
+{
+    Q_D( HbAnchor );
+    Q_ASSERT( length >= 0 );
+    if ( d->mPrefValue != length ) {
+        d->mPrefValue = length;
+        if( d->mParent ) {
+            d->mParent->updateGeometry();
+        }
+    }
+}
+
+/*!
+    Sets maximum length to this anchor.
+
+    Note: only non-negative values accepted.
+
+    \param length maximum length to be set
+*/
+void HbAnchor::setMaximumLength( qreal length )
+{
+    Q_D( HbAnchor );
+    Q_ASSERT( length >= 0 );
+    if ( d->mMaxValue != length ) {
+        d->mMaxValue = length;
+        if( d->mParent ) {
+            d->mParent->updateGeometry();
+        }
+    }
+}
+
+/*!
+    Returns minimum length of this anchor.
+
+    \return minimum length of this anchor
+*/
+qreal HbAnchor::minimumLength() const
+{
+    Q_D( const HbAnchor );
+    return d->mMinValue;
+}
+
+/*!
+    Returns preferred length of this anchor.
+
+    \return preferred length of this anchor
+*/
+qreal HbAnchor::preferredLength() const
+{
+    Q_D( const HbAnchor );
+    return d->mPrefValue;
+}
+
+/*!
+    Returns maximum length of this anchor.
+
+    \return maximum length of this anchor
+*/
+qreal HbAnchor::maximumLength() const
+{
+    Q_D( const HbAnchor );
+    return d->mMaxValue;
+}
+
+/*!
+    Returns length hint of this anchor.
+
+    \param which here you specify which size hint to return
+    \return value of requested length hint
+*/
+qreal HbAnchor::lengthHint( Qt::SizeHint which ) const
+{
+    Q_D( const HbAnchor );
+    if (which == Qt::MinimumSize) {
+        return d->mMinValue;
+    } else if (which == Qt::PreferredSize ) {
+        return d->mPrefValue;
+    } else {
+        return d->mMaxValue;
+    }
+
+}
+
+/*!
+    Returns current start item, or zero if it is not set.
+
+    \return reference to start item
+*/
+QGraphicsLayoutItem *HbAnchor::startItem() const
+{
+    Q_D( const HbAnchor );
+    return d->mStartItem;
+}
+
+/*!
+    Returns current start node id, or null-string if it is not set.
+
+    \return start node id
+*/
+QString HbAnchor::startNodeId() const
+{
+    Q_D( const HbAnchor );
+    return d->mStartId;
+}
+
+/*!
+    Returns start edge of this anchor.
+
+    \return start edge
+*/
+Hb::Edge HbAnchor::startEdge() const
+{
+    Q_D( const HbAnchor );
+    return d->mStartEdge;
+}
+
+/*!
+    Returns current end item, or zero if it is not set.
+
+    \return reference to end item
+*/
+QGraphicsLayoutItem *HbAnchor::endItem() const
+{
+    Q_D( const HbAnchor );
+    return d->mEndItem;
+}
+
+/*!
+    Returns current end node id, or null-string if it is not set.
+
+    \return start end id
+*/
+QString HbAnchor::endNodeId() const
+{
+    Q_D( const HbAnchor );
+    return d->mEndId;
+}
+
+/*!
+    Returns end edge of this anchor.
+
+    \return end edge
+*/
+Hb::Edge HbAnchor::endEdge() const
+{
+    Q_D( const HbAnchor );
+    return d->mEndEdge;
+}
+
+/*!
+    Returns current direction of this anchor.
+
+    \return direction
+*/
+HbAnchor::Direction HbAnchor::direction() const
+{
+    Q_D( const HbAnchor );
+    return d->mDir;
+}
+
+/*!
+    Sets direction to this anchor.
+
+    \param dir direction to set
+*/
+void HbAnchor::setDirection( HbAnchor::Direction dir )
+{
+    Q_D( HbAnchor );
+
+    if ( d->mDir != dir ) {
+        d->mDir = dir;
+        if( d->mParent ) {
+            d->mParent->updateGeometry();
+        }
+    }
+}
+
+/*!
+    Returns anchor id of this anchor, or null-string if it is not set. 
+
+    \return anchor id
+*/
+QString HbAnchor::anchorId() const
+{
+    Q_D( const HbAnchor );
+    return d->mAnchorId;
+}
+
+/*!
+    Sets anchor id for this anchor.
+
+    \param anchorId id to be set
+*/
+void HbAnchor::setAnchorId( const QString &anchorId )
+{
+    Q_D( HbAnchor );
+    d->mAnchorId = anchorId;
+}
+
+
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/layouts/hbanchor.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/layouts/hbanchor.h	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBANCHOR_H
+#define HBANCHOR_H
+
+#include <hbanchorlayout.h>
+
+class HbAnchorPrivate;
+
+class HB_CORE_EXPORT HbAnchor
+{
+public:
+
+    enum Direction {
+        Positive,
+        Negative
+    };
+
+    // - always: min < pref < max
+    // - no negative lenghts (could be added later, though)
+    // - Positive means "to-the-right" or "down"
+    // - Negative means "to-the-left" or "up"
+
+    HbAnchor( const QString& startNodeId, Hb::Edge startEdge, const QString& endNodeId, Hb::Edge endEdge, qreal length = 0 );
+    HbAnchor( const QString& startNodeId, Hb::Edge startEdge, QGraphicsLayoutItem *endItem, Hb::Edge endEdge, qreal length = 0 );
+    HbAnchor( QGraphicsLayoutItem *startItem, Hb::Edge startEdge, const QString& endNodeId, Hb::Edge endEdge, qreal length = 0 );
+    HbAnchor( QGraphicsLayoutItem *startItem, Hb::Edge startEdge, QGraphicsLayoutItem *endItem, Hb::Edge endEdge, qreal length = 0 );
+    ~HbAnchor();
+
+    HbAnchorLayout *parent() const;
+
+    HbAnchor &operator=(const HbAnchor &other);
+
+    void setSizePolicy( QSizePolicy::Policy policy );
+    QSizePolicy::Policy sizePolicy() const;
+
+    void setMaximumLength( qreal length );
+    void setPreferredLength( qreal length );
+    void setMinimumLength( qreal length );
+
+    qreal minimumLength() const;
+    qreal preferredLength() const;
+    qreal maximumLength() const;
+
+    qreal lengthHint( Qt::SizeHint which ) const;
+
+    QGraphicsLayoutItem *startItem() const;
+    QString startNodeId() const;
+    Hb::Edge startEdge() const;
+
+    QGraphicsLayoutItem *endItem() const;
+    QString endNodeId() const;
+    Hb::Edge endEdge() const;
+
+    Direction direction() const;
+    void setDirection( Direction dir );
+
+    QString anchorId() const;
+    void setAnchorId( const QString &anchorId );
+
+protected:
+    HbAnchorPrivate * const d_ptr;
+
+private:
+    Q_DECLARE_PRIVATE_D(d_ptr, HbAnchor)
+
+    friend class HbAnchorLayout; // for setting/removing parent, for example...
+    friend class HbAnchorLayoutPrivate;
+};
+
+#endif // HBANCHOR_H
+
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/layouts/hbanchor_p.h
--- a/src/hbcore/layouts/hbanchor_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/layouts/hbanchor_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -23,23 +23,20 @@
 **
 ****************************************************************************/
 
-#ifndef HBANCHORPRIVATE_H
-#define HBANCHORPRIVATE_H
+#ifndef HBANCHOR_P_H
+#define HBANCHOR_P_H
 
-#include <hbanchorlayout.h>
+#include <hbnamespace.h>
+#include <hbanchor.h>
 
-class HB_CORE_PRIVATE_EXPORT HbAnchor
+class HbAnchorLayout;
+class QGraphicsLayoutItem;
+
+class HbAnchorPrivate
 {
 public:
-    HbAnchor();
-    HbAnchor(
-        QGraphicsLayoutItem *startItem,
-        Hb::Edge startEdge,
-        QGraphicsLayoutItem *endItem,
-        Hb::Edge endEdge,
-        qreal value );
-    HbAnchor(const HbAnchor &anchor);
-    HbAnchor &operator=(const HbAnchor &anchor);
+    HbAnchorPrivate();
+    void setInitialLength( qreal length );
 
     QGraphicsLayoutItem *mStartItem;
     Hb::Edge mStartEdge;
@@ -47,8 +44,20 @@
     QGraphicsLayoutItem *mEndItem;
     Hb::Edge mEndEdge;
     QString mEndId;
-    qreal mValue;
+
+    qreal mMinValue;
+    qreal mPrefValue;
+    qreal mMaxValue;
+
+    QSizePolicy::Policy mPolicy;
+
+    HbAnchor::Direction mDir;
+
+    HbAnchorLayout *mParent;
+
+    QString mAnchorId;
 };
 
-#endif
 
+#endif // HBANCHOR_P_H
+
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/layouts/hbanchorlayout.cpp
--- a/src/hbcore/layouts/hbanchorlayout.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/layouts/hbanchorlayout.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -24,8 +24,8 @@
 ****************************************************************************/
 
 #include "hbanchorlayout.h"
+#include "hbanchor.h"
 #include "hbanchor_p.h"
-#include "hbanchorlayoutdebug_p.h"
 #include "hbanchorlayoutengine_p.h"
 
 #include <QLayout>
@@ -38,41 +38,35 @@
 //Similar define exists also in the engine side.
 //#define HBANCHORLAYOUT_DEBUG
 
-#ifdef HBANCHORLAYOUT_DEBUG
-#ifndef Q_WS_S60
-#include "hbspaceritem_p.h"
-#endif
-#endif
-
 /*!
     \class HbAnchorLayout
     \brief HbAnchorLayout manages geometries of its child items with anchors
     that connect the layout items with each other.
 
     It also allows layout items to be missing and can fix anchor attachments.
-    Here are some simple rules how anchor fixation can be created (the example
-    is only for horizontal direction - the same needs to be done for portrait as well).
+    Here is an example and some simple rules how anchor fixing works (the example is
+    only for horizontal direction - the same needs to be done for portrait as well).
 
-    If anchors set allow ambiguos positioning of items, then layout tries to set items size as
-    close to preferred as possible.
+    If anchors set allow ambiguos positioning of items, then layout tries to set items
+    size as close to preferred as possible.
 
-    \image html hbmeshlayout1.png
+    \image html hbanchorlayout1.png
 
     From the image above, we have decided that the green node is always present. This
     means that all the other nodes in the horizontal graph can be optional.
 
-    \image html hbmeshlayout2.png
+    \image html hbanchorlayout2.png
 
     Then, we create the anchors starting from the non-optional node and point towards
-    the edges of the layout. The mesh layout definition in the WidgetML would look like:
+    the edges of the layout. The anchor layout definition in the WidgetML would look like:
 
     \code
 
-    <meshitem src="green_item" srcEdge="LEFT" dst="blue_item" dstEdge="RIGHT" />
-    <meshitem src="blue_item" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="green_item" srcEdge="RIGHT" dst="red_item" dstEdge="LEFT" />
-    <meshitem src="red_item" srcEdge="RIGHT" dst="yellow_item" dstEdge="LEFT" />
-    <meshitem src="yellow_item" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    <anchoritem srcId="green_item" srcEdge="LEFT" dstId="blue_item" dstEdge="RIGHT" />
+    <anchoritem srcId="blue_item" srcEdge="LEFT" dstId="" dstEdge="LEFT" />
+    <anchoritem srcId="green_item" srcEdge="RIGHT" dstId="red_item" dstEdge="LEFT" />
+    <anchoritem srcId="red_item" srcEdge="RIGHT" dstId="yellow_item" dstEdge="LEFT" />
+    <anchoritem srcId="yellow_item" srcEdge="RIGHT" dstId="" dstEdge="RIGHT" />
 
     \endcode
 
@@ -81,10 +75,9 @@
     name "green_item". \c HbStyle::setItemName for more details.
 
     If an optional node is missing, the anchors pointing to the node are
-    changed to point to the node after (=towards the parent layout) the missing one - this
-    is called "fixing the mesh".
+    changed to point to the node after (=towards the parent layout) the missing one.
 
-    \image html hbmeshlayout3.png
+    \image html hbanchorlayout3.png
 
     In the picture above, the blue and yellow items are missing. The anchor is fixed by removing
     the anchor definitions starting from the missing nodes.
@@ -111,19 +104,23 @@
     Type for mapping from layout item to node identifier.
     \internal
 */
-typedef QMap<QGraphicsLayoutItem*, QString> HbMeshItemMap;
-typedef HbMeshItemMap::iterator HbMeshItemMapIterator;
-typedef HbMeshItemMap::const_iterator HbMeshItemMapConstIterator;
+typedef QMap<QGraphicsLayoutItem*, QString> ItemToNodeIdMap;
+typedef ItemToNodeIdMap::iterator ItemToNodeIdMapIterator;
+typedef ItemToNodeIdMap::const_iterator ItemToNodeIdMapConstIterator;
 
 
 /*
     Result of findEndItem.
 */
-struct HbMeshEndItemResult
+struct HbFixedEndItemResult
 {
     QGraphicsLayoutItem *mItem;
     HbAnchorLayout::Edge mEdge;
-    qreal mValue;
+    qreal mMin;
+    qreal mPref;
+    qreal mMax;
+    QSizePolicy::Policy mPolicy;
+    HbAnchor::Direction mDirection;
 };
 
 class HbAnchorLayoutPrivate
@@ -145,15 +142,16 @@
     int getEdgeIndex(QGraphicsLayoutItem *item, Hb::Edge edge);
 
     bool findEndItem(
-        QList<HbMeshEndItemResult> &resultList,
+        QList<HbFixedEndItemResult> &resultList,
         const HbAnchor *anchor,
         QStringList &ids) const;
     void resolveAnchors();
     void removeItemIfNeeded( QGraphicsLayoutItem *item );
 
-    bool setAnchor( HbAnchor *anchor );
+    HbAnchor *setAnchor( HbAnchor *anchor );
 
     void setSizeProp( SizeProperty *v, QGraphicsLayoutItem *item, EdgeType type );
+    void setSizeProp( SizeProperty *v, HbAnchor *item );
     GraphVertex *createCenterEdge( EdgeType type, QGraphicsLayoutItem *item,  Hb::Edge edge );
     void defineNextGeometry( const int itemIndexStart, const int itemIndexEnd, const int anchorIndex, const int definedItemIndex );
 
@@ -173,10 +171,9 @@
     QList<HbAnchor*> mResolvedStaticAnchors; // references to anchors, that remains the same after resolving
     QList<HbAnchor*> mResolvedAnchors; // anchors that are passed to engine
 
-    // mesh layout data
     QList<QGraphicsLayoutItem*> mItems; // for addItem
     QList<QGraphicsLayoutItem*> mActualItems; // layouted items
-    HbMeshItemMap mMeshMap;
+    ItemToNodeIdMap mItemToNodeIdMap;
 
     QRectF mUsedRect;
 
@@ -211,76 +208,86 @@
 
 
 
+/*!
+    \internal functions
+*/
 
+inline bool idConditionStartStart( HbAnchor *anchor1, HbAnchor *anchor2 )
+{
+    return ( !anchor1->startNodeId().isNull() ) && ( anchor1->startNodeId() == anchor2->startNodeId() );
+}
+inline bool idConditionEndEnd( HbAnchor *anchor1, HbAnchor *anchor2 )
+{
+    return ( !anchor1->endNodeId().isNull() ) && ( anchor1->endNodeId() == anchor2->endNodeId() );
+}
+inline bool idConditionStartEnd( HbAnchor *anchor1, HbAnchor *anchor2 )
+{
+    return ( !anchor1->startNodeId().isNull() ) && ( anchor1->startNodeId() == anchor2->endNodeId() );
+}
+inline bool idConditionEndStart( HbAnchor *anchor1, HbAnchor *anchor2 )
+{
+    return ( !anchor1->endNodeId().isNull() ) && ( anchor1->endNodeId() == anchor2->startNodeId() );
+}
+
+inline bool itemConditionStartStart( HbAnchor *anchor1, HbAnchor *anchor2 )
+{
+    return ( anchor1->startItem() != 0 ) && ( anchor1->startItem() == anchor2->startItem() );
+}
+inline bool itemConditionEndEnd( HbAnchor *anchor1, HbAnchor *anchor2 )
+{
+    return ( anchor1->endItem() != 0 ) && ( anchor1->endItem() == anchor2->endItem() );
+}
+inline bool itemConditionStartEnd( HbAnchor *anchor1, HbAnchor *anchor2 )
+{
+    return ( anchor1->startItem() != 0 ) && ( anchor1->startItem() == anchor2->endItem() );
+}
+inline bool itemConditionEndStart( HbAnchor *anchor1, HbAnchor *anchor2 )
+{
+    return ( anchor1->endItem() != 0 ) && ( anchor1->endItem() == anchor2->startItem() );
+}
+
+inline bool edgeConditionStartStart( HbAnchor *anchor1, HbAnchor *anchor2 )
+{
+    return anchor1->startEdge() == anchor2->startEdge();
+}
+inline bool edgeConditionEndEnd( HbAnchor *anchor1, HbAnchor *anchor2 )
+{
+    return anchor1->endEdge() == anchor2->endEdge();
+}
+inline bool edgeConditionStartEnd( HbAnchor *anchor1, HbAnchor *anchor2 )
+{
+    return anchor1->startEdge() == anchor2->endEdge();
+}
+inline bool edgeConditionEndStart( HbAnchor *anchor1, HbAnchor *anchor2 )
+{
+    return anchor1->endEdge() == anchor2->startEdge();
+}
+
+inline int directionMultiplier( HbAnchor *anchor )
+{
+    return ( ( anchor->direction() == HbAnchor::Positive )?(1):(-1) );
+}
 
 
 /*!
-    \internal
+    Returns list of effective anchors - those which has mappings to QGraphicsItem
+    \return list of effective anchors.
 */
-HbAnchor::HbAnchor()
-    : mStartItem(0),
-    mStartEdge(Hb::LeftEdge),
-    mEndItem(0),
-    mEndEdge(Hb::LeftEdge),
-    mValue(0)
+QList<HbAnchor*> HbAnchorLayout::effectiveAnchors()
 {
-}
-
-HbAnchor::HbAnchor(const HbAnchor &anchor)
-: mStartItem(anchor.mStartItem),
-  mStartEdge(anchor.mStartEdge),
-  mStartId(anchor.mStartId),
-  mEndItem(anchor.mEndItem),
-  mEndEdge(anchor.mEndEdge),
-  mEndId(anchor.mEndId),
-  mValue(anchor.mValue)
-{
+    Q_D( HbAnchorLayout );
+    d->resolveAnchors();
+    return d->mResolvedAnchors;
 }
 
-HbAnchor::HbAnchor( QGraphicsLayoutItem *startItem,
-                   HbAnchorLayout::Edge startEdge,
-                   QGraphicsLayoutItem *endItem,
-                   HbAnchorLayout::Edge endEdge,
-                   qreal value )
-    : mStartItem(startItem),
-    mStartEdge(startEdge),
-    mEndItem(endItem),
-    mEndEdge(endEdge),
-    mValue(value)
-{
-}
-
-
-HbAnchor &HbAnchor::operator=(const HbAnchor &anchor)
+/*!
+    Returns list of all anchors set to this layout
+    \return list of all anchors.
+*/
+QList<HbAnchor*> HbAnchorLayout::anchors() const
 {
-    if (this != &anchor) {
-        mStartItem = anchor.mStartItem;
-        mStartId = anchor.mStartId;
-        mStartEdge = anchor.mStartEdge;
-        mEndItem = anchor.mEndItem;
-        mEndId = anchor.mEndId;
-        mEndEdge = anchor.mEndEdge;
-        mValue = anchor.mValue;
-    }
-    return *this;
-}
-
-
-
-
-
-/*!
-    \internal
-*/
-QList<HbAnchor*> HbAnchorLayoutDebug::getAnchors( HbAnchorLayout* layout )
-{
-    layout->d_ptr->resolveAnchors();
-    return layout->d_ptr->mResolvedAnchors;
-}
-
-QList<HbAnchor*> HbAnchorLayoutDebug::getOriginalAnchors( HbAnchorLayout* layout )
-{
-    return layout->d_ptr->mAllAnchors;
+    Q_D( const HbAnchorLayout );
+    return d->mAllAnchors;
 }
 
 /*
@@ -374,13 +381,6 @@
             if (gItem->isWidget()) {
                 result = static_cast<QGraphicsWidget*>(gItem)->metaObject()->className();
             }
-#ifndef Q_WS_S60
-        } else {
-            HbSpacerItem *spacer = dynamic_cast<HbSpacerItem *>(item);
-            if ( spacer ) {
-                result = "HbSpacerItem";
-            }
-#endif
         }
     }
     return result;
@@ -399,23 +399,23 @@
 #ifdef HBANCHORLAYOUT_DEBUG
     QGraphicsWidget* w = HbLayoutUtils::parentWidget( q );
     if ( w ) {
-        qDebug() << "MeshLayout: Mesh anchors for" << w->metaObject()->className();
+        qDebug() << "AnchorLayout: Updating anchors for" << w->metaObject()->className();
     }
     const QString parentId =
-        mMeshMap.contains(q) ? mMeshMap.value(q) : QString();
+        mItemToNodeIdMap.contains(q) ? mItemToNodeIdMap.value(q) : QString();
     qDebug() << "-- -- resolved";
     qDebug() << "-- count: " << mResolvedAnchors.size() << ", parent: " << parentId;
     foreach (const HbAnchor *item, mResolvedAnchors) {
         const QString itemTemplate("-- (%1 [%2], %3) - (%4 [%5], %6) = %7");
         qDebug() <<
             itemTemplate
-            .arg(item->mStartId)
-            .arg(itemAsText(item->mStartItem, q))
-            .arg(edgeAsText(item->mStartEdge))
-            .arg(item->mEndId)
-            .arg(itemAsText(item->mEndItem, q))
-            .arg(edgeAsText(item->mEndEdge))
-            .arg(item->mValue).toAscii().data();
+            .arg(item->startNodeId())
+            .arg(itemAsText(item->startItem(), q))
+            .arg(edgeAsText(item->startEdge()))
+            .arg(item->endNodeId())
+            .arg(itemAsText(item->endItem(), q))
+            .arg(edgeAsText(item->endEdge()))
+            .arg(item->preferredLength()).toAscii().data();
     }
     qDebug() << "-- -- all";
     qDebug() << "-- count: " << mAllAnchors.size() << ", parent: " << parentId;
@@ -423,13 +423,13 @@
         const QString itemTemplate("-- (%1 [%2], %3) - (%4 [%5], %6) = %7");
         qDebug() <<
             itemTemplate
-            .arg(item->mStartId)
-            .arg(itemAsText(item->mStartItem, q))
-            .arg(edgeAsText(item->mStartEdge))
-            .arg(item->mEndId)
-            .arg(itemAsText(item->mEndItem, q))
-            .arg(edgeAsText(item->mEndEdge))
-            .arg(item->mValue).toAscii().data();
+            .arg(item->startNodeId())
+            .arg(itemAsText(item->startItem(), q))
+            .arg(edgeAsText(item->startEdge()))
+            .arg(item->endNodeId())
+            .arg(itemAsText(item->endItem(), q))
+            .arg(edgeAsText(item->endEdge()))
+            .arg(item->preferredLength()).toAscii().data();
     }
     qDebug() << "-- ";
 #endif // HBANCHORLAYOUT_DEBUG
@@ -442,16 +442,44 @@
 
         const HbAnchor* item = *it;
 
-        if (item->mStartItem != q && !mActualItems.contains(item->mStartItem)) {
-            mActualItems.append(item->mStartItem);
+        if (item->startItem() != q && !mActualItems.contains(item->startItem())) {
+            mActualItems.append(item->startItem());
         }
-        if (item->mEndItem != q && !mActualItems.contains(item->mEndItem)) {
-            mActualItems.append(item->mEndItem);
+        if (item->endItem() != q && !mActualItems.contains(item->endItem())) {
+            mActualItems.append(item->endItem());
         }
     }
 
 }
 
+void HbAnchorLayoutPrivate::setSizeProp( SizeProperty *v, HbAnchor *item )
+{
+    const QSizePolicy::Policy policy = item->sizePolicy();
+
+    if ( policy & QSizePolicy::ShrinkFlag ) {
+        v->min = item->minimumLength();
+    } else {
+        v->min = item->preferredLength();
+    }
+
+    if ( policy & (QSizePolicy::GrowFlag | QSizePolicy::ExpandFlag) ) {
+        v->max = item->maximumLength();
+    } else {
+        v->max = item->preferredLength();
+    }
+
+    v->pref = qBound( v->min, item->preferredLength(), v->max );
+
+    v->flags |= (v->min == v->max) ? SizeProperty::FlagFixed : 0;
+    v->flags |= (policy & QSizePolicy::ExpandFlag) ? SizeProperty::FlagExpanding : 0;
+
+    if( policy & QSizePolicy::IgnoreFlag ) {
+        v->pref = v->min;
+        v->flags |= SizeProperty::FlagExpanding;
+    }
+}
+
+
 
 void HbAnchorLayoutPrivate::setSizeProp( SizeProperty *v, QGraphicsLayoutItem *item, EdgeType type )
 {
@@ -618,21 +646,22 @@
     Hb::Edge knownEdge, unKnownEdge;
     int sign;
     qreal itemSize;
+    qreal anchorSize;
     bool isHorizontal;
     HbAnchor *anchor = mResolvedAnchors.at( anchorIndex );
     qreal leftPoint(0), rightPoint(0), sourcePoint(0), dstPointLeft(0);
 
     mAnchorsVisited[ anchorIndex ] = true;
 
-    if( edgeType( anchor->mStartEdge ) == Horizontal ) {
+    if( edgeType( anchor->startEdge() ) == Horizontal ) {
         isHorizontal = true;
     } else {
         isHorizontal = false;
     }
 
     if( itemIndexEnd != definedItemIndex ) {
-        knownEdge = anchor->mStartEdge;
-        unKnownEdge =  anchor->mEndEdge;
+        knownEdge = anchor->startEdge();
+        unKnownEdge =  anchor->endEdge();
 
         knownItemGeom = &mItemsGeometry[itemIndexStart];
         unKnownItemGeom = &mItemsGeometry[itemIndexEnd];
@@ -640,15 +669,17 @@
         if( isHorizontal ) {
             mGeometryDefinedH[itemIndexEnd] = true;
             itemSize = mSolutionHorizontal.value( mVariablesHorizontal.findVariable( mActualItems.at(itemIndexEnd) ) );
+            anchorSize = mSolutionHorizontal.value( mVariablesHorizontal.findVariable( anchor ) ) * directionMultiplier( anchor );
         } else {
             mGeometryDefinedV[itemIndexEnd] = true;
             itemSize = mSolutionVertical.value( mVariablesVertical.findVariable( mActualItems.at(itemIndexEnd) ) );
+            anchorSize = mSolutionVertical.value( mVariablesVertical.findVariable( anchor ) ) * directionMultiplier( anchor );
         }
 
         sign = 1;
     } else {
-        knownEdge =  anchor->mEndEdge;
-        unKnownEdge = anchor->mStartEdge;
+        knownEdge =  anchor->endEdge();
+        unKnownEdge = anchor->startEdge();
 
         knownItemGeom = &mItemsGeometry[itemIndexEnd];
         unKnownItemGeom = &mItemsGeometry[itemIndexStart];
@@ -656,9 +687,11 @@
         if( isHorizontal ) {
             mGeometryDefinedH[itemIndexStart] = true;
             itemSize = mSolutionHorizontal.value( mVariablesHorizontal.findVariable( mActualItems.at(itemIndexStart) ) );
+            anchorSize = mSolutionHorizontal.value( mVariablesHorizontal.findVariable( anchor ) ) * directionMultiplier( anchor );
         } else {
             mGeometryDefinedV[itemIndexStart] = true;
             itemSize = mSolutionVertical.value( mVariablesVertical.findVariable( mActualItems.at(itemIndexStart) ) );
+            anchorSize = mSolutionVertical.value( mVariablesVertical.findVariable( anchor ) ) * directionMultiplier( anchor );
         }
 
         sign = -1;
@@ -697,19 +730,19 @@
         case Hb::LeftEdge:
         case Hb::TopEdge:
         {
-            dstPointLeft = sourcePoint + sign * anchor->mValue;
+            dstPointLeft = sourcePoint + sign * anchorSize;
             break;
         }
         case Hb::CenterHEdge:
         case Hb::CenterVEdge:
         {
-            dstPointLeft = sourcePoint + sign * anchor->mValue - itemSize / 2;
+            dstPointLeft = sourcePoint + sign * anchorSize - itemSize / 2;
             break;
         }
         case Hb::RightEdge:
         case Hb::BottomEdge:
         {
-            dstPointLeft = sourcePoint + sign * anchor->mValue - itemSize;
+            dstPointLeft = sourcePoint + sign * anchorSize - itemSize;
             break;
         }
     }
@@ -723,7 +756,6 @@
         unKnownItemGeom->y1 = dstPointLeft;
         unKnownItemGeom->y2 = dstPointLeft + itemSize;
     }
-
 }
 
 
@@ -828,10 +860,10 @@
 
             int layoutIndex = mActualItems.size();
 
-            mItemsGeometry[ layoutIndex ].x1 = 0;//newRect.left();
-            mItemsGeometry[ layoutIndex ].x2 = newRect.width();//newRect.right();
-            mItemsGeometry[ layoutIndex ].y1 = 0;//newRect.top();
-            mItemsGeometry[ layoutIndex ].y2 = newRect.height();//newRect.bottom();
+            mItemsGeometry[ layoutIndex ].x1 = 0;
+            mItemsGeometry[ layoutIndex ].x2 = newRect.width();
+            mItemsGeometry[ layoutIndex ].y1 = 0;
+            mItemsGeometry[ layoutIndex ].y2 = newRect.height();
             mGeometryDefinedH[ layoutIndex ] = true;
             mGeometryDefinedV[ layoutIndex ] = true;
 
@@ -841,16 +873,16 @@
                 HbAnchor *anchor = mResolvedAnchors.at(i);
 
 
-                if( ( anchor->mStartItem != q ) && ( anchor->mEndItem != q ) ) {
+                if( ( anchor->startItem() != q ) && ( anchor->endItem() != q ) ) {
                     continue;
                 }
 
-                int startIndex = mActualItems.indexOf( anchor->mStartItem ); // returns -1 if not found => this is layout
-                int endIndex = mActualItems.indexOf( anchor->mEndItem );
+                int startIndex = mActualItems.indexOf( anchor->startItem() ); // returns -1 if not found => this is layout
+                int endIndex = mActualItems.indexOf( anchor->endItem() );
 
-                mAnchorsVisited[i] = true; // Temporary overkill, if both anchors connected to layout. Must be restricted on setAnchor() level
+                mAnchorsVisited[i] = true;
 
-                if( edgeType( anchor->mStartEdge ) == Horizontal ) {
+                if( edgeType( anchor->startEdge() ) == Horizontal ) {
                     if( startIndex > -1 ) {
                         if( ! mGeometryDefinedH.at( startIndex ) ) {
                             defineNextGeometry( startIndex, layoutIndex, i, layoutIndex );
@@ -887,12 +919,12 @@
                     }
                     HbAnchor *anchor = mResolvedAnchors.at(i);
 
-                    startIndex = mActualItems.indexOf( anchor->mStartItem );
-                    endIndex = mActualItems.indexOf( anchor->mEndItem );
+                    startIndex = mActualItems.indexOf( anchor->startItem() );
+                    endIndex = mActualItems.indexOf( anchor->endItem() );
 #ifdef HBANCHORLAYOUT_DEBUG
                     qDebug() << "startIndex:" << startIndex << "  endIndex" << endIndex;
 #endif //HBANCHORLAYOUT_DEBUG
-                    if( edgeType( anchor->mStartEdge ) == Horizontal ) {
+                    if( edgeType( anchor->startEdge() ) == Horizontal ) {
                         startDefined = mGeometryDefinedH.at( startIndex );
                         endDefined = mGeometryDefinedH.at( endIndex );
                     } else {
@@ -941,7 +973,6 @@
 
 #ifdef HBANCHORLAYOUT_DEBUG
                 qDebug( "Item %d: (%lf, %lf) : (%lf %lf)", i, calcGeom.x1, calcGeom.y1, calcGeom.x2, calcGeom.y2 );
-        //        qDebug() << "Item " <<  i << "(" << ((QGraphicsWidget*)mActualItems.at(i))->metaObject()->className() << ")" << " geom " << geom;
 #endif // HBANCHORLAYOUT_DEBUG
                 mActualItems.at(i)->setGeometry( geom );
             }
@@ -1061,24 +1092,24 @@
 
         for( int i = 0; i < mResolvedAnchors.count(); i++) {
             HbAnchor* anchor = mResolvedAnchors.at(i);
-            if ( edgeType( anchor->mStartEdge ) == type ) {
+            if ( edgeType( anchor->startEdge() ) == type ) {
                 itemStart = 0;
                 itemEnd = 0;
                 for( int j = 0; j < vertices->size(); j++ ) {
-                    if( ( vertices->at(j)->itemRef == anchor->mStartItem ) &&
-                            ( vertices->at(j)->itemSide == anchor->mStartEdge ) ) {
+                    if( ( vertices->at(j)->itemRef == anchor->startItem() ) &&
+                            ( vertices->at(j)->itemSide == anchor->startEdge() ) ) {
                         itemStart = vertices->at(j);
-                    } else if( ( vertices->at(j)->itemRef == anchor->mEndItem ) &&
-                        ( vertices->at(j)->itemSide == anchor->mEndEdge ) ) {
+                    } else if( ( vertices->at(j)->itemRef == anchor->endItem() ) &&
+                        ( vertices->at(j)->itemSide == anchor->endEdge() ) ) {
                         itemEnd = vertices->at(j);
                     }
                 }
 
                 if( !itemStart ) {
-                    itemStart = createCenterEdge( type, anchor->mStartItem,  anchor->mStartEdge );
+                    itemStart = createCenterEdge( type, anchor->startItem(),  anchor->startEdge() );
                 }
                 if( !itemEnd ) {
-                    itemEnd = createCenterEdge( type, anchor->mEndItem,  anchor->mEndEdge );
+                    itemEnd = createCenterEdge( type, anchor->endItem(),  anchor->endEdge() );
                 }
 
                 if( !itemStart ){
@@ -1100,9 +1131,12 @@
 
                 newEdge->startVertex = itemStart;
                 newEdge->endVertex = itemEnd;
-                se.mVar = v1;
-                se.mCoef = anchor->mValue;
+
+                se.mVar = vs->createVariable(anchor);
+                se.mCoef = directionMultiplier( anchor );
+                setSizeProp( &(se.mVar->sizeProp), anchor );
                 newEdge->expr->plusSimpleExpression( se );
+
                 edges->append( newEdge );
             }
         }
@@ -1211,11 +1245,11 @@
         infinite recursion, don't visit already visited.
 */
 bool HbAnchorLayoutPrivate::findEndItem(
-    QList<HbMeshEndItemResult> &resultList,
+    QList<HbFixedEndItemResult> &resultList,
     const HbAnchor *problem,
     QStringList &ids) const
 {
-    HbMeshEndItemResult result;
+    HbFixedEndItemResult result;
     bool found = false;
 
     for (QList<HbAnchor*>::const_iterator it = mAllAnchors.constBegin();
@@ -1224,33 +1258,28 @@
 
         const HbAnchor* currentItem = *it;
 
-        if (!currentItem->mStartId.isNull() &&
-            currentItem->mStartId == problem->mEndId &&
-            currentItem->mStartEdge == problem->mStartEdge &&
-            !ids.contains(currentItem->mStartId)) {
+        if (!currentItem->startNodeId().isNull() &&
+            currentItem->startNodeId() == problem->endNodeId() &&
+            currentItem->startEdge() == problem->startEdge() &&
+            !ids.contains(currentItem->startNodeId())) {
 
-            qreal currentSpacing = currentItem->mValue;
-
-            QGraphicsLayoutItem *item = currentItem->mEndItem;
-
+            QGraphicsLayoutItem *item = currentItem->endItem();
 
             if (item) {
                 found = true;
-                result.mEdge = currentItem->mEndEdge;
+                result.mEdge = currentItem->endEdge();
                 result.mItem = item;
-                result.mValue = currentSpacing;
+                result.mMin = currentItem->minimumLength();
+                result.mPref = currentItem->preferredLength();
+                result.mMax = currentItem->maximumLength();
+                result.mPolicy = currentItem->sizePolicy();
+                result.mDirection = currentItem->direction();
                 resultList.append( result );
             } else {
-                ids.append(currentItem->mStartId);
+                ids.append(currentItem->startNodeId());
                 found |= findEndItem(resultList, currentItem, ids);
                 ids.takeLast();
             }
-            /*
-            if (found) {
-                // We have found an end item. There can be multiple end items,
-                // but (for now) the first one is selected.
-                return true;
-            }*/
         }
     }
 
@@ -1286,26 +1315,25 @@
 
         HbAnchor *anchor = mAllAnchors.at(i);
 
-        if( ( anchor->mStartItem ) && ( anchor->mEndItem ) ) {
+        if( ( anchor->startItem() ) && ( anchor->endItem() ) ) {
             mResolvedStaticAnchors.append( anchor );
             continue;
         }
 
-        if (anchor->mStartItem && !anchor->mEndId.isNull()) {
-            QList<HbMeshEndItemResult> resultList;
+        if (anchor->startItem() && !anchor->endNodeId().isNull()) {
+            QList<HbFixedEndItemResult> resultList;
 
             QStringList ids;
-            ids.append(anchor->mStartId);
+            ids.append(anchor->startNodeId());
 
             if (findEndItem(resultList, anchor, ids)) {
                 for( int j = 0; j < resultList.size(); j++ ) {
-                    item = new HbAnchor();
-                    item->mStartItem = anchor->mStartItem;
-                    item->mStartId = anchor->mStartId;
-                    item->mStartEdge = anchor->mStartEdge;
-                    item->mEndEdge = resultList.at(j).mEdge;
-                    item->mEndItem = resultList.at(j).mItem;
-                    item->mValue = resultList.at(j).mValue;
+                    item = new HbAnchor( anchor->startItem(), anchor->startEdge(), resultList.at(j).mItem, resultList.at(j).mEdge );
+                    item->setMinimumLength( resultList.at(j).mMin );
+                    item->setPreferredLength( resultList.at(j).mPref );
+                    item->setMaximumLength( resultList.at(j).mMax );
+                    item->setSizePolicy( resultList.at(j).mPolicy );
+                    item->setDirection( resultList.at(j).mDirection );
                     mResolvedDynamicAnchors.append(item);
                 }
             }
@@ -1317,90 +1345,78 @@
     mResolvedAnchors = mResolvedDynamicAnchors + mResolvedStaticAnchors;
 }
 
-bool HbAnchorLayoutPrivate::setAnchor( HbAnchor *anchor )
+HbAnchor *HbAnchorLayoutPrivate::setAnchor( HbAnchor *anchor )
 {
+    Q_Q( HbAnchorLayout );
     // This method is called from HbAnchorLayout::setAnchor.
 
-    if (HbAnchorLayoutPrivate::edgeType(anchor->mStartEdge) !=
-        HbAnchorLayoutPrivate::edgeType(anchor->mEndEdge)) {
+    if (HbAnchorLayoutPrivate::edgeType(anchor->startEdge()) !=
+        HbAnchorLayoutPrivate::edgeType(anchor->endEdge())) {
         qWarning() << "HbAnchorLayout::setAnchor : You can't connect different type of edges";
-        return false;
+        return 0;
     }
 
-    if ( ( anchor->mStartId.isNull() && ( anchor->mStartItem == 0 ) ) ||
-        ( anchor->mEndId.isNull() && ( anchor->mEndItem == 0 ) ) ){
+    if ( ( anchor->startNodeId().isNull() && ( anchor->startItem() == 0 ) ) ||
+        ( anchor->endNodeId().isNull() && ( anchor->endItem() == 0 ) ) ){
         qWarning() << "HbAnchorLayout::setAnchor : Both ids must be valid";
-        return false;
+        return 0;
     }
 
-    if ( ( anchor->mStartId == anchor->mEndId ) && ( ( anchor->mStartItem == anchor->mEndItem ) ) &&
-        ( anchor->mStartEdge == anchor->mEndEdge ) ) {
+    if ( ( anchor->startNodeId() == anchor->endNodeId() ) && ( ( anchor->startItem() == anchor->endItem() ) ) &&
+        ( anchor->startEdge() == anchor->endEdge() ) ) {
         qWarning() << "HbAnchorLayout::setAnchor : You cannot set anchor between the same edge";
-        return false;
+        return 0;
     }
 
-    bool modified = false;
-
     const int count = mAllAnchors.size();
     for (int i = 0; i < count; ++i) {
         HbAnchor *item = mAllAnchors.at(i);
 
-
-        bool idConditionStartStart = ( !item->mStartId.isNull() ) && ( item->mStartId == anchor->mStartId );
-        bool idConditionEndEnd = ( !item->mEndId.isNull() ) && ( item->mEndId == anchor->mEndId );
-        bool idConditionStartEnd = ( !item->mStartId.isNull() ) && ( item->mStartId == anchor->mEndId );
-        bool idConditionEndStart = ( !item->mEndId.isNull() ) && ( item->mEndId == anchor->mStartId );
-
-        bool itemConditionStartStart = ( item->mStartItem != 0 ) && ( item->mStartItem == anchor->mStartItem );
-        bool itemConditionEndEnd = ( item->mEndItem != 0 ) && ( item->mEndItem == anchor->mEndItem );
-        bool itemConditionStartEnd = ( item->mStartItem != 0 ) && ( item->mStartItem == anchor->mEndItem );
-        bool itemConditionEndStart = ( item->mEndItem != 0 ) && ( item->mEndItem == anchor->mStartItem );
-
-        bool edgeConditionStartStart = item->mStartEdge == anchor->mStartEdge;
-        bool edgeConditionEndEnd = item->mEndEdge == anchor->mEndEdge;
-        bool edgeConditionStartEnd = item->mStartEdge == anchor->mEndEdge;
-        bool edgeConditionEndStart = item->mEndEdge == anchor->mStartEdge;
-
-
-        if((idConditionStartStart || itemConditionStartStart) &&
-            (idConditionEndEnd || itemConditionEndEnd) &&
-            (edgeConditionStartStart) &&
-            (edgeConditionEndEnd) ){
-                modified = true;
-                item->mValue = anchor->mValue;
+        if( ( idConditionStartStart( item, anchor ) || itemConditionStartStart( item, anchor ) ) &&
+            ( idConditionEndEnd( item, anchor ) || itemConditionEndEnd( item, anchor ) ) &&
+            ( edgeConditionStartStart( item, anchor ) ) &&
+            ( edgeConditionEndEnd( item, anchor ) ) ){
+                item->setSizePolicy( anchor->sizePolicy() );
+                item->setMinimumLength( anchor->minimumLength() );
+                item->setPreferredLength( anchor->preferredLength() );
+                item->setMaximumLength( anchor->maximumLength() );
+                item->setDirection( anchor->direction() );
                 delete anchor;
-                break;
-        } else if( (idConditionStartEnd || itemConditionStartEnd) &&
-            (idConditionEndStart || itemConditionEndStart) &&
-            (edgeConditionStartEnd) &&
-            (edgeConditionEndStart) ){
-                modified = true;
-                item->mValue = -anchor->mValue;
+                return item;
+        } else if( ( idConditionStartEnd( item, anchor ) || itemConditionStartEnd( item, anchor ) ) &&
+            ( idConditionEndStart( item, anchor )  || itemConditionEndStart( item, anchor ) ) &&
+            ( edgeConditionStartEnd( item, anchor ) ) &&
+            ( edgeConditionEndStart( item, anchor ) ) ){
+                item->setSizePolicy( anchor->sizePolicy() );
+                item->setMinimumLength( anchor->minimumLength() );
+                item->setPreferredLength( anchor->preferredLength() );
+                item->setMaximumLength( anchor->maximumLength() );
+                item->setDirection( ( anchor->direction() == HbAnchor::Positive )?( HbAnchor::Negative ):( HbAnchor::Positive ) );
                 delete anchor;
-                break;
+                return item;
         }
     }
 
-    if (!modified) {
-        if( anchor->mStartItem != 0 ){
-            anchor->mStartId = mMeshMap.value( anchor->mStartItem );
-        } else if( ! anchor->mStartId.isNull() ) {
-            anchor->mStartItem = mMeshMap.key( anchor->mStartId );
-        }
-
-        if( anchor->mEndItem != 0 ){
-            anchor->mEndId = mMeshMap.value( anchor->mEndItem );
-        } else if( ! anchor->mEndId.isNull() ) {
-            anchor->mEndItem = mMeshMap.key( anchor->mEndId );
-        }
-
-        addItemIfNeeded( anchor->mStartItem );
-        addItemIfNeeded( anchor->mEndItem );
-
-        mAllAnchors.append(anchor);
+    if( anchor->startItem() != 0 ){
+        anchor->d_ptr->mStartId = mItemToNodeIdMap.value( anchor->startItem() );
+    } else if( ! anchor->startNodeId().isNull() ) {
+        anchor->d_ptr->mStartItem = mItemToNodeIdMap.key( anchor->startNodeId() );
     }
 
-    return true;
+    if( anchor->endItem() != 0 ){
+        anchor->d_ptr->mEndId = mItemToNodeIdMap.value( anchor->endItem() );
+    } else if( ! anchor->endNodeId().isNull() ) {
+        anchor->d_ptr->mEndItem = mItemToNodeIdMap.key( anchor->endNodeId() );
+    }
+
+    addItemIfNeeded( anchor->startItem() );
+    addItemIfNeeded( anchor->endItem() );
+
+    anchor->d_ptr->mParent = q;
+
+    mAllAnchors.append(anchor);
+
+    return anchor;
 }
 
 void HbAnchorLayoutPrivate::removeItemIfNeeded( QGraphicsLayoutItem *item )
@@ -1413,7 +1429,7 @@
 
     for ( int i = 0; i < mAllAnchors.size(); i++ ) {
         HbAnchor *anchor = mAllAnchors.at(i);
-        if ( ( anchor->mStartItem == item ) || ( anchor->mEndItem == item ) ) {
+        if ( ( anchor->startItem() == item ) || ( anchor->endItem() == item ) ) {
             return;
         }
     }
@@ -1490,27 +1506,25 @@
     \param endItem target item.
     \param endEdge target edge.
     \param length spacing (in pixels).
-    \return true if anchor was successfully added, false otherwise
+    \return created anchor if it was successfully added, or zero otherwise
 */
-bool HbAnchorLayout::setAnchor( QGraphicsLayoutItem *startItem, Edge startEdge, QGraphicsLayoutItem *endItem, Edge endEdge, qreal length )
+HbAnchor *HbAnchorLayout::setAnchor( QGraphicsLayoutItem *startItem, Edge startEdge, QGraphicsLayoutItem *endItem, Edge endEdge, qreal length )
 {
     Q_D( HbAnchorLayout );
 
-    HbAnchor *anchor = new HbAnchor();
-    anchor->mStartItem = startItem;
-    anchor->mStartEdge = startEdge;
-    anchor->mEndItem = endItem;
-    anchor->mEndEdge = endEdge;
-    anchor->mValue = length;
+
+    HbAnchor *anchor = new HbAnchor( startItem, startEdge, endItem, endEdge, length );
 
-    if (d->setAnchor(anchor)) {
+    HbAnchor *result = d->setAnchor( anchor );
+
+    if( result ) {
         invalidate();
-        return true;
+        return result;
     }
 
     delete anchor;
 
-    return false;
+    return 0;
 }
 
 /*!
@@ -1521,27 +1535,45 @@
     \param endId end id.
     \param endEdge end edge.
     \param length spacing value for all edges starting from (\a startId, \a startEdge).
-    \return true if success, false otherwise.
+    \return created anchor if it was successfully added, or zero otherwise
 */
-bool HbAnchorLayout::setAnchor( const QString& startId, Edge startEdge, const QString& endId, Edge endEdge, qreal length )
+HbAnchor *HbAnchorLayout::setAnchor( const QString& startId, Edge startEdge, const QString& endId, Edge endEdge, qreal length )
 {
     Q_D( HbAnchorLayout );
 
-    HbAnchor *anchor = new HbAnchor();
-    anchor->mStartId = startId;
-    anchor->mStartEdge = startEdge;
-    anchor->mEndId = endId;
-    anchor->mEndEdge = endEdge;
-    anchor->mValue = length;
+    HbAnchor *anchor = new HbAnchor( startId, startEdge, endId, endEdge, length );
+
+    HbAnchor *result = d->setAnchor( anchor );
 
-    if (d->setAnchor(anchor)) {
+    if( result ) {
         invalidate();
-        return true;
+        return result;
     }
 
     delete anchor;
 
-    return false;
+    return 0;
+}
+
+
+/*!
+    Set previously created anchor. Ownership is passed to layout.
+
+    \param anchor anchor, created somewhere outside
+    \return reference to updated/created anchor (not necessary the same as in input parameter), or zero if something was wrong.
+*/
+HbAnchor *HbAnchorLayout::setAnchor( HbAnchor *anchor )
+{
+    Q_D( HbAnchorLayout );
+
+    HbAnchor *result = d->setAnchor( anchor );
+
+    if( result ) {
+        invalidate();
+        return result;
+    }
+
+    return 0;
 }
 
 
@@ -1561,19 +1593,18 @@
 
     for (int i = d->mAllAnchors.size() - 1; i >= 0; --i) {
         HbAnchor* anchor = d->mAllAnchors[i];
-        if( ( anchor->mStartId == startNodeId && anchor->mStartEdge == startEdge &&
-                anchor->mEndId == endNodeId && anchor->mEndEdge == endEdge ) ||
-            ( anchor->mStartId == endNodeId && anchor->mStartEdge == endEdge &&
-                anchor->mEndId == startNodeId && anchor->mEndEdge == startEdge ) ){
+        if( ( anchor->startNodeId() == startNodeId && anchor->startEdge() == startEdge &&
+                anchor->endNodeId() == endNodeId && anchor->endEdge() == endEdge ) ||
+            ( anchor->startNodeId() == endNodeId && anchor->startEdge() == endEdge &&
+                anchor->endNodeId() == startNodeId && anchor->endEdge() == startEdge ) ){
             delete d->mAllAnchors.takeAt(i);
             modified = true;
-            break;
         }
     }
 
     if (modified) {
-        d->removeItemIfNeeded( d->mMeshMap.key( startNodeId ) );
-        d->removeItemIfNeeded( d->mMeshMap.key( endNodeId ) );
+        d->removeItemIfNeeded( d->mItemToNodeIdMap.key( startNodeId ) );
+        d->removeItemIfNeeded( d->mItemToNodeIdMap.key( endNodeId ) );
         invalidate();
         return true;
     }
@@ -1601,13 +1632,12 @@
 
     for (int i = d->mAllAnchors.size() - 1; i >= 0; --i) {
         HbAnchor* anchor = d->mAllAnchors[i];
-        if( ( anchor->mStartItem == startItem && anchor->mStartEdge == startEdge &&
-                anchor->mEndItem == endItem && anchor->mEndEdge == endEdge ) ||
-                ( anchor->mStartItem == endItem && anchor->mStartEdge == endEdge &&
-                anchor->mEndItem == startItem && anchor->mEndEdge == startEdge ) ){
+        if( ( anchor->startItem() == startItem && anchor->startEdge() == startEdge &&
+                anchor->endItem() == endItem && anchor->endEdge() == endEdge ) ||
+                ( anchor->startItem() == endItem && anchor->startEdge() == endEdge &&
+                anchor->endItem() == startItem && anchor->endEdge() == startEdge ) ){
             delete d->mAllAnchors.takeAt(i);
             modified = true;
-            break;
         }
     }
 
@@ -1621,6 +1651,64 @@
 }
 
 
+/*!
+
+    Removes and deletes an anchor (\a anchor) from layout.
+
+    If layout contains exactly the same anchor, with the same reference, then only this
+    one is removed and deleted. Otherwise all anchors with the same start and end points
+    are removed and deleted ( \a anchor is not deleted in this case because this instance
+    is not in layout ).
+
+    Notice: The item will be removed from the layout if this is the last
+    anchor connecting the item.
+
+    \param anchor anchor to be removed.
+    \return true if anchor was successfully removed, false otherwise
+*/
+bool HbAnchorLayout::removeAnchor( HbAnchor *anchor )
+{
+    Q_D( HbAnchorLayout );
+
+    if( d->mAllAnchors.removeOne( anchor ) ) {
+        d->removeItemIfNeeded( anchor->startItem() );
+        d->removeItemIfNeeded( anchor->endItem() );
+        delete anchor;
+        invalidate();
+        return true;
+    }
+
+    bool modified = true;
+
+    for (int i = d->mAllAnchors.size() - 1; i >= 0; --i) {
+        HbAnchor* item = d->mAllAnchors[i];
+        if( ( ( idConditionStartStart( item, anchor ) || itemConditionStartStart( item, anchor ) ) &&
+            ( idConditionEndEnd( item, anchor ) || itemConditionEndEnd( item, anchor ) ) &&
+            ( edgeConditionStartStart( item, anchor ) ) &&
+            ( edgeConditionEndEnd( item, anchor ) ) )    // condition for same direction anchor
+
+            ||
+
+            ( ( idConditionStartEnd( item, anchor ) || itemConditionStartEnd( item, anchor ) ) &&
+            ( idConditionEndStart( item, anchor )  || itemConditionEndStart( item, anchor ) ) &&
+            ( edgeConditionStartEnd( item, anchor ) ) &&
+            ( edgeConditionEndStart( item, anchor ) ) ) ){  // condition for opposite direction anchor
+            delete d->mAllAnchors.takeAt(i);
+            modified = true;
+            break;
+        }
+    }
+
+    if( modified ) {
+        d->removeItemIfNeeded( anchor->startItem() );
+        d->removeItemIfNeeded( anchor->endItem() );
+        invalidate();
+        return true;
+    }
+
+
+    return modified;
+}
 
 /*!
     Removes all anchors starting or ending to \a nodeId.
@@ -1638,9 +1726,9 @@
 
     for (int i = d->mAllAnchors.size() - 1; i >= 0; --i) {
         HbAnchor *anchor = d->mAllAnchors.at(i);
-        if (anchor->mStartId == nodeId || anchor->mEndId == nodeId) {
-            QGraphicsLayoutItem *startItem = anchor->mStartItem;
-            QGraphicsLayoutItem *endItem = anchor->mEndItem;
+        if (anchor->startNodeId() == nodeId || anchor->endNodeId() == nodeId) {
+            QGraphicsLayoutItem *startItem = anchor->startItem();
+            QGraphicsLayoutItem *endItem = anchor->endItem();
 
             delete d->mAllAnchors.takeAt(i);
             d->removeItemIfNeeded( startItem );
@@ -1694,35 +1782,35 @@
 
         for( int i = 0; i < d->mAllAnchors.size(); i++ ) {
             HbAnchor *anchor = d->mAllAnchors.at(i);
-            if( anchor->mStartItem == item ) {
-                anchor->mStartId = nodeId;
+            if( anchor->startItem() == item ) {
+                anchor->d_ptr->mStartId = nodeId;
                 modified = true;
-            } else if( anchor->mStartId == nodeId ) {
-                anchor->mStartItem = item;
+            } else if( anchor->startNodeId() == nodeId ) {
+                anchor->d_ptr->mStartItem = item;
                 modified = true;
             }
 
-            if( anchor->mEndItem == item ) {
-                anchor->mEndId = nodeId;
+            if( anchor->endItem() == item ) {
+                anchor->d_ptr->mEndId = nodeId;
                 modified = true;
-            } else if( anchor->mEndId == nodeId ) {
-                anchor->mEndItem = item;
+            } else if( anchor->endNodeId() == nodeId ) {
+                anchor->d_ptr->mEndItem = item;
                 modified = true;
             }
 
         }
 
         // Remove previous item -> id.
-        HbMeshItemMapIterator it = d->mMeshMap.begin();
-        while ( it != d->mMeshMap.end() ) {
+        ItemToNodeIdMapIterator it = d->mItemToNodeIdMap.begin();
+        while ( it != d->mItemToNodeIdMap.end() ) {
             if ( it.value() == nodeId ) {
-                it = d->mMeshMap.erase( it );
+                it = d->mItemToNodeIdMap.erase( it );
             } else {
                 ++it;
             }
         }
         d->addItemIfNeeded( item );
-        d->mMeshMap.insert( item, nodeId );
+        d->mItemToNodeIdMap.insert( item, nodeId );
     } else {
         return false;
     }
@@ -1754,19 +1842,19 @@
     for( int i = 0; i < d->mAllAnchors.size(); i++ ) {
         HbAnchor *anchor = d->mAllAnchors.at(i);
 
-        if( anchor->mStartItem == item ) {
-            anchor->mStartId = QString();
+        if( anchor->startItem() == item ) {
+            anchor->d_ptr->mStartId = QString();
             modified = true;
         }
 
-        if( anchor->mEndItem == item ) {
-            anchor->mEndId = QString();
+        if( anchor->endItem() == item ) {
+            anchor->d_ptr->mEndId = QString();
             modified = true;
         }
     }
 
 
-    d->mMeshMap.remove(item);
+    d->mItemToNodeIdMap.remove(item);
 
     if( modified ){
         invalidate();
@@ -1795,22 +1883,22 @@
     for( int i = 0; i < d->mAllAnchors.size(); i++ ) {
         HbAnchor *anchor = d->mAllAnchors.at(i);
 
-        if( anchor->mStartId == nodeId ) {
-            anchor->mStartItem = 0;
+        if( anchor->startNodeId() == nodeId ) {
+            anchor->d_ptr->mStartItem = 0;
             modified = true;
         }
 
-        if( anchor->mEndId == nodeId ) {
-            anchor->mEndItem = 0;
+        if( anchor->endNodeId() == nodeId ) {
+            anchor->d_ptr->mEndItem = 0;
             modified = true;
         }
     }
 
 
-    HbMeshItemMapIterator it = d->mMeshMap.begin();
-    while ( it != d->mMeshMap.end() ) {
+    ItemToNodeIdMapIterator it = d->mItemToNodeIdMap.begin();
+    while ( it != d->mItemToNodeIdMap.end() ) {
         if ( it.value() == nodeId ) {
-            it = d->mMeshMap.erase( it );
+            it = d->mItemToNodeIdMap.erase( it );
         } else {
             ++it;
         }
@@ -1829,17 +1917,17 @@
 void HbAnchorLayout::removeMappings()
 {
     Q_D( HbAnchorLayout );
-    d->mMeshMap.clear();
+    d->mItemToNodeIdMap.clear();
 
     for( int i = 0; i < d->mAllAnchors.size(); i++ ) {
         HbAnchor *anchor = d->mAllAnchors.at(i);
 
-        if( !anchor->mStartId.isNull() ) {
-            anchor->mStartItem = 0;
+        if( !anchor->startNodeId().isNull() ) {
+            anchor->d_ptr->mStartItem = 0;
         }
 
-        if( !anchor->mEndId.isNull() ) {
-            anchor->mEndItem = 0;
+        if( !anchor->endNodeId().isNull() ) {
+            anchor->d_ptr->mEndItem = 0;
         }
 
     }
@@ -1856,17 +1944,14 @@
     Q_Q(HbAnchorLayout);
 
     if (!item) {
-        //qWarning() << "HbAnchorLayout::addItemIfNeeded : item is NULL";
         return;
     }
 
     if (item == q) {
-        //qWarning() << "HbAnchorLayout::addItemIfNeeded : layout cannot be added";
         return;
     }
 
     if (mItems.contains(item)) {
-        //qWarning() << "HbAnchorLayout::addItemIfNeeded : item is already in layout";
         return;
     }
 
@@ -1922,8 +2007,8 @@
 QString HbAnchorLayout::nodeId( QGraphicsLayoutItem *item ) const
 {
     Q_D( const HbAnchorLayout );
-    if( d->mMeshMap.contains( item ) ) {
-        return d->mMeshMap.value( item );
+    if( d->mItemToNodeIdMap.contains( item ) ) {
+        return d->mItemToNodeIdMap.value( item );
     }
     return QString();
 }
@@ -1938,11 +2023,11 @@
     QStringList list;
     int c = d->mAllAnchors.count();
     while (c--) {
-        QString id = d->mAllAnchors.at(c)->mStartId;
+        QString id = d->mAllAnchors.at(c)->startNodeId();
         if (!list.contains(id) && !id.isNull()) {
             list.append(id);
         }
-        id = d->mAllAnchors.at(c)->mEndId;
+        id = d->mAllAnchors.at(c)->endNodeId();
         if (!list.contains(id) && !id.isNull()) {
             list.append(id);
         }
@@ -1958,7 +2043,7 @@
 QGraphicsLayoutItem *HbAnchorLayout::itemByNodeId( const QString& nodeId ) const
 {
     Q_D( const HbAnchorLayout );
-    return d->mMeshMap.key( nodeId );
+    return d->mItemToNodeIdMap.key( nodeId );
 }
 
 
@@ -1974,13 +2059,13 @@
     QGraphicsLayoutItem *item = itemAt( index );
     if ( item ) {
         for ( int i = d->mAllAnchors.count() - 1; i >= 0; i-- ) {
-            if ( ( ( d->mAllAnchors.at(i)->mStartItem == item ) && ( d->mAllAnchors.at(i)->mStartId.isNull() ) ) ||
-                 ( ( d->mAllAnchors.at(i)->mEndItem == item ) && ( d->mAllAnchors.at(i)->mEndId.isNull() ) ) ) {
+            if ( ( ( d->mAllAnchors.at(i)->startItem() == item ) && ( d->mAllAnchors.at(i)->startNodeId().isNull() ) ) ||
+                 ( ( d->mAllAnchors.at(i)->endItem() == item ) && ( d->mAllAnchors.at(i)->endNodeId().isNull() ) ) ) {
                     delete d->mAllAnchors.takeAt(i);
             }
         }
 
-        removeMapping( d->mMeshMap.value(item) );
+        removeMapping( d->mItemToNodeIdMap.value(item) );
         item->setParentLayoutItem( 0 );
         d->mItems.removeAt( index );
     }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/layouts/hbanchorlayout.h
--- a/src/hbcore/layouts/hbanchorlayout.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/layouts/hbanchorlayout.h	Tue Jul 06 14:36:53 2010 +0300
@@ -31,7 +31,6 @@
 #include <hbglobal.h>
 #include <hbnamespace.h>
 
-class HbAnchorLayoutDebug;
 class HbAnchorLayoutPrivate;
 class HbAnchor;
 
@@ -44,14 +43,19 @@
     explicit HbAnchorLayout( QGraphicsLayoutItem *parent = 0 );
     virtual ~HbAnchorLayout();
 
-    bool setAnchor( const QString &startNodeId, Edge startEdge, const QString &endNodeId, Edge endEdge, qreal length = 0 );
-    bool setAnchor( QGraphicsLayoutItem *startItem, Edge startEdge, QGraphicsLayoutItem *endItem, Edge endEdge, qreal length = 0 );
+    HbAnchor *setAnchor( const QString &startNodeId, Edge startEdge, const QString &endNodeId, Edge endEdge, qreal length = 0 );
+    HbAnchor *setAnchor( QGraphicsLayoutItem *startItem, Edge startEdge, QGraphicsLayoutItem *endItem, Edge endEdge, qreal length = 0 );
+    HbAnchor *setAnchor( HbAnchor *anchor );
 
     bool removeAnchor( const QString &startNodeId, Edge startEdge, const QString &endNodeId, Edge endEdge );
     bool removeAnchor( QGraphicsLayoutItem *startItem, Edge startEdge, QGraphicsLayoutItem *endItem, Edge endEdge );
+    bool removeAnchor( HbAnchor *anchor );
 
     void removeAnchors();
 
+    QList<HbAnchor*> anchors() const;
+    QList<HbAnchor*> effectiveAnchors();
+
     bool setMapping( QGraphicsLayoutItem *item, const QString& nodeId );
     bool removeMapping( QGraphicsLayoutItem *item );
     bool removeMapping( const QString &nodeId );
@@ -85,8 +89,6 @@
 private:
     Q_DISABLE_COPY( HbAnchorLayout )
     Q_DECLARE_PRIVATE_D( d_ptr, HbAnchorLayout )
-
-    friend class HbAnchorLayoutDebug;
 };
 
 #endif // HBANCHORLAYOUT_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/layouts/hbanchorlayoutdebug_p.h
--- a/src/hbcore/layouts/hbanchorlayoutdebug_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBANCHORLAYOUTDEBUGPRIVATE_H
-#define HBANCHORLAYOUTDEBUGPRIVATE_H
-
-class HbAnchorLayout;
-class HbAnchor;
-
-class HB_CORE_PRIVATE_EXPORT HbAnchorLayoutDebug
-{
-public:
-    static QList<HbAnchor*> getAnchors( HbAnchorLayout* layout );
-    static QList<HbAnchor*> getOriginalAnchors( HbAnchorLayout* layout );
-};
-
-#endif
-
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/layouts/hbmeshlayout_p.cpp
--- a/src/hbcore/layouts/hbmeshlayout_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1921 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include "hbmeshlayout_p.h"
-#include "hbmeshlayoutdebug_p.h"
-
-#include "hbanchorlayoutengine_p.h"
-#include "hblayoututils_p.h"
-#include "hbanchor_p.h"
-
-#include <QDebug>
-#include <QList>
-#include <QWidget>
-
-//Uncomment next define in order to get more debug prints.
-//Similar define exists also in the engine side.
-//#define HBMESHLAYOUT_DEBUG
-
-/*!
-    \class HbMeshLayout
-    \brief HbMeshLayout manages geometries of its child items with anchors
-    that connect the layout items with each other. This is different from
-    \c HbAnchorLayout in such way that this allows layout items to be missing
-    and can fix anchor attachments.
-
-    Currently, the HbMeshLayout is an internal class which can be only utilized via the
-    WidgetML within a widget.
-
-    The mesh layout is a bit more fragile than the anchor layout. The anchor definitions
-    need to support the missing items. Here are some simple rules how the mesh can be
-    created (the example is only for horizontal direction - the same needs to be done
-    for portrait as well).
-
-    First, we need to find the child item (=node), which is always present i.e. cannot be missing.
-
-    \image html hbmeshlayout1.png
-
-    From the image above, we have decided that the green node is always present. This
-    means that all the other nodes in the horizontal graph can be optional.
-
-    \image html hbmeshlayout2.png
-
-    Then, we create the anchors starting from the non-optional node and point towards
-    the edges of the layout. The mesh layout definition in the WidgetML would look like:
-
-    \code
-
-    <meshitem src="green_item" srcEdge="LEFT" dst="blue_item" dstEdge="RIGHT" />
-    <meshitem src="blue_item" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="green_item" srcEdge="RIGHT" dst="red_item" dstEdge="LEFT" />
-    <meshitem src="red_item" srcEdge="RIGHT" dst="yellow_item" dstEdge="LEFT" />
-    <meshitem src="yellow_item" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-
-    \endcode
-
-    As mentioned, the green node needs be present always. In practice, this means that the
-    parent widget, which owns this mesh layout, needs to have a child widget with item
-    name "green_item". \c HbStyle::setItemName for more details.
-
-    If an optional node is missing, the anchors pointing to the node are
-    changed to point to the node after (=towards the parent layout) the missing one - this
-    is called "fixing the mesh". The fixing only works if the end result can be determined
-    i.e. two anchor starting from a missing node is prohibited.
-
-    \image html hbmeshlayout3.png
-
-    In the picture above, the blue and yellow items are missing. The mesh is fixed by removing
-    the anchor definitions starting from the missing nodes.
-
-    \proto
-    \internal
-*/
-
-/*!
-    \enum HbMeshLayout::Edge
-
-    This enum defines the edges of a layout item.
-*/
-
-/*
-    \enum EdgeType
-    \internal
-*/
-enum EdgeType {
-    Horizontal = 0,
-    Vertical
-};
-
-/*
-    Single anchor. If mHasSpacing equals to false, then anchor is sort of defined,
-    but not really connected.
-    \internal
-*/
-struct HbMeshAnchor
-{
-    QString mStartId;
-    HbMeshLayout::Edge mStartEdge;
-    QString mEndId;
-    HbMeshLayout::Edge mEndEdge;
-    bool mHasSpacing;
-    qreal mSpacing;
-};
-
-/*
-    Key for spacing overrides.
-*/
-struct HbMeshKey
-{
-    QString mId;
-    HbMeshLayout::Edge mEdge;
-};
-
-/*
-    Returns true if \a first is less than \a second. Needed for QMap use.
-    \internal
-*/
-inline bool operator<(const HbMeshKey &first, const HbMeshKey &second)
-{
-    if( first.mId == second.mId ) {
-        return int(first.mEdge) < int(second.mEdge);
-    } else {
-        return first.mId < second.mId;
-    }
-}
-
-/*
-    Type for mapping from layout item to node identifier.
-    \internal
-*/
-typedef QMap<QGraphicsLayoutItem*, QString> HbMeshItemMap;
-typedef HbMeshItemMap::iterator HbMeshItemMapIterator;
-typedef HbMeshItemMap::const_iterator HbMeshItemMapConstIterator;
-
-/*
-    Type for inverse mapping of \c HbMeshItemMap.
-    \internal
-*/
-typedef QMap<QString, QGraphicsLayoutItem*> HbMeshItemMapInverse;
-
-/*
-    Result of findEndItem.
-*/
-struct HbMeshEndItemResult
-{
-    QGraphicsLayoutItem *mItem;
-    HbMeshLayout::Edge mEdge;
-    qreal mSpacing;
-};
-
-class HbMeshLayoutPrivate
-{
-public:
-    Q_DECLARE_PUBLIC( HbMeshLayout )
-
-    HbMeshLayoutPrivate();
-    ~HbMeshLayoutPrivate();
-
-    void addItemIfNeeded(QGraphicsLayoutItem *item);
-
-    static EdgeType edgeType( HbMeshLayout::Edge edge );
-    void setItemGeometries();
-    void updateAnchorsAndItems();
-
-    void createEquations( EdgeType type );
-
-    int getEdgeIndex(QGraphicsLayoutItem *item, Hb::Edge edge);
-
-    bool hasAnchorSpacing(const HbMeshAnchor &anchor, qreal *spacing = 0) const;
-    bool findEndItem(
-        HbMeshEndItemResult &result,
-        const HbMeshAnchor &anchor,
-        const HbMeshItemMapInverse &inverse,
-        QStringList &ids) const;
-    void resolveAnchors( QList<HbAnchor*> *anchors );
-
-    bool setAnchor(const HbMeshAnchor &anchor);
-    int actualItemsIndexOf(QGraphicsLayoutItem *item) const;
-
-    void setSizeProp( SizeProperty *v, QGraphicsLayoutItem *item, EdgeType type );
-    GraphVertex *createCenterEdge( EdgeType type, QGraphicsLayoutItem *item,  Hb::Edge edge );
-    void defineNextGeometry( 
-        const int itemIndexStart, 
-        const int itemIndexEnd, 
-        const int anchorIndex, 
-        const int definedItemIndex );
-
-
-    QSizeF sizeHint(Qt::SizeHint which);
-
-public:
-    HbMeshLayout * q_ptr;
-
-    bool mEquationsDirty; // if true, we needed to re-create the equations (e.g. when new anchor is set)
-    bool mValid;          // result of the calculations. false, if the equations cannot be solved.
-    bool mInvalidateCalled; // set true in ::invalidate() and cleared after geometry is set in ::setGeometry
-    bool mWrongAnchors;
-
-    QList<HbAnchor*> mAnchors;
-
-    // mesh layout data
-    QList<QGraphicsLayoutItem*> mItems; // for addItem
-    QList<QGraphicsLayoutItem*> mActualItems; // layouted items
-    HbMeshItemMap mMeshMap;
-    QList<HbMeshAnchor> mMeshAnchors;
-    QMap<HbMeshKey, qreal> mMeshSpacings;
-
-    QRectF mUsedRect;
-
-    // new items
-
-    QList<GraphEdge*> mEdgesVertical;
-    QList<GraphEdge*> mEdgesHorizontal;
-    QList<GraphVertex*> mVerticesVertical;
-    QList<GraphVertex*> mVerticesHorizontal;
-
-    QList<Expression*> mEquationsHorizontal;
-    QList<Expression*> mEquationsVertical;
-    VariableSet mVariablesHorizontal;
-    VariableSet mVariablesVertical;
-
-    Variable *mLayoutVarH;
-    Variable *mLayoutVarV;
-
-    QVector<bool> mAnchorsVisited;
-    QVector< bool > mGeometryDefinedH;
-    QVector< bool > mGeometryDefinedV;
-    typedef struct {
-        qreal x1, y1, x2, y2;
-    } ItemGeometry;
-
-    QVector< ItemGeometry > mItemsGeometry;
-
-    Solution mSolutionHorizontal;
-    Solution mSolutionVertical;
-
-};
-/*!
-    \internal
-*/
-QList<HbAnchor*> HbMeshLayoutDebug::getAnchors( HbMeshLayout* layout )
-{
-    QList<HbAnchor*> anchors;
-    layout->d_ptr->resolveAnchors( &anchors );
-    return anchors;
-}
-
-/*
-    \class HbMeshLayoutPrivate
-    \internal
-*/
-HbMeshLayoutPrivate::HbMeshLayoutPrivate() : 
-    mEquationsDirty(false), mValid(true), mInvalidateCalled( false ), mWrongAnchors( false ),
-    mUsedRect( 0, 0, 0, 0 ), mLayoutVarH( 0 ), mLayoutVarV( 0 )
-
-{
-}
-
-/*
-    \internal
-*/
-HbMeshLayoutPrivate::~HbMeshLayoutPrivate()
-{
-
-    qDeleteAll( mEdgesVertical );
-    qDeleteAll( mEdgesHorizontal );
-    qDeleteAll( mVerticesVertical );
-    qDeleteAll( mVerticesHorizontal );
-
-    qDeleteAll( mEquationsHorizontal );
-    qDeleteAll( mEquationsVertical );
-
-    qDeleteAll( mAnchors );
-}
-
-/*
-    \internal
-*/
-EdgeType HbMeshLayoutPrivate::edgeType( HbMeshLayout::Edge edge )
-{
-    EdgeType type( Horizontal );
-    if( edge == Hb::TopEdge || edge == Hb::BottomEdge || edge == Hb::CenterVEdge ) {
-        type = Vertical;
-    }
-    return type;
-}
-
-#ifdef HBMESHLAYOUT_DEBUG
-/*
-    Returns string representation of value in \c Edge enumeration.
-    \internal
-*/
-static QString edgeAsText(HbMeshLayout::Edge edge)
-{
-    QString result;
-    switch (edge) {
-    case Hb::LeftEdge:
-        result = "LEFT";
-        break;
-
-    case Hb::RightEdge:
-        result = "RIGHT";
-        break;
-
-    case Hb::CenterHEdge:
-        result = "CENTERH";
-        break;
-
-    case Hb::TopEdge:
-        result = "TOP";
-        break;
-
-    case Hb::BottomEdge:
-        result = "BOTTOM";
-        break;
-
-    case Hb::CenterVEdge:
-        result = "CENTERV";
-        break;
-
-    default:
-        result = "<UNDEFINED>";
-        break;
-    }
-
-    return result;
-}
-
-#endif // HBMESHLAYOUT_DEBUG
-
-/*
-    \internal
-*/
-void HbMeshLayoutPrivate::updateAnchorsAndItems()
-{
-    Q_Q(HbMeshLayout);
-    resolveAnchors( &mAnchors );
-
-#ifdef HBMESHLAYOUT_DEBUG
-    QGraphicsWidget* w = HbLayoutUtils::parentWidget( q );
-    if ( w ) {
-        qDebug() << "MeshLayout: Mesh anchors for" << w->metaObject()->className();
-    }
-    const QString parentId =
-        mMeshMap.contains(q) ? mMeshMap.value(q) : QString();
-    qDebug() << "-- count: " << mAnchors.size() << ", parent: " << parentId;
-    foreach (const HbAnchor *item, mAnchors) {
-        const QString itemTemplate("-- (%1, %2) - (%3, %4) = %5");
-        qDebug() <<
-            itemTemplate
-            .arg(mMeshMap.value(item->mStartItem))
-            .arg(edgeAsText(item->mStartEdge))
-            .arg(mMeshMap.value(item->mEndItem))
-            .arg(edgeAsText(item->mEndEdge))
-            .arg(item->mValue).toAscii().data();
-    }
-    qDebug() << "-- ";
-#endif // HBMESHLAYOUT_DEBUG
-
-    // HbMeshLayout will only touch items that have anchors defined.
-    mActualItems.clear();
-    for (QList<HbAnchor*>::const_iterator it = mAnchors.constBegin();
-         it != mAnchors.constEnd();
-         ++it) {
-
-        const HbAnchor* item = *it;
-
-        if (item->mStartItem != q && !mActualItems.contains(item->mStartItem)) {
-            mActualItems.append(item->mStartItem);
-        }
-        if (item->mEndItem != q && !mActualItems.contains(item->mEndItem)) {
-            mActualItems.append(item->mEndItem);
-        }
-    }
-
-}
-
-
-void HbMeshLayoutPrivate::setSizeProp( SizeProperty *v, QGraphicsLayoutItem *item, EdgeType type )
-{
-    if( type == Vertical ) {
-        const QSizePolicy::Policy verticalPolicy = item->sizePolicy().verticalPolicy();
-
-        if ( verticalPolicy & QSizePolicy::ShrinkFlag ) {
-            v->min = item->minimumHeight();
-        } else {
-            v->min = item->preferredHeight();
-        }
-
-        if ( verticalPolicy & (QSizePolicy::GrowFlag | QSizePolicy::ExpandFlag) ) {
-            v->max = item->maximumHeight();
-        } else {
-            v->max = item->preferredHeight();
-        }
-
-        v->pref = qBound( v->min, item->preferredHeight(), v->max );
-
-        v->flags |= (v->min == v->max) ? SizeProperty::FlagFixed : 0;
-        v->flags |= (verticalPolicy & QSizePolicy::ExpandFlag) ? SizeProperty::FlagExpanding : 0;
-
-        if( verticalPolicy & QSizePolicy::IgnoreFlag ) {
-            v->pref = v->min;
-            v->flags |= SizeProperty::FlagExpanding;
-        }
-    } else {
-        const QSizePolicy::Policy horizontalPolicy = item->sizePolicy().horizontalPolicy();
-
-        if ( horizontalPolicy & QSizePolicy::ShrinkFlag ) {
-            v->min = item->minimumWidth();
-        } else {
-            v->min = item->preferredWidth();
-        }
-
-        if ( horizontalPolicy & (QSizePolicy::GrowFlag | QSizePolicy::ExpandFlag) ) {
-            v->max = item->maximumWidth();
-        } else {
-            v->max = item->preferredWidth();
-        }
-
-        v->pref = qBound( v->min, item->preferredWidth(), v->max );
-
-        v->flags |= (v->min == v->max) ? SizeProperty::FlagFixed : 0;
-        v->flags |= (horizontalPolicy & QSizePolicy::ExpandFlag) ? SizeProperty::FlagExpanding : 0;
-
-        if( horizontalPolicy & QSizePolicy::IgnoreFlag ) {
-            v->pref = v->min;
-            v->flags |= SizeProperty::FlagExpanding;
-        }
-    }
-}
-
-
-GraphVertex *HbMeshLayoutPrivate::createCenterEdge( 
-    EdgeType type, QGraphicsLayoutItem *item,  Hb::Edge edge )
-{
-    GraphVertex *middle;
-    GraphVertex *start = 0;
-    GraphVertex *end = 0;
-
-    QList<GraphEdge*> *edges = &mEdgesHorizontal;
-    QList<GraphVertex*> *vertices = &mVerticesHorizontal;
-
-    if( type == Vertical ) {
-        if( edge != Hb::CenterVEdge ) {
-#ifdef HBMESHLAYOUT_DEBUG
-            qDebug() << "something wrong " << __LINE__;
-#endif //HBMESHLAYOUT_DEBUG
-            return 0;
-        }
-
-        edges = &mEdgesVertical;
-        vertices = &mVerticesVertical;
-
-        for( int j = 0; j < vertices->size(); j++ ) {
-            GraphVertex *current = vertices->at(j);
-            if( current->itemRef == item ) {
-                if( current->itemSide == Hb::TopEdge ) {
-                    start = current;
-                } else if( current->itemSide == Hb::BottomEdge ) {
-                    end = current;
-                }
-            }
-        }
-    } else {
-        if( edge != Hb::CenterHEdge ) {
-#ifdef HBMESHLAYOUT_DEBUG
-            qDebug() << "something wrong " << __LINE__;
-#endif //HBMESHLAYOUT_DEBUG
-            return 0;
-        }
-
-        for( int j = 0; j < vertices->size(); j++ ) {
-            GraphVertex *current = vertices->at(j);
-            if( current->itemRef == item ) {
-                if( current->itemSide == Hb::LeftEdge ) {
-                    start = current;
-                } else if( current->itemSide == Hb::RightEdge ) {
-                    end = current;
-                }
-            }
-        }
-    }
-
-    if( !( start && end ) ) {
-#ifdef HBMESHLAYOUT_DEBUG
-        qDebug() << "something wrong " << __LINE__;
-#endif //HBMESHLAYOUT_DEBUG
-        return 0;
-    }
-
-    GraphEdge *oldEdge = 0;
-
-    for( int i = 0; i < edges->size(); i++ ) {
-        oldEdge = edges->at(i);
-        if( oldEdge->ref == item ) {
-            if( ( oldEdge->startVertex == start ) && ( oldEdge->endVertex == end ) ){
-/*                edges->removeOne( oldEdge );
-                start->edges.removeOne( oldEdge );
-                end->edges.removeOne( oldEdge );*/
-                break;
-            }
-        }
-    }
-
-    if( !oldEdge ) {
-#ifdef HBMESHLAYOUT_DEBUG
-        qDebug() << "something wrong " << __LINE__;
-#endif //HBMESHLAYOUT_DEBUG
-        return 0;
-    }
-
-    middle = new GraphVertex();
-    middle->itemRef = ( void* )item;
-    middle->itemSide =  edge;
-    middle->special = false;
-
-    GraphEdge *newEdge1 = new GraphEdge();
-    GraphEdge *newEdge2 = new GraphEdge();
-
-    newEdge1->startVertex = start;
-    newEdge1->endVertex = middle;
-    newEdge1->ref = ( void* )item;
-
-    newEdge1->expr->plusExpression( oldEdge->expr );
-    newEdge1->expr->multiply( 0.5 );
-
-
-    newEdge2->startVertex = middle;
-    newEdge2->endVertex = end;
-    newEdge2->ref = ( void* )item;
-    newEdge2->expr->plusExpression( oldEdge->expr );
-    newEdge2->expr->multiply( 0.5 );
-
-
-    middle->edges.append( newEdge1 );
-    start->edges.append( newEdge1 );
-    middle->edges.append( newEdge2 );
-    end->edges.append( newEdge2 );
-
-    edges->append( newEdge1 );
-    edges->append( newEdge2 );
-    vertices->append( middle );
-
-
-    return middle;
-}
-
-void HbMeshLayoutPrivate::defineNextGeometry( 
-    const int itemIndexStart, 
-    const int itemIndexEnd, 
-    const int anchorIndex, 
-    const int definedItemIndex )
-{
-    ItemGeometry *knownItemGeom, *unKnownItemGeom;
-    Hb::Edge knownEdge, unKnownEdge;
-    int sign;
-    qreal itemSize;
-    bool isHorizontal;
-    HbAnchor *anchor = mAnchors.at( anchorIndex );
-    qreal leftPoint(0), rightPoint(0), sourcePoint(0), dstPointLeft(0);
-
-    mAnchorsVisited[ anchorIndex ] = true;
-
-    if( edgeType( anchor->mStartEdge ) == Horizontal ) {
-        isHorizontal = true;
-    } else {
-        isHorizontal = false;
-    }
-
-    if( itemIndexEnd != definedItemIndex ) {
-        knownEdge = anchor->mStartEdge;
-        unKnownEdge =  anchor->mEndEdge;
-
-        knownItemGeom = &mItemsGeometry[itemIndexStart];
-        unKnownItemGeom = &mItemsGeometry[itemIndexEnd];
-
-        if( isHorizontal ) {
-            mGeometryDefinedH[itemIndexEnd] = true;
-            itemSize = mSolutionHorizontal.value( 
-                mVariablesHorizontal.findVariable( mActualItems.at(itemIndexEnd) ) );
-        } else {
-            mGeometryDefinedV[itemIndexEnd] = true;
-            itemSize = mSolutionVertical.value( 
-                mVariablesVertical.findVariable( mActualItems.at(itemIndexEnd) ) );
-        }
-
-        sign = 1;
-    } else {
-        knownEdge =  anchor->mEndEdge;
-        unKnownEdge = anchor->mStartEdge;
-
-        knownItemGeom = &mItemsGeometry[itemIndexEnd];
-        unKnownItemGeom = &mItemsGeometry[itemIndexStart];
-
-        if( isHorizontal ) {
-            mGeometryDefinedH[itemIndexStart] = true;
-            itemSize = mSolutionHorizontal.value( 
-                mVariablesHorizontal.findVariable( mActualItems.at(itemIndexStart) ) );
-        } else {
-            mGeometryDefinedV[itemIndexStart] = true;
-            itemSize = mSolutionVertical.value( 
-                mVariablesVertical.findVariable( mActualItems.at(itemIndexStart) ) );
-        }
-
-        sign = -1;
-    }
-
-    if( isHorizontal ) {
-        leftPoint = knownItemGeom->x1;
-        rightPoint = knownItemGeom->x2;
-    } else {
-        leftPoint = knownItemGeom->y1;
-        rightPoint = knownItemGeom->y2;
-    }
-
-    switch( knownEdge ) {
-        case Hb::LeftEdge:
-        case Hb::TopEdge:
-        {
-            sourcePoint = leftPoint;
-            break;
-        }
-        case Hb::CenterHEdge:
-        case Hb::CenterVEdge:
-        {
-            sourcePoint = ( leftPoint + rightPoint ) / 2;
-            break;
-        }
-        case Hb::RightEdge:
-        case Hb::BottomEdge:
-        {
-            sourcePoint = rightPoint;
-            break;
-        }
-    }
-
-    switch( unKnownEdge ) {
-        case Hb::LeftEdge:
-        case Hb::TopEdge:
-        {
-            dstPointLeft = sourcePoint + sign * anchor->mValue;
-            break;
-        }
-        case Hb::CenterHEdge:
-        case Hb::CenterVEdge:
-        {
-            dstPointLeft = sourcePoint + sign * anchor->mValue - itemSize / 2;
-            break;
-        }
-        case Hb::RightEdge:
-        case Hb::BottomEdge:
-        {
-            dstPointLeft = sourcePoint + sign * anchor->mValue - itemSize;
-            break;
-        }
-    }
-
-
-
-    if( isHorizontal ) {
-        unKnownItemGeom->x1 = dstPointLeft;
-        unKnownItemGeom->x2 = dstPointLeft + itemSize;
-    } else {
-        unKnownItemGeom->y1 = dstPointLeft;
-        unKnownItemGeom->y2 = dstPointLeft + itemSize;
-    }
-
-}
-
-
-/*
-    \internal
-*/
-void HbMeshLayoutPrivate::setItemGeometries()
-{
-    Q_Q(HbMeshLayout);
-    const QRectF newRect = q->geometry();
-
-    if( mWrongAnchors || ( mActualItems.isEmpty() ) ) {
-        return;
-    }
-
-
-    if( (newRect != mUsedRect) || mInvalidateCalled ) {
-
-        mInvalidateCalled = false;
-        mUsedRect = newRect;
-
-        if ( mEquationsDirty ) {
-            updateAnchorsAndItems();
-            createEquations( Horizontal );
-            createEquations( Vertical );
-            mEquationsDirty = false;
-        }
-
-
-        mValid = true;
-
-        {
-
-            QList<Expression*> *el = &mEquationsHorizontal;
-            VariableSet *vs = &mVariablesHorizontal;
-            Solution *solution = &mSolutionHorizontal;
-            solution->clear();
-
-
-            solution->insert( mLayoutVarH, newRect.width() );
-#ifdef HBMESHLAYOUT_DEBUG
-            qDebug() << "LayoutH Id = " << mLayoutVarH->mId;
-#endif // HBMESHLAYOUT_DEBUG
-            mValid = AnchorLayoutEngine::instance()->solveEquation( el, vs, solution );
-            if( !mValid ) {
-                return;
-            }
-
-#ifdef HBMESHLAYOUT_DEBUG
-            qDebug() << "solution->size() = " << solution->size();
-
-            if( solution->size() > 0 ) {
-                QHashIterator<Variable*, qreal>  i(*solution);
-                while (i.hasNext()) {
-                    i.next();
-                    qDebug() << ( ( Variable* )( i.key() ) )->mId << ": " << i.value();
-                }
-            }
-#endif //HBMESHLAYOUT_DEBUG
-        }
-
-        {
-            QList<Expression*> *el = &mEquationsVertical;
-            VariableSet *vs = &mVariablesVertical;
-            Solution *solution = &mSolutionVertical;
-            solution->clear();
-
-
-
-            solution->insert( mLayoutVarV, newRect.height() );
-#ifdef HBMESHLAYOUT_DEBUG
-            qDebug() << "LayoutV Id = " << mLayoutVarV->mId;
-#endif //HBMESHLAYOUT_DEBUG
-
-            mValid = AnchorLayoutEngine::instance()->solveEquation( el, vs, solution );
-            if( !mValid ) {
-                return;
-            }
-#ifdef HBMESHLAYOUT_DEBUG
-            qDebug() << "solution->size() = " << solution->size();
-
-
-            if( solution->size() > 0 ) {
-                QHashIterator<Variable*, qreal>  i(*solution);
-                while (i.hasNext()) {
-                    i.next();
-                    qDebug() << ( ( Variable* )( i.key() ) )->mId << ": " << i.value();
-                }
-            }
-#endif //HBMESHLAYOUT_DEBUG
-        }
-
-        {
-            for( int i = 0; i < mAnchorsVisited.size(); i++ ) {
-                mAnchorsVisited[i] = false;
-            }
-
-            for( int i = 0; i < mGeometryDefinedH.size(); i++ ) {
-                mGeometryDefinedH[i] = false;
-                mGeometryDefinedV[i] = false;
-            }
-
-            int layoutIndex = mActualItems.size();
-
-            mItemsGeometry[ layoutIndex ].x1 = 0;//newRect.left();
-            mItemsGeometry[ layoutIndex ].x2 = newRect.width();//newRect.right();
-            mItemsGeometry[ layoutIndex ].y1 = 0;//newRect.top();
-            mItemsGeometry[ layoutIndex ].y2 = newRect.height();//newRect.bottom();
-            mGeometryDefinedH[ layoutIndex ] = true;
-            mGeometryDefinedV[ layoutIndex ] = true;
-
-
-            for( int i = 0; i < mAnchorsVisited.size(); i++ ) {
-
-                HbAnchor *anchor = mAnchors.at(i);
-
-
-                if( ( anchor->mStartItem != q ) && ( anchor->mEndItem != q ) ) {
-                    continue;
-                }
-
-                int startIndex = mActualItems.indexOf( anchor->mStartItem ); // returns -1 if not found => this is layout
-                int endIndex = mActualItems.indexOf( anchor->mEndItem );
-
-                mAnchorsVisited[i] = true; // Temporary overkill, if both anchors connected to layout. Must be restricted on setAnchor() level
-
-                if( edgeType( anchor->mStartEdge ) == Horizontal ) {
-                    if( startIndex > -1 ) {
-                        if( ! mGeometryDefinedH.at( startIndex ) ) {
-                            defineNextGeometry( startIndex, layoutIndex, i, layoutIndex );
-                        }
-                    } else if( endIndex > -1 ) {
-                        if( ! mGeometryDefinedH.at( endIndex ) ) {
-                            defineNextGeometry( layoutIndex, endIndex, i, layoutIndex );
-                        }
-                    }
-                } else {
-                    if( startIndex > -1 ) {
-                        if( ! mGeometryDefinedV.at( startIndex ) ) {
-                            defineNextGeometry( startIndex, layoutIndex, i, layoutIndex );
-                        }
-                    } else if( endIndex > -1 ) {
-                        if( ! mGeometryDefinedV.at( endIndex ) ) {
-                            defineNextGeometry( layoutIndex, endIndex, i, layoutIndex );
-                        }
-                    }
-                }
-            }
-
-
-
-            bool somethingHappens = true;
-            bool startDefined, endDefined;
-            int startIndex, endIndex;
-            while( somethingHappens ) {
-                somethingHappens = false;
-                for( int i = 0; i < mAnchorsVisited.size(); i++ ) {
-
-                    if( mAnchorsVisited.at(i) ) {
-                        continue;
-                    }
-                    HbAnchor *anchor = mAnchors.at(i);
-
-                    startIndex = mActualItems.indexOf( anchor->mStartItem );
-                    endIndex = mActualItems.indexOf( anchor->mEndItem );
-#ifdef HBMESHLAYOUT_DEBUG
-                    qDebug() << "startIndex:" << startIndex << "  endIndex" << endIndex;
-#endif //HBMESHLAYOUT_DEBUG
-                    if( edgeType( anchor->mStartEdge ) == Horizontal ) {
-                        startDefined = mGeometryDefinedH.at( startIndex );
-                        endDefined = mGeometryDefinedH.at( endIndex );
-                    } else {
-                        startDefined = mGeometryDefinedV.at( startIndex );
-                        endDefined = mGeometryDefinedV.at( endIndex );
-                    }
-
-                    if( startDefined && ( !endDefined ) ) {
-                        defineNextGeometry( startIndex, endIndex, i, startIndex );
-                        somethingHappens = true;
-                    } else if( ( !startDefined ) && endDefined ) {
-                        defineNextGeometry( startIndex, endIndex, i, endIndex );
-                        somethingHappens = true;
-                    }
-                }
-            }
-
-#ifdef HBMESHLAYOUT_DEBUG
-            QGraphicsWidget* w = HbLayoutUtils::parentWidget( q );
-            if ( w ) {
-                qDebug() << "Items of " << w->metaObject()->className();
-            }
-#endif
-
-
-            Qt::LayoutDirection layoutDir = HbLayoutUtils::visualDirection(q);
-            for( int i = 0; i < mActualItems.size(); i++ ) {
-                QRectF geom;
-                ItemGeometry calcGeom = mItemsGeometry.at(i);
-                if( mGeometryDefinedH.at(i) ) {
-                    geom.setLeft( mUsedRect.left() + calcGeom.x1 );
-                    geom.setRight( mUsedRect.left() + calcGeom.x2 );
-                } else {
-                    geom.setLeft( mUsedRect.left() );
-                    geom.setRight( mUsedRect.left() + mActualItems.at(i)->preferredWidth() );
-                }
-                if( mGeometryDefinedV.at(i) ) {
-                    geom.setTop( mUsedRect.top() + calcGeom.y1 );
-                    geom.setBottom( mUsedRect.top() + calcGeom.y2 );
-                } else {
-                    geom.setTop( mUsedRect.top() );
-                    geom.setBottom( mUsedRect.top() + mActualItems.at(i)->preferredHeight() );
-                }
-
-                HbLayoutUtils::visualRect( layoutDir, geom, newRect );
-
-#ifdef HBMESHLAYOUT_DEBUG
-                qDebug( "Item %d: (%lf, %lf) : (%lf %lf)", i, calcGeom.x1, calcGeom.y1, calcGeom.x2, calcGeom.y2 );
-        //        qDebug() << "Item " <<  i << "(" << ((QGraphicsWidget*)mActualItems.at(i))->metaObject()->className() << ")" << " geom " << geom;
-#endif // HBMESHLAYOUT_DEBUG
-                mActualItems.at(i)->setGeometry( geom );
-            }
-        }
-    }
-}
-
-/*!
-    \internal
-*/
-void HbMeshLayoutPrivate::createEquations( EdgeType type )
-{
-    Q_Q(HbMeshLayout);
-
-    {
-
-        VariableSet *vs =  &mVariablesHorizontal;
-        QList<Expression*> *el = &mEquationsHorizontal;
-
-        QList<GraphEdge*> *edges = &mEdgesHorizontal;
-        QList<GraphVertex*> *vertices = &mVerticesHorizontal;
-
-        Variable *layoutVar;
-
-        if( type == Vertical ) {
-            edges = &mEdgesVertical;
-            vertices = &mVerticesVertical;
-            vs =  &mVariablesVertical;
-            el = &mEquationsVertical;
-        }
-
-        qDeleteAll( *el );
-
-        vs->clear();
-        el->clear();
-
-
-        GraphVertex *layoutStart = new GraphVertex();
-        GraphVertex *layoutMiddle = new GraphVertex();
-        GraphVertex *layoutEnd = new GraphVertex();
-
-        GraphVertex *itemStart;
-        GraphVertex *itemEnd;
-
-        GraphEdge *newEdge;
-
-        SimpleExpression se;
-
-        vertices->append( layoutStart );
-        vertices->append( layoutMiddle );
-        vertices->append( layoutEnd );
-
-        layoutStart->itemRef = ( void* )q;
-        layoutMiddle->itemRef = ( void* )q;
-        layoutEnd->itemRef = ( void* )q;
-
-        layoutStart->special = true;
-        layoutMiddle->special = true;
-        layoutEnd->special = true;
-
-        if( type == Vertical ) {
-            layoutStart->itemSide =  Hb::TopEdge;
-            layoutMiddle->itemSide =  Hb::CenterVEdge;
-            layoutEnd->itemSide =  Hb::BottomEdge;
-        } else {
-            layoutStart->itemSide =  Hb::LeftEdge;
-            layoutMiddle->itemSide =  Hb::CenterHEdge;
-            layoutEnd->itemSide =  Hb::RightEdge;
-        }
-
-
-        for ( int i = 0; i < mActualItems.count(); i++ ) {
-            QGraphicsLayoutItem *item = mActualItems.at( i );
-            itemStart = new GraphVertex();
-            itemEnd = new GraphVertex();
-            newEdge = new GraphEdge();
-
-            se.mVar = vs->createVariable(item);
-            se.mCoef = 1;
-
-            newEdge->expr->plusSimpleExpression( se );
-
-            edges->append( newEdge );
-            vertices->append( itemStart );
-            vertices->append( itemEnd );
-
-            newEdge->startVertex = itemStart;
-            newEdge->endVertex = itemEnd;
-            newEdge->ref = ( void* )item;
-
-            setSizeProp( &(se.mVar->sizeProp), item, type );
-
-            itemStart->itemRef = ( void* )item;
-            itemEnd->itemRef = ( void* )item;
-
-            itemStart->edges.append( newEdge );
-            itemEnd->edges.append( newEdge );
-
-            itemStart->special = false;
-            itemEnd->special = false;
-
-            if( type == Vertical ) {
-                itemStart->itemSide =  Hb::TopEdge;
-                itemEnd->itemSide =  Hb::BottomEdge;
-            } else {
-                itemStart->itemSide =  Hb::LeftEdge;
-                itemEnd->itemSide =  Hb::RightEdge;
-            }
-        }
-
-
-        // pseudo variable
-        Variable *v1 = vs->createVariable(0);
-        v1->sizeProp.pref = 1;
-        v1->sizeProp.flags = SizeProperty::FlagFixed;
-
-
-        for( int i = 0; i < mAnchors.count(); i++) {
-            HbAnchor* anchor = mAnchors.at(i);
-            if ( edgeType( anchor->mStartEdge ) == type ) {
-                itemStart = 0;
-                itemEnd = 0;
-                for( int j = 0; j < vertices->size(); j++ ) {
-                    if( ( vertices->at(j)->itemRef == anchor->mStartItem ) && 
-                        ( vertices->at(j)->itemSide == anchor->mStartEdge ) ) {
-                        itemStart = vertices->at(j);
-                    } else if( ( vertices->at(j)->itemRef == anchor->mEndItem ) && 
-                        ( vertices->at(j)->itemSide == anchor->mEndEdge ) ) {
-                        itemEnd = vertices->at(j);
-                    }
-                }
-
-                if( !itemStart ) {
-                    itemStart = createCenterEdge( type, anchor->mStartItem,  anchor->mStartEdge );
-                }
-                if( !itemEnd ) {
-                    itemEnd = createCenterEdge( type, anchor->mEndItem,  anchor->mEndEdge );
-                }
-
-                newEdge = new GraphEdge();
-                itemStart->edges.append( newEdge );
-                itemEnd->edges.append( newEdge );
-
-                newEdge->startVertex = itemStart;
-                newEdge->endVertex = itemEnd;
-                se.mVar = v1;
-                se.mCoef = anchor->mValue;
-                newEdge->expr->plusSimpleExpression( se );
-                edges->append( newEdge );
-            }
-        }
-
-        if( layoutStart->edges.isEmpty() ) {
-            vertices->removeOne( layoutStart );
-            delete layoutStart;
-            layoutStart = 0;
-        }
-        if( layoutMiddle->edges.isEmpty() ) {
-            vertices->removeOne( layoutMiddle );
-            delete layoutMiddle;
-            layoutMiddle = 0;
-        }
-        if( layoutEnd->edges.isEmpty() ) {
-            vertices->removeOne( layoutEnd );
-            delete layoutEnd;
-            layoutEnd = 0;
-        }
-
-#ifdef HBMESHLAYOUT_DEBUG
-        qDebug() << "Before";
-        qDebug() << "Vertices:";
-        for( int i = 0; i < vertices->size(); i++ ) {
-            qDebug() << i << ":  " << vertices->at(i) << "  itemRef: " << vertices->at(i)->itemRef << "  special: " << vertices->at(i)->special;
-            for( int j = 0; j < vertices->at(i)->edges.size(); j++ ) {
-                qDebug() << "     " << j << "-  start: " << vertices->at(i)->edges.at(j)->startVertex <<
-                        " end: " << vertices->at(i)->edges.at(j)->endVertex << " expr: " << vertices->at(i)->edges.at(j)->expr->print();
-            }
-        }
-
-
-        qDebug() << "";
-        qDebug() << "Edges:";
-        for( int j = 0; j < edges->size(); j++ ) {
-            qDebug() << "     " << j << "-  start: " << edges->at(j)->startVertex <<
-                    " end: " << edges->at(j)->endVertex << " expr: " << edges->at(j)->expr->print();
-
-        }
-#endif // HBMESHLAYOUT_DEBUG
-
-        if( ! AnchorLayoutEngine::instance()->processItems( edges, vertices, vs, el ) ) {
-            mWrongAnchors = true;
-            AnchorLayoutEngine::instance()->cleanUp( 
-                layoutStart, layoutMiddle, layoutEnd, edges, vertices, el );
-#ifdef HBMESHLAYOUT_DEBUG
-            qDebug() << "FAIL! " << __LINE__;
-#endif //HBMESHLAYOUT_DEBUG
-            return;
-        }
-
-#ifdef HBMESHLAYOUT_DEBUG
-
-        qDebug() << "After";
-        qDebug() << "Vertices:";
-        for( int i = 0; i < vertices->size(); i++ ) {
-            qDebug() << i << ":  " << vertices->at(i) << "  itemRef: " << vertices->at(i)->itemRef << "  special: " << vertices->at(i)->special;
-            for( int j = 0; j < vertices->at(i)->edges.size(); j++ ) {
-                qDebug() << "     " << j << "-  start: " << vertices->at(i)->edges.at(j)->startVertex <<
-                        " end: " << vertices->at(i)->edges.at(j)->endVertex << " var: " << vertices->at(i)->edges.at(j)->expr->print();
-            }
-        }
-
-
-        qDebug() << "";
-        qDebug() << "Edges:";
-        for( int j = 0; j < edges->size(); j++ ) {
-            qDebug() << "     " << j << "-  start: " << edges->at(j)->startVertex <<
-                    " end: " << edges->at(j)->endVertex << " var: " << edges->at(j)->expr->print();
-        }
-#endif //HBMESHLAYOUT_DEBUG
-
-        layoutVar = vs->createVariable( q );
-        layoutVar->sizeProp.min = 0;
-        layoutVar->sizeProp.max = 1000;
-        layoutVar->sizeProp.pref = 100;
-        layoutVar->sizeProp.flags = 0;
-
-        AnchorLayoutEngine::instance()->attachToLayout( 
-            layoutStart, layoutMiddle, layoutEnd, layoutVar, el );
-        AnchorLayoutEngine::instance()->cleanUp( 
-            layoutStart, layoutMiddle, layoutEnd, edges, vertices, el );
-
-
-        mAnchorsVisited.resize( mAnchors.size() * sizeof( bool ) );
-        mGeometryDefinedH.resize( ( mActualItems.size() + 1  ) * sizeof( bool ) );
-        mGeometryDefinedV.resize( ( mActualItems.size() + 1 ) * sizeof( bool ) );
-        mItemsGeometry.resize( ( mActualItems.size() + 1 ) * sizeof( ItemGeometry ) );
-
-        if( type == Vertical ) {
-            mLayoutVarV = layoutVar;
-        } else {
-            mLayoutVarH = layoutVar;
-        }
-    }
-}
-
-/*
-    Creates inverse mapping, i.e. from id -> layout item.
-*/
-static HbMeshItemMapInverse createInverse(
-    const HbMeshItemMap &map)
-{
-    HbMeshItemMapInverse result;
-
-    HbMeshItemMapConstIterator end = map.constEnd();
-    for (HbMeshItemMapConstIterator it = map.constBegin(); it != end; ++it) {
-        result.insert(it.value(), it.key());
-    }
-
-    return result;
-}
-
-/*
-    Checks if anchor has spacing value defined. It will be returned in \a spacing
-    if it's not NULL.
-*/
-bool HbMeshLayoutPrivate::hasAnchorSpacing(
-    const HbMeshAnchor &anchor,
-    qreal *spacing) const
-{
-    if (spacing) {
-
-        HbMeshKey key;
-        key.mId = anchor.mStartId;
-        key.mEdge = anchor.mStartEdge;
-
-        QMap<HbMeshKey, qreal>::const_iterator spacingIt =
-            mMeshSpacings.constFind(key);
-
-        bool hasSpacing = true;
-        if (spacingIt != mMeshSpacings.constEnd()) {
-            *spacing = spacingIt.value();
-        } else if (anchor.mHasSpacing) {
-            *spacing = anchor.mSpacing;
-        } else {
-            hasSpacing = false;
-        }
-        return hasSpacing;
-
-    } else {
-        if (anchor.mHasSpacing) {
-            return true;
-        }
-
-        HbMeshKey key;
-        key.mId = anchor.mStartId;
-        key.mEdge = anchor.mStartEdge;
-        return mMeshSpacings.contains(key);
-    }
-}
-
-/*
-    Finds new end item for problematic anchor.
-
-    Follows the anchor that have the same start edge
-    as the problematic anchor.
-
-    Invariant:
-        \a ids must be the exactly same in return. It is the array
-        which nodes have already been visited - so in order to avoid
-        infinite recursion, don't visit already visited.
-*/
-bool HbMeshLayoutPrivate::findEndItem(
-    HbMeshEndItemResult &result,
-    const HbMeshAnchor &problem,
-    const HbMeshItemMapInverse &inverse,
-    QStringList &ids) const
-{
-
-    for (QList<HbMeshAnchor>::const_iterator it = mMeshAnchors.constBegin();
-         it != mMeshAnchors.constEnd();
-         ++it) {
-
-        const HbMeshAnchor &currentItem = *it;
-
-        if (currentItem.mStartId == problem.mEndId &&
-            currentItem.mStartEdge == problem.mStartEdge &&
-            !ids.contains(currentItem.mStartId)) {
-
-            qreal currentSpacing(0.0);
-
-            if (hasAnchorSpacing(currentItem, &currentSpacing)) {
-                QGraphicsLayoutItem *item = inverse.value(currentItem.mEndId);
-                bool found = false;
-
-                if (item) {
-                    found = true;
-                    result.mEdge = currentItem.mEndEdge;
-                    result.mItem = item;
-                    result.mSpacing = currentSpacing;
-                } else {
-                    ids.append(currentItem.mStartId);
-                    found = findEndItem(result, currentItem, inverse, ids);
-                    ids.takeLast();
-                }
-                if (found) {
-                    // We have found an end item. There can be multiple end items,
-                    // but (for now) the first one is selected.
-                    return true;
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-/*
-    Resolves anchors to be used in anchor layout calculations.
-
-    For each anchor x with start id, start edge, end id, end edge:
-
-    If anchor x does not have spacing defined, anchor is ignored.
-    Note that you can define spacing either in anchor or spacing overrides.
-
-    If there is layout items corresponding to both start id and end id,
-    anchor is used automatically.
-    If there is layout item corresponding to start id, then we try to
-    "fix" anchor by looking for a path of anchors (same direction, with spacing defined)
-    from anchor x's end id as starting point to such end id that has layout item.
-    If found, anchor is fixed by replacing end id with found end id.
-
-    So direction of anchors affect this resolution process, but not in the
-    anchor layout calculations.
-
-    \sa findEndItem
-*/
-void HbMeshLayoutPrivate::resolveAnchors( QList<HbAnchor*> *anchors )
-{
-    HbMeshItemMapInverse map = createInverse(mMeshMap);
-
-    int count = 0;
-    HbAnchor *item;
-
-    bool isAnchorNew = false;
-
-    for (QList<HbMeshAnchor>::const_iterator it = mMeshAnchors.constBegin();
-         it != mMeshAnchors.constEnd();
-         ++it) {
-
-        const HbMeshAnchor &anchor = *it;
-
-        QGraphicsLayoutItem *startItem = map.value(anchor.mStartId);
-
-        if (startItem) {
-            qreal value;
-
-            if (hasAnchorSpacing(anchor, &value)) {
-                // anchor really exists
-
-                if( count > anchors->size() - 1 ) {
-                    isAnchorNew = true;
-                }
-
-                if( isAnchorNew ) {
-                    item = new HbAnchor(
-                        startItem, anchor.mStartEdge, 0 /*end item*/, anchor.mEndEdge, value);
-                } else {
-                    item = anchors->at( count );
-                    item->mStartItem = startItem;
-                    item->mStartEdge = anchor.mStartEdge;
-                    item->mEndItem = 0;
-                    item->mEndEdge = anchor.mEndEdge;
-                    item->mValue = value;
-                }
-
-                QGraphicsLayoutItem *endItem = map.value(anchor.mEndId);
-                if (endItem) {
-                    // this is already valid anchor
-
-                    item->mEndItem = endItem;
-                    if( isAnchorNew ) {
-                        anchors->append(item);
-                    }
-                    count++;
-                } else {
-                    // try to "fix" anchor
-
-                    HbMeshEndItemResult result;
-                    result.mItem = 0;
-                    result.mEdge = Hb::LeftEdge;
-                    result.mSpacing = 0;
-
-                    QStringList ids;
-                    ids.append(anchor.mStartId);
-
-                    if (findEndItem(result, anchor, map, ids)) {
-                        item->mEndEdge = result.mEdge;
-                        item->mEndItem = result.mItem;
-                        item->mValue = result.mSpacing;
-                        if( isAnchorNew ) {
-                            anchors->append(item);
-                        }
-                        count++;
-                    }
-                }
-            }
-
-        } else {
-            // Nothing needed.
-        }
-    }
-
-    while( count < anchors->size() ) {
-        delete anchors->last();
-        anchors->removeLast();
-    }
-}
-
-bool HbMeshLayoutPrivate::setAnchor(const HbMeshAnchor& anchor)
-{
-    // This method is called from HbMeshLayout::setAnchor.
-
-    if (HbMeshLayoutPrivate::edgeType(anchor.mStartEdge) !=
-        HbMeshLayoutPrivate::edgeType(anchor.mEndEdge)) {
-        qWarning() << "HbMeshLayout::setAnchor : You can't connect different type of edges";
-        return false;
-    }
-
-    if (anchor.mStartId.isNull() ||
-        anchor.mEndId.isNull()) {
-        qWarning() << "HbMeshLayout::setAnchor : Both ids must be valid";
-        return false;
-    }
-
-    if ((anchor.mStartId == anchor.mEndId) &&
-        (anchor.mStartEdge == anchor.mEndEdge)) {
-        qWarning() << "HbMeshLayout::setAnchor : You cannot set anchor between the same edge";
-        return false;
-    }
-
-    bool modified = false;
-
-    const int count = mMeshAnchors.size();
-    for (int i = 0; i < count; ++i) {
-        HbMeshAnchor& item = mMeshAnchors[i];
-        if (item.mStartId == anchor.mStartId &&
-            item.mStartEdge == anchor.mStartEdge) {
-#ifdef HBMESHLAYOUT_DEBUG
-                if (item.mEndId != anchor.mEndId ||
-                    item.mEndEdge != anchor.mEndEdge) {
-                        qDebug() << "MeshLayout: Replacing existing anchor!"
-                            << "Check your layout definition whether this is really intentional."
-                            << "There can be only one anchor starting from one edge.";
-                }
-#endif
-            modified = true;
-
-            // Only one anchor starting from single (startId, startEdge).
-            item = anchor;
-            break;
-        }
-    }
-
-    if (!modified) {
-        mMeshAnchors.append(anchor);
-    }
-
-    return true;
-}
-
-int HbMeshLayoutPrivate::actualItemsIndexOf(QGraphicsLayoutItem *item) const
-{
-    for (int i=0; i < mActualItems.count(); i++) {
-        if (mActualItems.at(i) == item) {
-            return i;
-        }
-    }
-    return -1;
-}
-
-/*!
-    Constructor.
-*/
-HbMeshLayout::HbMeshLayout(QGraphicsLayoutItem *parent)
-: QGraphicsLayout( parent), d_ptr( new HbMeshLayoutPrivate )
-{
-    Q_D( HbMeshLayout );
-    d->q_ptr = this;
-}
-
-/*!
-    Destructor.
-*/
-HbMeshLayout::~HbMeshLayout()
-{
-    if (d_ptr) {
-        for (int i = count() - 1; i >= 0; --i) {
-            QGraphicsLayoutItem *item = itemAt(i);
-            // The following lines can be removed, but this removes the item
-            // from the layout more efficiently than the implementation of
-            // ~QGraphicsLayoutItem.
-            removeAt(i);
-            if (item) {
-                item->setParentLayoutItem(0);
-                if (item->ownedByLayout()) {
-                    delete item;
-                }
-            }
-        }
-    }
-
-    delete d_ptr;
-}
-
-/*!
-    Sets anchor between (startId, startEdge) to (endId, endEdge). Optionally, you can provide
-    spacing in \a defaultSpacing parameter. Note that you cannot have more than one anchor from
-    (id, edge) pair. So, \c startId shouldn't represent this layout item.
-
-    Note that previously define spacing override is still used as defined for
-    (\a startId, \a startEdge).
-
-    \param startId start id.
-    \param startEdge start edge.
-    \param endId end id.
-    \param endEdge end edge.
-    \param spacing spacing value for all edges starting from (\a startId, \a startEdge).
-    \return true if success, false otherwise.
-*/
-bool HbMeshLayout::setAnchor(
-    const QString& startId, Edge startEdge, const QString& endId, Edge endEdge, qreal spacing)
-{
-    Q_D( HbMeshLayout );
-
-    HbMeshAnchor anchor;
-    anchor.mStartId = startId;
-    anchor.mStartEdge = startEdge;
-    anchor.mEndId = endId;
-    anchor.mEndEdge = endEdge;
-    anchor.mHasSpacing = true;
-    anchor.mSpacing = spacing;
-
-    if (d->setAnchor(anchor)) {
-        invalidate();
-        return true;
-    }
-    return false;
-}
-
-bool HbMeshLayout::setAnchor(
-    const QString& startId, Edge startEdge, const QString& endId, Edge endEdge)
-{
-    Q_D( HbMeshLayout );
-
-    HbMeshAnchor anchor;
-    anchor.mStartId = startId;
-    anchor.mStartEdge = startEdge;
-    anchor.mEndId = endId;
-    anchor.mEndEdge = endEdge;
-    anchor.mHasSpacing = false;
-    anchor.mSpacing = 0;
-
-    if (d->setAnchor(anchor)) {
-        invalidate();
-        return true;
-    }
-    return false;
-}
-
-/*!
-    Removes anchor starting from (\a startId, \a startEdge). As you cannot have more
-    than one anchor starting from a (id, edge) pair, provided (\a startId, \a startEdge)
-    pair uniquely defines anchor to be removed.
-
-    Note that this does not affect on spacing override.
-
-    \param startId id.
-    \param startEdge edge.
-    \param spacing spacing value for all edges starting from (\a startId, \a startEdge).
-    \return true if success, false otherwise.
-*/
-bool HbMeshLayout::removeAnchor(const QString& startId, Edge startEdge)
-{
-    Q_D( HbMeshLayout );
-    bool modified = false;
-
-    for (int i = d->mMeshAnchors.size() - 1; i >= 0; --i) {
-        const HbMeshAnchor& anchor = d->mMeshAnchors[i];
-        if (anchor.mStartId == startId && anchor.mStartEdge == startEdge) {
-            d->mMeshAnchors.removeAt(i);
-            modified = true;
-            break;
-        }
-    }
-
-    if (modified) {
-        invalidate();
-        return true;
-    }
-    return false;
-}
-
-/*!
-    Removes all anchors starting or ending to \a id.
-    Note that this does not affect on spacing override.
-
-    \param id id to be removed.
-    \return true if success, false otherwise.
-*/
-bool HbMeshLayout::removeAnchors(const QString& id)
-{
-    Q_D( HbMeshLayout );
-    bool modified = false;
-
-    for (int i = d->mMeshAnchors.size() - 1; i >= 0; --i) {
-        const HbMeshAnchor& anchor = d->mMeshAnchors[i];
-        if (anchor.mStartId == id || anchor.mEndId == id) {
-            d->mMeshAnchors.removeAt(i);
-            modified = true;
-        }
-    }
-
-    if (modified) {
-        invalidate();
-        return true;
-    }
-    return false;
-}
-
-/*!
-    Clears all anchors.
-    Note that this does not affect on spacing override.
-*/
-void HbMeshLayout::clearAnchors()
-{
-    Q_D( HbMeshLayout );
-    if (d->mMeshAnchors.size()) {
-        d->mMeshAnchors.clear();
-        invalidate();
-    }
-}
-
-/*!
-    Overrides spacing for anchor starting from (\a startId, \a startEdge).
-    \param startId id.
-    \param startEdge edge.
-    \param spacing spacing value for anchor starting from (\a startId, \a startEdge).
-*/
-void HbMeshLayout::overrideSpacing(const QString& startId, Edge startEdge, qreal spacing)
-{
-    Q_D( HbMeshLayout );
-
-    HbMeshKey key;
-    key.mId = startId;
-    key.mEdge = startEdge;
-
-    d->mMeshSpacings.insert(key, spacing); // will replace spacing if key already exists
-
-    invalidate();
-}
-
-/*!
-    Resets spacing override for anchor starting from (\a startId, \a startEdge).
-    \param startId id.
-    \param startEdge edge.
-*/
-void HbMeshLayout::resetSpacingOverride(const QString& startId, Edge startEdge)
-{
-    Q_D( HbMeshLayout );
-    HbMeshKey key;
-    key.mId = startId;
-    key.mEdge = startEdge;
-
-    if(d->mMeshSpacings.remove(key)) {
-        invalidate();
-    }
-}
-
-/*!
-    Clears all spacing overrides.
-*/
-void HbMeshLayout::clearSpacingOverrides()
-{
-    Q_D( HbMeshLayout );
-    if (d->mMeshSpacings.size()) {
-        d->mMeshSpacings.clear();
-        invalidate();
-    }
-}
-
-/*!
-    Sets identifier for \a item. You can reset this mapping by
-    passing \c UndefineId as \a id.
-    \param item layout item.
-    \param id new id corresponding to \a item.
-*/
-void HbMeshLayout::setItemId(QGraphicsLayoutItem *item, const QString& id)
-{
-    Q_D( HbMeshLayout );
-
-    bool modified = false;
-
-    if (!id.isNull()) {
-
-        // Remove previous item -> id.
-        HbMeshItemMapIterator it = d->mMeshMap.begin();
-        while (it != d->mMeshMap.end()) {
-            if (it.value() == id) {
-                it = d->mMeshMap.erase(it);
-            } else {
-                ++it;
-            }
-        }
-        d->addItemIfNeeded(item);
-        d->mMeshMap.insert(item, id);
-        modified = true;
-    } else {
-        modified = (d->mMeshMap.remove(item) != 0);
-    }
-
-    if (modified) {
-        invalidate();
-    }
-}
-
-/*!
-    Clears all item id mappings.
-*/
-void HbMeshLayout::clearItemIds()
-{
-    Q_D( HbMeshLayout );
-    d->mMeshMap.clear();
-}
-
-/*!
-    Adds \a item.
-
-    \param item item to be added.
-    \param id id of this item.
-*/
-void HbMeshLayoutPrivate::addItemIfNeeded(QGraphicsLayoutItem *item)
-{
-    Q_Q(HbMeshLayout);
-
-    if (!item) {
-        //qWarning() << "HbMeshLayout::addItemIfNeeded : item is NULL";
-        return;
-    }
-
-    if (item == q) {
-        //qWarning() << "HbMeshLayout::addItemIfNeeded : layout cannot be added";
-        return;
-    }
-
-    if (mItems.contains(item)) {
-        //qWarning() << "HbMeshLayout::addItemIfNeeded : item is already in layout";
-        return;
-    }
-
-    HbLayoutUtils::addChildItem(q, item);
-    mItems.append(item);
-}
-
-/*!
-    Removes given \a item.
-    This is a convenience function. It's equivalent to calling removeAt(indexOf(item)).
-
-    \param item item to be removed.
-*/
-void HbMeshLayout::removeItem(QGraphicsLayoutItem *item)
-{
-    removeAt(indexOf(item));
-}
-
-/*!
-    Returns the index of given layout \a item, or -1 if not found.
-    \param item item to look for.
-    \return index of item or -1 if not found.
-*/
-int HbMeshLayout::indexOf(const QGraphicsLayoutItem* item) const
-{
-    Q_D( const HbMeshLayout );
-    for (int i=0; i < d->mItems.count(); i++) {
-        if (d->mItems.at(i) == item) {
-            return i;
-        }
-    }
-    return -1;
-}
-
-/*!
-    Returns true if anchor layout could be "solved" in the
-    last setGeometry call. That is, the anchors of the layout do
-    not create any contradictions in the geometry calculation.
-    \return true if valid layout, false otherwise.
-*/
-bool HbMeshLayout::isValid() const
-{
-    Q_D( const HbMeshLayout );
-    return ( d->mValid && ( ! d->mWrongAnchors ) );
-}
-
-
-QString HbMeshLayout::nodeId( QGraphicsLayoutItem *item ) const
-{
-    Q_D( const HbMeshLayout );
-    if( d->mMeshMap.contains( item ) ) {
-        return d->mMeshMap.value( item );
-    }
-    return QString();
-}
-
-QStringList HbMeshLayout::nodeIds() const
-{
-    Q_D( const HbMeshLayout );
-    QStringList list;
-    int c = d->mMeshAnchors.count();
-    while (c--) {
-        QString id = d->mMeshAnchors.at(c).mStartId;
-        if (!list.contains(id)) {
-            list.append(id);
-        }
-        id = d->mMeshAnchors.at(c).mEndId;
-        if (!list.contains(id)) {
-            list.append(id);
-        }
-    }
-    return list;
-}
-
-QGraphicsLayoutItem *HbMeshLayout::itemById( const QString& id ) const
-{
-    Q_D( const HbMeshLayout );
-    return d->mMeshMap.key( id );
-}
-
-qreal HbMeshLayout::spacing( const QString& startId, Edge startEdge ) const
-{
-    Q_D( const HbMeshLayout );
-    HbMeshKey key;
-    key.mId = startId;
-    key.mEdge = startEdge;
-
-    return d->mMeshSpacings.value( key );
-}
-
-
-
-/*!
-    \reimp
-*/
-void HbMeshLayout::removeAt(int index)
-{
-    Q_D( HbMeshLayout );
-    if ( index < 0 || index > d->mItems.count()-1 ) {
-        return;
-    }
-    QGraphicsLayoutItem *item = itemAt( index );
-    if ( item ) {
-        setItemId(item, QString());
-
-        item->setParentLayoutItem( 0 );
-        d->mItems.removeAt(index);
-    }
-
-    invalidate();
-}
-
-/*!
-    \reimp
-*/
-void HbMeshLayout::setGeometry(const QRectF &rect)
-{
-    Q_D( HbMeshLayout );
-    QGraphicsLayout::setGeometry(rect);
-    d->setItemGeometries();
-}
-
-/*!
-    \reimp
-*/
-int HbMeshLayout::count() const
-{
-    Q_D( const HbMeshLayout );
-    return d->mItems.count();
-}
-
-/*!
-    \reimp
-*/
-QGraphicsLayoutItem *HbMeshLayout::itemAt(int index) const
-{
-    Q_D( const HbMeshLayout );
-    return d->mItems.value(index);
-}
-
-/*!
-    \reimp
-*/
-void HbMeshLayout::invalidate()
-{
-    Q_D( HbMeshLayout );
-    d->mInvalidateCalled = true;
-    d->mWrongAnchors = false;
-    d->mEquationsDirty = true;
-    QGraphicsLayout::invalidate();
-}
-
-/*!
-    \reimp
-*/
-void HbMeshLayout::widgetEvent(QEvent *e)
-{
-    QGraphicsLayout::widgetEvent(e);
-}
-/*!
-    \reimp
-*/
-QSizeF HbMeshLayout::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
-{
-    Q_D( const HbMeshLayout );
-    Q_UNUSED( constraint );
-
-    return const_cast<HbMeshLayoutPrivate*>(d)->sizeHint( which );
-}
-
-QSizeF HbMeshLayoutPrivate::sizeHint(Qt::SizeHint which)
-{
-    if ( mEquationsDirty ) {
-        updateAnchorsAndItems();
-        createEquations( Horizontal );
-        createEquations( Vertical );
-        mEquationsDirty = false;
-    }
-
-    if( mLayoutVarH && mLayoutVarV ) {
-
-        QSizeF res;
-
-        if( mLayoutVarH->sizeProp.flags & SizeProperty::FlagFixed ) {
-            res.setWidth( mLayoutVarH->sizeProp.pref );
-        } else {
-            if (which == Qt::MinimumSize) {
-                res.setWidth( mLayoutVarH->sizeProp.min );
-            } else if (which == Qt::PreferredSize ) {
-                res.setWidth( mLayoutVarH->sizeProp.pref );
-            } else {
-                res.setWidth( mLayoutVarH->sizeProp.max );
-            }
-        }
-
-        if( mLayoutVarV->sizeProp.flags & SizeProperty::FlagFixed ) {
-            res.setHeight( mLayoutVarV->sizeProp.pref );
-        } else {
-            if (which == Qt::MinimumSize) {
-                res.setHeight( mLayoutVarV->sizeProp.min );
-            } else if (which == Qt::PreferredSize ) {
-                res.setHeight( mLayoutVarV->sizeProp.pref );
-            } else {
-                res.setHeight( mLayoutVarV->sizeProp.max );
-            }
-        }
-
-        return res;
-    } else {
-        if (which == Qt::MinimumSize) {
-            return QSizeF( 0, 0 );
-        } else if (which == Qt::PreferredSize ) {
-            return QSizeF( 100, 100 );
-        } else {
-            return QSizeF( 1000, 1000 );
-        }
-    }
-}
-
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/layouts/hbmeshlayout_p.h
--- a/src/hbcore/layouts/hbmeshlayout_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBMESHLAYOUT_H
-#define HBMESHLAYOUT_H
-
-#include <QGraphicsLayout>
-
-#include <hbglobal.h>
-#include <hbnamespace.h>
-
-class HbMeshLayoutPrivate;
-class HbMeshLayoutDebug;
-
-class HB_AUTOTEST_EXPORT HbMeshLayout : public QGraphicsLayout
-{
-    friend class HbMeshLayoutDebug;
-
-public:
-    typedef Hb::Edge Edge;
-
-public:
-    explicit HbMeshLayout(QGraphicsLayoutItem *parent = 0);
-    virtual ~HbMeshLayout();
-
-    bool setAnchor(const QString& startId, Edge startEdge, const QString& endId, Edge endEdge, qreal spacing);
-    bool setAnchor(const QString& startId, Edge startEdge, const QString& endId, Edge endEdge);
-    bool removeAnchor(const QString& startId, Edge startEdge);
-    bool removeAnchors(const QString& id);
-    void clearAnchors();
-
-    void overrideSpacing(const QString& startId, Edge startEdge, qreal spacing);
-    void resetSpacingOverride(const QString& startId, Edge startEdge);
-    void clearSpacingOverrides();
-
-    void setItemId(QGraphicsLayoutItem *item, const QString& id);
-    void clearItemIds();
-
-    QString nodeId( QGraphicsLayoutItem *item ) const;
-    QStringList nodeIds() const;
-    QGraphicsLayoutItem *itemById( const QString& id ) const;
-
-    qreal spacing( const QString& startId, Edge startEdge ) const;
-
-    void removeItem(QGraphicsLayoutItem *item);
-    int indexOf(const QGraphicsLayoutItem *item) const;
-
-    bool isValid() const;
-
-    virtual void removeAt(int index);
-    virtual void setGeometry(const QRectF &rect);
-    virtual int count() const;
-    virtual QGraphicsLayoutItem *itemAt(int index) const;
-    virtual void invalidate();
-    virtual void widgetEvent(QEvent *e);
-
-protected:
-    virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
-
-protected:
-    HbMeshLayoutPrivate *const d_ptr;
-
-private:
-    Q_DISABLE_COPY(HbMeshLayout)
-    Q_DECLARE_PRIVATE_D(d_ptr, HbMeshLayout)
-};
-
-#endif // HBMESHLAYOUT_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/layouts/hbmeshlayoutdebug_p.h
--- a/src/hbcore/layouts/hbmeshlayoutdebug_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBMESHLAYOUTDEBUGPRIVATE_H
-#define HBMESHLAYOUTDEBUGPRIVATE_H
-
-#include <hbanchor_p.h>
-
-class HbMeshLayout;
-class HbAnchor;
-
-class HB_AUTOTEST_EXPORT HbMeshLayoutDebug
-{
-public:
-    static QList<HbAnchor*> getAnchors( HbMeshLayout* layout );
-};
-
-#endif
-
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/layouts/hbmeshlayoutdoc.cpp
--- a/src/hbcore/layouts/hbmeshlayoutdoc.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-/*!
-    \class HbMeshLayout
-    \brief HbMeshLayout manages geometries of its child items with anchors that
-    that connect the layout items with each other. This is different from 
-    \c HbAnchorLayout in such way that this allows layout items to be missing
-    and can fix anchor attachments.
-
-    Currently, the HbMeshLayout is an internal class which can be only utilized via the
-    WidgetML within a widget. 
-
-    The mesh layout is a bit more fragile than the anchor layout. The anchor definitions
-    need to support the missing items. Here are some simple rules how the mesh can be 
-    created (the example is only for horizontal direction - the same needs to be done 
-    for portrait as well).
-
-    First, we need to find the child item (=node), which is always present i.e. cannot be missing. 
-
-    \image html hbmeshlayout1.png
-
-    From the image above, we have decided that the green node is always present. This
-    means that all the other nodes in the horizontal graph can be optional.
-
-    \image html hbmeshlayout2.png
-
-    Then, we create the anchors starting from the non-optional node and point towards
-    the edges of the layout. The mesh layout definition in the WidgetML would look like:
-
-    \code
-
-    <meshitem src="green_item" srcEdge="LEFT" dst="blue_item" dstEdge="RIGHT" />
-    <meshitem src="blue_item" srcEdge="LEFT" dst="" dstEdge="LEFT" />
-    <meshitem src="green_item" srcEdge="RIGHT" dst="red_item" dstEdge="LEFT" />
-    <meshitem src="red_item" srcEdge="RIGHT" dst="yellow_item" dstEdge="LEFT" />
-    <meshitem src="yellow_item" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-
-    \endcode
-
-    As mentioned, the green node needs be present always. In practice, this means that the 
-    parent widget, which owns this mesh layout, needs to have a child widget with item
-    name "green_item". \c HbStyle::setItemName for more details.
-    
-    If an optional node is missing, the anchors pointing to the node are
-    changed to point to the node after (=towards the parent layout) the missing one - this 
-    is called "fixing the mesh". The fixing only works if the end result can be determined
-    i.e. two anchor starting from a missing node is prohibited.
-
-    \image html hbmeshlayout3.png
-
-    In the picture above, the blue and yellow items are missing. The mesh is fixed by removing
-    the anchor definitions starting from the missing nodes.
-
-    \proto
-    \internal 
-*/
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/layouts/hbspaceritem_p.cpp
--- a/src/hbcore/layouts/hbspaceritem_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include "hbspaceritem_p.h"
-#include <QWidget> // QWIDGETSIZE_MAX
-
-class HbSpacerItemPrivate
-{
-};
-
-/*!
-    @proto
-    @hbcore
-    \class HbSpacerItem
-
-    \brief HbSpacerItem class is used in layouts to fill the void.
-
-    The spacer itself is invisble and therefore it can be used to fill empty areas in layouts.
-
-    Modifying the size hint and the policy, the spacer and occupy different areas.
-*/
-
-
-/*!
-    Constructs a spacer. By default, the preferred size is (0,0) and the size policy is (preferred,preferred).
-*/
-HbSpacerItem::HbSpacerItem(QGraphicsLayoutItem *parent ) : QGraphicsLayoutItem( parent ), d_ptr(0)
-{
-}
-
-/*!
-    Destructor
-*/
-HbSpacerItem::~HbSpacerItem()
-{
-    delete d_ptr;
-}
-
-/*!
-    \reimp
- */
-QSizeF HbSpacerItem::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
-{
-    Q_UNUSED( constraint );
-    if ( which == Qt::MaximumSize ) {
-        return QSizeF( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
-    }
-    return QSizeF( 0,0 );
-}
-
-/*!
-    \reimp
- */
-void HbSpacerItem::updateGeometry()
-{
-    QGraphicsLayoutItem::updateGeometry();
-    QGraphicsLayoutItem *parentItem = parentLayoutItem();
-
-    if (parentItem && parentItem->isLayout()) {
-        parentItem->updateGeometry();
-    }
-}
-
-//end of file
-
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/layouts/hbspaceritem_p.h
--- a/src/hbcore/layouts/hbspaceritem_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSPACERITEM_H
-#define HBSPACERITEM_H
-
-#include <hbglobal.h>
-#include <QGraphicsLayoutItem>
-
-class HbSpacerItemPrivate;
-
-class HB_AUTOTEST_EXPORT HbSpacerItem : public QGraphicsLayoutItem
-{
-public:
-    HbSpacerItem(QGraphicsLayoutItem *parent = 0);
-    ~HbSpacerItem();
-
-    void updateGeometry();
-protected:
-    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
-private:
-    HbSpacerItemPrivate *d_ptr;
-};
-
-#endif // HBSPACERITEM_H
-
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/layouts/layouts.pri
--- a/src/hbcore/layouts/layouts.pri	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/layouts/layouts.pri	Tue Jul 06 14:36:53 2010 +0300
@@ -28,20 +28,17 @@
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 
+PUBLIC_HEADERS += $$PWD/hbanchor.h
 PUBLIC_HEADERS += $$PWD/hbanchorlayout.h
 PUBLIC_HEADERS += $$PWD/hbstackedlayout.h 
 
 PRIVATE_HEADERS += $$PWD/hbanchor_p.h
-PRIVATE_HEADERS += $$PWD/hbanchorlayoutdebug_p.h
 PRIVATE_HEADERS += $$PWD/hbanchorlayoutengine_p.h
 PRIVATE_HEADERS += $$PWD/hblayoututils_p.h
-PRIVATE_HEADERS += $$PWD/hbmeshlayout_p.h
-PRIVATE_HEADERS += $$PWD/hbspaceritem_p.h
 
+SOURCES += $$PWD/hbanchor.cpp
 SOURCES += $$PWD/hbanchorlayout.cpp
 SOURCES += $$PWD/hbanchorlayoutengine_p.cpp
 SOURCES += $$PWD/hblayoututils_p.cpp
-SOURCES += $$PWD/hbmeshlayout_p.cpp
-SOURCES += $$PWD/hbspaceritem_p.cpp
 SOURCES += $$PWD/hbstackedlayout.cpp
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/ovgeffects/hbvgchainedeffect.cpp
--- a/src/hbcore/ovgeffects/hbvgchainedeffect.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgchainedeffect.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -207,6 +207,22 @@
 }
 
 /*!
+ * \reimp
+ */
+void HbVgChainedEffect::performEffectSw(QPainter *painter)
+{
+    Q_D(HbVgChainedEffect);
+    foreach(HbVgEffect * effect, d->effects) {
+        effect->performEffectSw(painter);
+        HbVgEffectPrivate *effD = HbVgEffectPrivate::d_ptr(effect);
+        effD->paramsChanged = effD->cacheInvalidated = false;
+    }
+    if (d->effects.isEmpty()) {
+        drawSource(painter);
+    }
+}
+
+/*!
   \reimp
 */
 void HbVgChainedEffectPrivate::notifyCacheInvalidated()
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/ovgeffects/hbvgchainedeffect_p.h
--- a/src/hbcore/ovgeffects/hbvgchainedeffect_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgchainedeffect_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -58,6 +58,7 @@
     HbVgChainedEffect(HbVgChainedEffectPrivate &dd, QObject *parent = 0);
     void performEffect(QPainter *painter, const QPointF &offset,
                        const QVariant &vgImage, const QSize &vgImageSize);
+    void performEffectSw(QPainter *painter);
 
 private:
     Q_DECLARE_PRIVATE(HbVgChainedEffect)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/ovgeffects/hbvgeffect.cpp
--- a/src/hbcore/ovgeffects/hbvgeffect.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgeffect.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -103,7 +103,8 @@
       sourceGraphicsItem(0),
       mainWindow(0),
       lastUsedRotation(0),
-      lastRotationTransformAngle(0)
+      lastRotationTransformAngle(0),
+      forceSwMode(false)
 {
 }
 
@@ -360,6 +361,50 @@
 }
 
 /*!
+ * Returns the current setting for sw mode forcing. By default this is
+ * disabled (false).
+ */
+bool HbVgEffect::forceSwMode() const
+{
+    Q_D(const HbVgEffect);
+    return d->forceSwMode;
+}
+
+/*!
+ * When enabled the sw implementation is used always.
+ *
+ * Many effects have no software implementation so enabling this will
+ * lead to the same result as trying to paint the hw accelerated
+ * effects on a non-hw paint engine: Only the source is painted,
+ * without any effects.
+ */
+void HbVgEffect::setForceSwMode(bool b)
+{
+    Q_D(HbVgEffect);
+    if (d->forceSwMode == b) {
+        return;
+    }
+    d->forceSwMode = b;
+    updateEffect();
+    emit forceSwModeChanged(b);
+}
+
+/*!
+ * Called when using a non-OpenVG paint engine. The default
+ * implementation simply calls drawSource(), i.e. paints the source
+ * item without any effect.
+ *
+ * Note that the source pixmap is not requested and the painter's
+ * world transform is not reset before calling this, in contrast to
+ * performEffect(). (this means that neither d->srcPixmap nor
+ * d->worldTransform is available).
+ */
+void HbVgEffect::performEffectSw(QPainter *painter)
+{
+    drawSource(painter);
+}
+
+/*!
  * \reimp
  *
  * Implementation of QGraphicsEffect's draw(). After setting up the environment
@@ -368,16 +413,27 @@
  */
 void HbVgEffect::draw(QPainter *painter)
 {
+    Q_D(HbVgEffect);
+
+    // Invalidate the cache if the rotation of the graphics view has changed.
+    qreal rotation = d->mainWindowRotation();
+    if (rotation != d->lastUsedRotation) {
+        d->lastUsedRotation = rotation;
+        d->ensureCacheInvalidated();
+    }
+
     // Just draw the source without effects if the painter's paint engine
     // is not using OpenVG.
     QPaintEngine *paintEngine = painter->paintEngine();
-    if (!paintEngine || paintEngine->type() != QPaintEngine::OpenVG) {
-        drawSource(painter);
+    if (d->forceSwMode || !paintEngine || paintEngine->type() != QPaintEngine::OpenVG) {
+        // No sourcePixmap() and world transform change here because
+        // in most cases we will just call drawSource().
+        performEffectSw(painter);
+        d->paramsChanged = d->cacheInvalidated = false;
         return;
     }
 
 #ifdef HB_EFFECTS_OPENVG
-    Q_D(HbVgEffect);
     // Render the source into a pixmap. Note that the effect's modified bounding
     // rectangle is already taken into account in the size of the pixmap created
     // here, so there is no need to waste time with boundingRectFor() calls
@@ -399,13 +455,6 @@
     d->worldTransform = painter->worldTransform();
     painter->setWorldTransform(QTransform());
 
-    // Invalidate the cache if the rotation of the graphics view has changed.
-    qreal rotation = d->mainWindowRotation();
-    if (rotation != d->lastUsedRotation) {
-        d->lastUsedRotation = rotation;
-        d->ensureCacheInvalidated();
-    }
-
     // Enter raw VG mode.
     painter->beginNativePainting();
     // Draw something.
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/ovgeffects/hbvgeffect_p.h
--- a/src/hbcore/ovgeffects/hbvgeffect_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgeffect_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -40,6 +40,7 @@
     Q_OBJECT
     Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged)
     Q_PROPERTY(bool caching READ caching WRITE setCaching NOTIFY cachingChanged)
+    Q_PROPERTY(bool forceSwMode READ forceSwMode WRITE setForceSwMode NOTIFY forceSwModeChanged)
 
 public:
     HbVgEffect(QObject *parent = 0);
@@ -47,27 +48,31 @@
 
     void install(QGraphicsItem *item);
 
-    qreal opacity() const;
-
     virtual void performEffect(QPainter *painter,
                                const QPointF &offset,
                                const QVariant &vgImage,
                                const QSize &vgImageSize) = 0;
 
+    virtual void performEffectSw(QPainter *painter);
+
     void setChainRoot(HbVgEffect *effect);
     HbVgEffect *chainRoot() const;
 
+    qreal opacity() const;
     bool caching() const;
+    bool forceSwMode() const;
 
     static void releaseCachedResources();
 
 public slots:
     void setOpacity(qreal opacity);
     void setCaching(bool caching);
+    void setForceSwMode(bool b);
 
 signals:
     void opacityChanged(qreal opacity);
     void cachingChanged(bool caching);
+    void forceSwModeChanged(bool b);
 
 protected:
     HbVgEffect(HbVgEffectPrivate &dd, QObject *parent = 0);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/ovgeffects/hbvgeffect_p_p.h
--- a/src/hbcore/ovgeffects/hbvgeffect_p_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgeffect_p_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -134,6 +134,8 @@
     mutable qreal lastUsedRotation;
     mutable QTransform lastRotationTransform;
     mutable qreal lastRotationTransformAngle;
+
+    bool forceSwMode;
 };
 
 #endif
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/ovgeffects/hbvgmaskeffect.cpp
--- a/src/hbcore/ovgeffects/hbvgmaskeffect.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgmaskeffect.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -38,21 +38,32 @@
  * defined by a pixmap's alpha channel transparent. The opacity effect
  * parameter is ignored.
  *
+ * With certain OpenVG implementations masking with vgMask() may be
+ * problematic.  In such cases enable the pure QPainter implementation
+ * with setForceSwMode().
+ *
+ * Currently the sw version only support masks set by setMask() or
+ * provided via the callback.  Mask rectangles are not supported.
+ *
  * \internal
  */
 
 HbVgMaskEffectPrivate::HbVgMaskEffectPrivate()
-    : maskRectIsInDeviceCoords(false), maskCallback(0)
+    : maskRectIsInDeviceCoords(false),
+      maskCallback(0),
+      maskCallbackParam(0),
+      lastMainWindowRotationAngle(-1),
+      includeSourceItemOnly(false)
 {
 }
 
 HbVgMaskEffect::HbVgMaskEffect(QObject *parent)
-    : HbVgEffect(*new HbVgMaskEffectPrivate, parent)
+    : HbVgFrameEffect(*new HbVgMaskEffectPrivate, parent)
 {
 }
 
 HbVgMaskEffect::HbVgMaskEffect(HbVgMaskEffectPrivate &dd, QObject *parent)
-    : HbVgEffect(dd, parent)
+    : HbVgFrameEffect(dd, parent)
 {
 }
 
@@ -86,7 +97,8 @@
 /*!
  * Returns the scaled version of the mask that was used during the previous
  * paint. Will return a null pixmap if no painting took place since the last
- * setMask() call.
+ * setMask() call. Any other automatic transformation (e.g. rotation) of the
+ * mask is not included in the returned pixmap.
  */
 QPixmap HbVgMaskEffect::scaledMask() const
 {
@@ -99,7 +111,8 @@
  * is 0 will be set transparent. The pixmap is subject to scaling and therefore
  * distortion may occur. If this is not acceptable then use the callback
  * version. Any previously set mask pixmap or rectangle will not be effective
- * anymore.
+ * anymore. If the graphics view is rotated (due to a transformed screen
+ * orientation) then the mask will be rotated automatically too.
  */
 void HbVgMaskEffect::setMask(const QPixmap &mask)
 {
@@ -191,6 +204,10 @@
  * Similar to setMask() but the rectangle is assumed to be in device coordinates
  * (i.e. relative to the entire screen instead of the source item), meaning that
  * the source item will be clipped where it intersects with \a rect.
+ *
+ * Even when the graphics view is transformed (e.g. when being in "landscape
+ * orientation") the rectangle passed here is treated as being in device
+ * coordinates, ignoring the rotation of the graphics view.
  */
 void HbVgMaskEffect::setMaskDeviceRect(const QRectF &rect)
 {
@@ -206,6 +223,33 @@
 }
 
 /*!
+ * Returns the current setting for masking only the source graphics item. By
+ * default this is disabled.
+ */
+bool HbVgMaskEffect::includeSourceItemOnly() const
+{
+    Q_D(const HbVgMaskEffect);
+    return d->includeSourceItemOnly;
+}
+
+/*!
+ * When enabled, only the source item (excluding its children) is masked.  This
+ * is needed when shaping e.g. a pop-up or other widget that has a scroll area
+ * in it. The real size, together with all the children, is usually much bigger
+ * then the size of the widget itself (and it depends on the position in the
+ * scroll area etc.).  To solve this issue, enable this setting when shaping
+ * such widgets.
+ */
+void HbVgMaskEffect::setIncludeSourceItemOnly(bool b)
+{
+    Q_D(HbVgMaskEffect);
+    clear();
+    d->includeSourceItemOnly = b;
+    updateEffect();
+    emit includeSourceItemOnlyChanged(b);
+}
+
+/*!
  * \reimp
  */
 QRectF HbVgMaskEffect::boundingRectFor(const QRectF &rect) const
@@ -225,7 +269,35 @@
 }
 
 /*!
+ * \internal
+ */
+QRectF HbVgMaskEffectPrivate::mapRect(const QRectF &rect, const QSize &srcSize) const
+{
+    qreal rotationAngle = mainWindowRotation();
+    qreal x1 = 0;
+    qreal y1 = 0;
+
+    QPointF mp = mapOffset(QPointF(rect.x(), rect.y()));
+    QSizeF sz = mapSize(rect.size());
+
+    if (rotationAngle == -90 || rotationAngle == 270) {
+        x1 = mp.x();
+        y1 = mp.y() + srcSize.height() - sz.height();
+    } else if (rotationAngle == 90 || rotationAngle == -270) {
+        x1 = mp.x() + srcSize.width() - sz.width();
+        y1 = mp.y();
+    } else {
+        x1 = mp.x();
+        y1 = mp.y();
+    }
+
+    return QRectF(x1, y1, sz.width(), sz.height());
+}
+
+/*!
  * \reimp
+ *
+ * OpenVG-based implementation. Supports all masking options.
  */
 void HbVgMaskEffect::performEffect(QPainter *painter,
                                    const QPointF &offset,
@@ -240,6 +312,17 @@
         return;
     }
 
+    // Find out the target size and position.
+    QPaintDevice *pdev = painter->paintEngine()->paintDevice();
+    QRectF srcDevRect(d->deviceRectForSource(HbVgFrameEffectPrivate::ExcludeChildren, pdev));
+    QSize targetSize = d->includeSourceItemOnly ? srcDevRect.size().toSize() : vgImageSize;
+    int posX = (int) offset.x();
+    int posY = (int) offset.y();
+    if (d->includeSourceItemOnly) {
+        posX = (int) srcDevRect.x();
+        posY = (int) srcDevRect.y();
+    }
+
     // Initialize scaledMask if the mask has changed or the size of the source
     // is different than before.
     if (!d->mask.isNull()) {
@@ -248,13 +331,13 @@
         }
         // Scale only when really needed, i.e. when the size is different than
         // before (or there is a new mask).
-        if (d->scaledMask.size() != vgImageSize) {
-            d->scaledMask = d->mask.scaled(vgImageSize);
+        if (d->scaledMask.size() != targetSize) {
+            d->scaledMask = d->mask.scaled(targetSize);
+            d->rotatedPixmap = QPixmap();
         }
     }
 
     vgSeti(VG_MASKING, VG_TRUE);
-    QPaintDevice *pdev = painter->paintEngine()->paintDevice();
     // Set the mask for the entire surface to 1 (i.e. nothing is transparent).
     vgMask(VG_INVALID_HANDLE, VG_FILL_MASK,
            0, 0, pdev->width(), pdev->height());
@@ -263,17 +346,16 @@
     // of these is set then try the callback, if that is not set either then
     // just draw the source normally.
     QPixmap *maskPtr = 0;
-    int ox = (int) offset.x();
-    int oy = (int) offset.y();
     if (d->scaledMask.isNull() && !d->maskRect.isNull()) {
-        int x1 = (int) d->maskRect.x();
-        int y1 = (int) d->maskRect.y();
-        int w = (int) d->maskRect.width();
-        int h = (int) d->maskRect.height();
+        QRectF mappedRect = d->maskRect;
         if (!d->maskRectIsInDeviceCoords) {
-            x1 += ox;
-            y1 += oy;
+            mappedRect = d->mapRect(d->maskRect, targetSize);
+            mappedRect.adjust(posX, posY, posX, posY);
         }
+        int x1 = (int) mappedRect.x();
+        int y1 = (int) mappedRect.y();
+        int w = (int) mappedRect.width();
+        int h = (int) mappedRect.height();
         // Make the area defined by the rectangle transparent. Passing
         // VG_CLEAR_MASK results in writing 0 to the mask which results in
         // transparent pixels at that position.
@@ -285,19 +367,30 @@
     } else if (d->maskCallback) {
         // Invoke the callback but only if it has just been set or the size of
         // the source is different than before.
-        if (d->callbackResult.isNull() || d->callbackResult.size() != vgImageSize) {
-            d->callbackResult = d->maskCallback(vgImageSize, d->maskCallbackParam);
+        if (d->callbackResult.isNull() || d->callbackResult.size() != targetSize) {
+            d->callbackResult = d->maskCallback(targetSize, d->maskCallbackParam);
+            d->rotatedPixmap = QPixmap();
         }
         maskPtr = &d->callbackResult;
     }
 
     if (maskPtr) {
-        int w = vgImageSize.width();
-        int h = vgImageSize.height();
+        int w = targetSize.width();
+        int h = targetSize.height();
+        QPixmap pm;
+        qreal rotationAngle = d->mainWindowRotation();
+        if (rotationAngle != 0) {
+            if (d->rotatedPixmap.isNull() || rotationAngle != d->lastMainWindowRotationAngle) {
+                d->rotatedPixmap = maskPtr->transformed(d->rotationTransform()).scaled(targetSize);
+                d->lastMainWindowRotationAngle = rotationAngle;
+            }
+            pm = d->rotatedPixmap;
+        }
+        QPixmap *finalMaskPtr = pm.isNull() ? maskPtr : &pm;
         // Will use the alpha channel from the image, alpha=0 => 0 in the mask
         // => transparent pixel, alpha=255 => 1 in the mask => opaque pixel.
-        vgMask(qPixmapToVGImage(*maskPtr), VG_SET_MASK,
-               ox, toVgYH(oy, h, pdev),
+        vgMask(qPixmapToVGImage(*finalMaskPtr), VG_SET_MASK,
+               posX, toVgYH(posY, h, pdev),
                w, h);
     }
 
@@ -312,3 +405,87 @@
     Q_UNUSED(vgImageSize);
 #endif
 }
+
+/*!
+ * \reimp
+ *
+ * QPainter-based implementation. Currently only supports masking via pixmaps.
+ *
+ * The behavior for partially visible items (clipped by the device rect) is
+ * somewhat wrong, the mask is never clipped, it is just scaled down to match
+ * the visible part of the item.
+ */
+void HbVgMaskEffect::performEffectSw(QPainter *painter)
+{
+    Q_D(HbVgMaskEffect);
+
+    QPoint offset;
+    QPixmap srcPixmap = sourcePixmap(Qt::DeviceCoordinates, &offset); // needs the original world transform
+    if (srcPixmap.isNull()) {
+        return;
+    }
+
+    QPaintDevice *pdev = painter->paintEngine()->paintDevice();
+    d->worldTransform = painter->worldTransform(); // deviceRectForSource needs this
+    // The full source rect (without child items) would be
+    // d->worldTransform.mapRect(sourceItemForRoot()->boundingRect()).toRect()
+    // but we only care about the visible part here so clipping must be applied.
+    QRect srcDevRect(d->deviceRectForSource(HbVgFrameEffectPrivate::ExcludeChildren, pdev).toRect());
+    QPoint pos = d->includeSourceItemOnly ? srcDevRect.topLeft() : offset;
+    QSize size = d->includeSourceItemOnly ? srcDevRect.size() : srcPixmap.size();
+    if (size.width() <= 0 || size.height() <= 0) {
+        return;
+    }
+
+    QPixmap maskPixmap;
+    if (d->maskCallback) {
+        if (d->callbackResult.isNull() || d->callbackResult.size() != size) {
+            d->callbackResult = d->maskCallback(size, d->maskCallbackParam);
+            d->rotatedPixmap = QPixmap();
+        }
+        maskPixmap = d->callbackResult;
+    } else if (!d->mask.isNull()) {
+        if (d->scaledMask.isNull()) {
+            d->scaledMask = d->mask;
+        }
+        if (d->scaledMask.size() != size) {
+            d->scaledMask = d->mask.scaled(size);
+            d->rotatedPixmap = QPixmap();
+        }
+        maskPixmap = d->scaledMask;
+    } else {
+        // Masking via rectangles is not supported here.
+        drawSource(painter);
+        return;
+    }
+
+    qreal rotationAngle = d->mainWindowRotation();
+    if (rotationAngle != 0) {
+        if (d->rotatedPixmap.isNull() || rotationAngle != d->lastMainWindowRotationAngle) {
+            d->rotatedPixmap = maskPixmap.transformed(d->rotationTransform()).scaled(size);
+            d->lastMainWindowRotationAngle = rotationAngle;
+        }
+        maskPixmap = d->rotatedPixmap;
+    }
+
+    if (d->includeSourceItemOnly) {
+        // Take only the source item itself, excluding its children.
+        srcPixmap = srcPixmap.copy(srcDevRect.adjusted(-offset.x(), -offset.y(), -offset.x(), -offset.y()));
+    }
+
+    painter->setWorldTransform(QTransform());
+
+    QImage image(size, QImage::Format_ARGB32_Premultiplied);
+    QPainter p(&image);
+    p.setCompositionMode(QPainter::CompositionMode_Source);
+    p.fillRect(image.rect(), Qt::transparent);
+    p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+    p.drawPixmap(0, 0, srcPixmap);
+    p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+    p.drawPixmap(0, 0, maskPixmap);
+    p.end();
+
+    painter->drawImage(pos, image);
+
+    painter->setWorldTransform(d->worldTransform);
+}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/ovgeffects/hbvgmaskeffect_p.h
--- a/src/hbcore/ovgeffects/hbvgmaskeffect_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgmaskeffect_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -26,16 +26,17 @@
 #ifndef HBVGMASKEFFECT_P_H
 #define HBVGMASKEFFECT_P_H
 
-#include "hbvgeffect_p.h"
+#include "hbvgframeeffect_p.h"
 
 class HbVgMaskEffectPrivate;
 
-class HB_CORE_PRIVATE_EXPORT HbVgMaskEffect : public HbVgEffect
+class HB_CORE_PRIVATE_EXPORT HbVgMaskEffect : public HbVgFrameEffect
 {
     Q_OBJECT
     Q_PROPERTY(QRectF maskRect READ maskRect WRITE setMaskRect NOTIFY maskRectChanged)
     Q_PROPERTY(QRectF maskDeviceRect READ maskDeviceRect WRITE setMaskDeviceRect NOTIFY maskRectChanged)
     Q_PROPERTY(QPixmap mask READ mask WRITE setMask NOTIFY maskChanged)
+    Q_PROPERTY(bool includeSourceItemOnly READ includeSourceItemOnly WRITE setIncludeSourceItemOnly NOTIFY includeSourceItemOnlyChanged)
 
 public:
     HbVgMaskEffect(QObject *parent = 0);
@@ -47,13 +48,13 @@
 
     QPixmap mask() const;
     QPixmap scaledMask() const;
-
     QRectF maskRect() const;
     QRectF maskDeviceRect() const;
-
     MaskCallback maskCallback() const;
     void *maskCallbackParam() const;
 
+    bool includeSourceItemOnly() const;
+
 public slots:
     void clear();
     void setMask(const QPixmap &mask);
@@ -66,16 +67,19 @@
         setMaskDeviceRect(QRectF(x, y, w, h));
     }
     void setMaskCallback(MaskCallback callback, void *param = 0);
+    void setIncludeSourceItemOnly(bool b);
 
 signals:
     void maskChanged(const QPixmap &mask);
     void maskRectChanged(const QRectF &rect);
     void maskCallbackChanged(MaskCallback callback);
+    void includeSourceItemOnlyChanged(bool b);
 
 protected:
     HbVgMaskEffect(HbVgMaskEffectPrivate &dd, QObject *parent = 0);
     void performEffect(QPainter *painter, const QPointF &offset,
                        const QVariant &vgImage, const QSize &vgImageSize);
+    void performEffectSw(QPainter *painter);
 
 private:
     Q_DECLARE_PRIVATE(HbVgMaskEffect)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/ovgeffects/hbvgmaskeffect_p_p.h
--- a/src/hbcore/ovgeffects/hbvgmaskeffect_p_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgmaskeffect_p_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -26,15 +26,16 @@
 #ifndef HBVGMASKEFFECT_P_P_H
 #define HBVGMASKEFFECT_P_P_H
 
-#include "hbvgeffect_p_p.h"
+#include "hbvgframeeffect_p_p.h"
 #include "hbvgmaskeffect_p.h"
 
-class HbVgMaskEffectPrivate : public HbVgEffectPrivate
+class HbVgMaskEffectPrivate : public HbVgFrameEffectPrivate
 {
     Q_DECLARE_PUBLIC(HbVgMaskEffect)
 
 public:
     HbVgMaskEffectPrivate();
+    QRectF mapRect(const QRectF &rect, const QSize &srcSize) const;
 
     QPixmap mask;
     QPixmap scaledMask;
@@ -43,6 +44,9 @@
     HbVgMaskEffect::MaskCallback maskCallback;
     void *maskCallbackParam;
     QPixmap callbackResult;
+    QPixmap rotatedPixmap;
+    qreal lastMainWindowRotationAngle;
+    bool includeSourceItemOnly;
 };
 
 #endif
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/ovgeffects/hbvgoutlineeffect.cpp
--- a/src/hbcore/ovgeffects/hbvgoutlineeffect.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgoutlineeffect.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -154,7 +154,7 @@
     VGImage dstImage = d->ensurePixmap(&d->dstPixmap, vgImageSize);
 
     if (d->paramsChanged) {
-        VGubyte stpc = (VGubyte) clamp(d->steepness, 0.0f, 32.0f);
+        VGubyte stpc = (VGubyte) clamp(d->steepness, 0.0f, 255.0f);
         VGubyte unnormalisedOpacity = (VGubyte)(clamp(d->opacity, 0.0f, 1.0f) * 255.0f);
         for (int i = 0; i < 256; ++i) {
             VGubyte alpha = (i * stpc > unnormalisedOpacity) ? unnormalisedOpacity : i * stpc;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/ovgeffects/hbvgreflectioneffect.cpp
--- a/src/hbcore/ovgeffects/hbvgreflectioneffect.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgreflectioneffect.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -109,23 +109,6 @@
     emit fadeChanged(fade);
 }
 
-QColor HbVgReflectionEffect::color() const
-{
-    Q_D(const HbVgReflectionEffect);
-    return d->color;
-}
-
-void HbVgReflectionEffect::setColor(const QColor &color)
-{
-    Q_D(HbVgReflectionEffect);
-    if (color == d->color) {
-        return;
-    }
-    d->color = color;
-    updateEffect();
-    emit colorChanged(color);
-}
-
 QRectF HbVgReflectionEffect::boundingRectFor(const QRectF &rect) const
 {
     // Double the height of the rectangle but take also the offset into account.
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/ovgeffects/hbvgreflectioneffect_p.h
--- a/src/hbcore/ovgeffects/hbvgreflectioneffect_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/ovgeffects/hbvgreflectioneffect_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -35,7 +35,6 @@
     Q_OBJECT
     Q_PROPERTY(QPointF offset READ offset WRITE setOffset NOTIFY offsetChanged)
     Q_PROPERTY(qreal fade READ fade WRITE setFade NOTIFY fadeChanged)
-    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
 
 public:
     HbVgReflectionEffect(QObject *parent = 0);
@@ -45,7 +44,6 @@
 
     QPointF offset() const;
     qreal fade() const;
-    QColor color() const;
 
 public slots:
     void setOffset(const QPointF &offset);
@@ -53,12 +51,10 @@
         setOffset(QPointF(x, y));
     }
     void setFade(qreal fade);
-    void setColor(const QColor &color);
 
 signals:
     void offsetChanged(const QPointF &offset);
     void fadeChanged(qreal fade);
-    void colorChanged(const QColor &color);
 
 protected:
     HbVgReflectionEffect(HbVgReflectionEffectPrivate &dd, QObject *parent = 0);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/primitives/hbiconitem.cpp
--- a/src/hbcore/primitives/hbiconitem.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/primitives/hbiconitem.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -117,7 +117,8 @@
     mAlignment(HbIconItem::defaultAlignment),
     mAspectRatioMode(HbIconItem::defaultAspectRatioMode),
     mState(HbIconItem::defaultState),
-    mMode(HbIconItem::defaultMode)
+    mMode(HbIconItem::defaultMode),
+    mClearCachedRect(true)
 {
     q_ptr = 0;
 }
@@ -157,6 +158,17 @@
     q->update();
 }
 
+void HbIconItemPrivate::recalculateBoundingRect() const
+{
+    Q_Q(const HbIconItem);
+    mBoundingRect = q->HbWidgetBase::boundingRect();
+    //workaround for qt bug http://bugreports.qt.nokia.com/browse/QTBUG-8820
+    mAdjustedRect.setWidth(qMax(qreal(0),mBoundingRect.width() - qreal(2.0)));
+    mAdjustedRect.setHeight(qMax(qreal(0),mBoundingRect.height() - qreal(2.0)));
+    //workaround ends
+    mClearCachedRect = false;
+}
+
 void HbIconItemPrivate::setThemedColor(const QColor &color)
 {
     mThemedColor = color;
@@ -617,18 +629,22 @@
     Q_UNUSED(widget)
     Q_UNUSED(option)
     Q_D(HbIconItem);
-    const QRectF rect(boundingRect());
-    if (!rect.isEmpty()) {
-        if (d->mIconRect != rect) {
-            d->mIconRect = rect;
+    if (d->mClearCachedRect){
+        d->recalculateBoundingRect();
+    }
+    if (!d->mBoundingRect.isEmpty()){
+        if (d->mIconRect != d->mBoundingRect) {
+            d->mIconRect = d->mBoundingRect;
             if (!d->mIcon.isNull()) {
                 HbIconPrivate::d_ptr_detached(&d->mIcon)->setThemedColor(d->mThemedColor);
             }
             d->mIcon.setSize(d->mIconRect.size());
             d->mAnimator.setIcon(d->mIcon);
         }
-        painter->fillRect(rect, d->mBrush);
-        d->mAnimator.paint(painter, rect,
+        if (d->mBrush != Qt::NoBrush) {
+            painter->fillRect(d->mBoundingRect, d->mBrush);
+        }
+        d->mAnimator.paint(painter, d->mBoundingRect,
                            d->mAspectRatioMode, d->mAlignment,
                            d->mMode, d->mState);
     }
@@ -639,6 +655,29 @@
 }
 
 /*!
+ \reimp
+ */
+QRectF HbIconItem::boundingRect() const
+
+{
+    Q_D(const HbIconItem);
+    if (d->mClearCachedRect) {
+        d->recalculateBoundingRect();
+    }
+    return d->mAdjustedRect;
+}
+
+/*!
+ \reimp
+ */
+void HbIconItem::setGeometry(const QRectF& rect)
+{
+    Q_D(HbIconItem);
+    d->mClearCachedRect = true;
+    HbWidgetBase::setGeometry(rect);
+}
+
+/*!
     \reimp
  */
 void HbIconItem::changeEvent(QEvent *event)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/primitives/hbiconitem.h
--- a/src/hbcore/primitives/hbiconitem.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/primitives/hbiconitem.h	Tue Jul 06 14:36:53 2010 +0300
@@ -79,7 +79,8 @@
     static const Qt::Alignment defaultAlignment;
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
-
+    QRectF boundingRect() const;
+    void setGeometry(const QRectF& rect);
     HbIconAnimator &animator();
 
     enum { Type = Hb::ItemType_IconItem };
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/primitives/hbiconitem_p.h
--- a/src/hbcore/primitives/hbiconitem_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/primitives/hbiconitem_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -44,6 +44,7 @@
     void clearStoredIconContent();
     void updateIconItem();
     void updateIconParams();
+    void recalculateBoundingRect() const;
     void setThemedColor(const QColor &color);
     static HbIconItemPrivate *d_ptr(HbIconItem *item) {
         return item->d_func();
@@ -57,6 +58,9 @@
     QColor mThemedColor;
     QBrush mBrush;
     QRectF mIconRect;
+    mutable QRectF mBoundingRect;
+    mutable QRectF mAdjustedRect;
+    mutable bool mClearCachedRect;
     static bool outlinesEnabled;
 };
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/primitives/hbmarqueeitem.cpp
--- a/src/hbcore/primitives/hbmarqueeitem.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/primitives/hbmarqueeitem.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -549,6 +549,26 @@
 }
 
 /*!
+    \reimp
+*/
+bool HbMarqueeItem::event(QEvent *e)
+{
+    Q_D(HbMarqueeItem);
+    if (e->type() == HbEvent::SleepModeEnter) {
+        bool oldAnimationPending = d->mAnimationPending;
+        stopAnimation();
+        d->mAnimationPending = oldAnimationPending;
+    } else if (e->type() == HbEvent::SleepModeExit) {
+        if (d->mAnimationPending) {
+            startAnimation();
+        }
+    }
+    return HbWidgetBase::event(e);
+}
+
+
+
+/*!
     Sets the text color into \a color.
     If invalid color is used color from theme will be used.
 
@@ -584,6 +604,5 @@
     return d->mDefaultColor;
 }
 
-
 #include "moc_hbmarqueeitem.cpp"
 // end of file
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/primitives/hbmarqueeitem.h
--- a/src/hbcore/primitives/hbmarqueeitem.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/primitives/hbmarqueeitem.h	Tue Jul 06 14:36:53 2010 +0300
@@ -64,6 +64,7 @@
     void changeEvent(QEvent *event);
     void resizeEvent ( QGraphicsSceneResizeEvent * event );
     QVariant itemChange ( GraphicsItemChange change, const QVariant & value );
+    bool event(QEvent *e);
 
     HbMarqueeItem(HbMarqueeItemPrivate &dd, QGraphicsItem *parent );
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/primitives/hbprogresstrackitem.cpp
--- a/src/hbcore/primitives/hbprogresstrackitem.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/primitives/hbprogresstrackitem.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -116,9 +116,18 @@
         }
     }
 
-	QPainterPath path;
-	path.addRect(maskRect);
-	frameDrawer().setClipPath(path);         
+//	QPainterPath path;
+//	path.addRect(maskRect);
+//	frameDrawer().setClipPath(path);
+    QPixmap pixmap(boundingRect().size().toSize());
+    pixmap.fill(Qt::white);
+    QPainter painter1;
+    painter1.begin(&pixmap);
+    painter1.setBrush(QBrush(Qt::black));
+    painter1.drawRect(maskRect);
+    painter1.end();
+    frameDrawer().setMask(pixmap);
+
     HbFrameItem::paint(painter,option,widget);
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/primitives/hbslidertrackitem.cpp
--- a/src/hbcore/primitives/hbslidertrackitem.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/primitives/hbslidertrackitem.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -147,10 +147,19 @@
                 }
             }
         }
-        QPainterPath rectPath;
-        rectPath.addRect(maskRect);
-        frameDrawer().setClipPath(rectPath);
-        setMask = false;
+//        QPainterPath rectPath;
+//        rectPath.addRect(maskRect);
+//        frameDrawer().setClipPath(rectPath);
+//        setMask = false;
+        QPixmap pixmap(boundingRect().size().toSize());
+        pixmap.fill(Qt::white);
+        QPainter painter1;
+        painter1.begin(&pixmap);
+        painter1.setBrush(QBrush(Qt::black));
+        painter1.drawRect(maskRect);
+        painter1.end();
+        frameDrawer().setMask(pixmap);
+
     }
 
     HbFrameItem::paint(painter, option, widget);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/primitives/hbtextitem.cpp
--- a/src/hbcore/primitives/hbtextitem.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/primitives/hbtextitem.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -46,6 +46,7 @@
 
 #ifdef HB_TEXT_ITEM_LOGS
 #   include <QDebug>
+const int KMaxLogedTextLength = 30;
 #endif // HB_TEXT_ITEM_LOGS
 
 bool HbTextItemPrivate::outlinesEnabled = false;
@@ -183,23 +184,23 @@
     return i;
 }
 
-QSizeF HbTextItemPrivate::respectSizeLimits(QSizeF size) const
+qreal HbTextItemPrivate::respectHeightLimits(qreal height) const
 {
     QFontMetricsF metrics(mTextLayout.font());
 
     Q_ASSERT(mMinLines>0);
     qreal minHeight = metrics.lineSpacing()*mMinLines - metrics.leading();
-    if (size.height()<minHeight) {
-        size.setHeight(minHeight);
+    if (height<minHeight) {
+        height=minHeight;
     }
 
     if (mMaxLines>0) {
         qreal maxHeight = metrics.lineSpacing()*mMaxLines - metrics.leading();
-        if (size.height()>maxHeight) {
-            size.setHeight(maxHeight);
+        if (height>maxHeight) {
+            height=maxHeight;
         }
     }
-    return size;
+    return height;
 }
 
 QString HbTextItemPrivate::elideLayoutedText(const QSizeF& size, const QFontMetricsF& metrics) const
@@ -288,24 +289,28 @@
     return flags;
 }
 
-/*!
-    This method check spetial case of calculating sizeHint.
-    By default prefferedSize returns size of text which has lots of free space.
-    But there can be situaltion that text has less avaible free width ther requred.
-    In such cases prefered hight of HbTextItem should be recaculated because wrapping
-    of the line may requre more space in vertical direction.
-
-    In such case bigger hight should be cached for sizeHint calculations.
+/*
+    This method check spatial case of calculating sizeHint.
+    By default preferredSize (sizeHint(Qt::PreferredSize)) returns size of text
+    which has lots of free space and it is not wrapped.
+    After size of HbTextItem is set (width is know) there can be situation
+    that text has less available width then required.
+    In such cases when text wrapping is available preferred height of HbTextItem
+    should be recalculated to take wrapped text into account.
  */
-bool HbTextItemPrivate::isAdjustHightNeeded(const QSizeF& newSize,
-                                            const QSizeF& prefSize)
+bool HbTextItemPrivate::isAdjustHightNeeded(qreal newWidth,
+                                            qreal prefHeight,
+                                            qreal minHeight,
+                                            qreal maxHeight)
 {
 #ifdef HB_TEXT_ITEM_LOGS
     qDebug() << "isAdjustHightNeeded for: " << q_ptr->objectName()
-            << " text=" << mText.left(20)
+            << " text=" << mText.left(KMaxLogedTextLength)
             << " adjusted=" << mAdjustedSize
-            << " pref=" << prefSize
-            << mTextLayout.font();
+            << " prefHeight=" << prefHeight
+            << " minHeight=" << minHeight
+            << " lastConstraint=" << mLastConstraint
+            << " " << mTextLayout.font();
 #endif // HB_TEXT_ITEM_LOGS
 
     // first check if wrapping of text is not active
@@ -315,22 +320,21 @@
         return false;
     }
 
+    // preferred height was set from outside of this class so there is mo reson to adjust it
+    if (mLastConstraint.height()>0) {
+        return false;
+    }
+
     // check if line count is fixed
     if (mMaxLines == mMinLines) {
         return false;
     }
 
-    // check if preffered height is defined by user
-    //    so check if preff height is same as value returned by sizeHint
-    if (!qFuzzyCompare(prefSize.height(), mAdjustedSize.height())) {
-        return false;
-    }
-
     // check if adjusted size has been already calculated
     // new width is bigger then last estimated range of same height
-    if ((mMaxWidthForAdjust>=newSize.width()
-        // new width is smaller then last estimated range of same height
-        && newSize.width()>=mMinWidthForAdjust)) {
+    if ((mMaxWidthForAdjust>=newWidth
+         // new width is smaller then last estimated range of same height
+         && newWidth>=mMinWidthForAdjust)) {
         return false;
     }
 
@@ -344,14 +348,14 @@
     const QFontMetricsF metrics(mTextLayout.font());
 
     // heavy calculation: check if text fits in current size and cache result
-    QSizeF newAdjust = metrics.boundingRect(QRectF(0, 0, newSize.width(), QWIDGETSIZE_MAX),
-                                       textFlagsFromTextOption(),
-                                       mText).size();
+    QSizeF newAdjust = metrics.boundingRect(QRectF(0, 0, newWidth, QWIDGETSIZE_MAX),
+                                            textFlagsFromTextOption(),
+                                            mText).size();
 
     if (qFuzzyCompare(newAdjust.height(), mAdjustedSize.height())) {
         // height is same as last time update range of same height
-        mMaxWidthForAdjust = qMax(mMaxWidthForAdjust, newSize.width());
-        mMinWidthForAdjust = qMin(mMinWidthForAdjust, newSize.width());
+        mMaxWidthForAdjust = qMax(mMaxWidthForAdjust, newWidth);
+        mMinWidthForAdjust = qMin(mMinWidthForAdjust, newWidth);
 
         // and don't update geometry
         return false;
@@ -359,16 +363,20 @@
 
     // new height was calculated create new range for which
     // current mAdjustedSize.height is valid
-    mMaxWidthForAdjust = newSize.width();
+    mMaxWidthForAdjust = newWidth;
     mMinWidthForAdjust = newAdjust.width();
 
-    // store new hieght use don't change width
+    // store new hieght, don't change width
     mAdjustedSize.setHeight(newAdjust.height());
-    Q_ASSERT_X(mAdjustedSize.width()>=newAdjust.width(),
+
+    Q_ASSERT_X(mLastConstraint.width()>0 || mAdjustedSize.width()>=newAdjust.width(),
                "HbTextItemPrivate::isAdjustHightNeeded",
                QString("Fail for string: \"%1\"").arg(mText).toAscii().data());
 
-    if (respectSizeLimits(mAdjustedSize)==prefSize) {
+    if (qFuzzyCompare(qBound(minHeight,
+                             respectHeightLimits(mAdjustedSize.height()),
+                             maxHeight),
+                      prefHeight)) {
         // updateGeometry has no effect
         return false;
     }
@@ -389,14 +397,19 @@
 {
     const QFontMetricsF metrics(mTextLayout.font());
 
-    if (mAdjustedSize.isValid() &&
-        (constraint.height()<0 || qFuzzyCompare(constraint.height(), mAdjustedSize.height())) &&
-        (constraint.width()<0  || qFuzzyCompare(constraint.width(), mAdjustedSize.width()))) {
+    if (mAdjustedSize.isValid() && constraint == mLastConstraint) {
         // return cached value, see more in:
         //      - HbTextItemPrivate::isAdjustHightNeeded
         //      - HbTextItem::resizeEvent
+
+#ifdef HB_TEXT_ITEM_LOGS
+        qDebug() << "HbTextItemPrivate::calculatePrefferedSize: returning cached value: " << mAdjustedSize
+                << " font:" << mTextLayout.font()
+                << " text:" << mText.left(KMaxLogedTextLength);
+#endif
         return mAdjustedSize;
     }
+    mLastConstraint = constraint;
 
     QSizeF maxSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
     if(constraint.width()>0) {
@@ -413,8 +426,15 @@
     mAdjustedSize = size;
     mDefaultHeight = size.height();
     mMinWidthForAdjust = size.width();
-    mMaxWidthForAdjust = QWIDGETSIZE_MAX;
+    mMaxWidthForAdjust = maxSize.width();
 
+#ifdef HB_TEXT_ITEM_LOGS
+        qDebug() << "HbTextItemPrivate::calculatePrefferedSize:"
+                << " text: " << mText.left(KMaxLogedTextLength)
+                << " returnSize: " << mAdjustedSize
+                << " constraint: "  << constraint
+                << " font: " << mTextLayout.font();
+#endif
     return size;
 }
 
@@ -828,15 +848,13 @@
 QRectF HbTextItemPrivate::boundingRect (const QRectF& contentsRect) const
 {
     QRectF result(layoutBoundingRect());
-    if(q_ptr->flags().testFlag(QGraphicsItem::ItemClipsToShape)) {
-        // clip
-        QRectF clippedTo = contentsRect;
 
-        qreal dx = qMin(mFadeLengthX, (qreal)0.0);
-        qreal dy = qMin(mFadeLengthY, (qreal)0.0);
-        clippedTo.adjust(dx, dy, -dx, -dy);
+    if (mPaintFaded) {
+        result = result.intersected(mFadeToRect);
+    }
 
-        result = result.intersected(clippedTo);
+    if(q_ptr->flags().testFlag(QGraphicsItem::ItemClipsToShape)) {
+        result = result.intersected(contentsRect);
     }
 
     if (HbTextItemPrivate::outlinesEnabled) {
@@ -990,14 +1008,18 @@
         // don't call it when minimum and maximum lines are equal (height is fixed) or ...
         if ((d->mMinLines == d->mMaxLines)
             // or when preferred height is ignored
-            || (sizePolicy().verticalPolicy()&QSizePolicy::IgnoreFlag)) {
+            || (sizePolicy().verticalPolicy()&QSizePolicy::IgnoreFlag)
+            // or was preferred height set from outside of this class?
+            || d->mLastConstraint.height()>0) {
 
-            // and when preferred width is ignored or ...
+            // and when preferred width is ignored
             if (sizePolicy().horizontalPolicy()&QSizePolicy::IgnoreFlag
-                // or when preferred width is defined from outside
-                || !qFuzzyCompare(preferredWidth(), d->mAdjustedSize.width())) {
-                  // TODO: looking for better solution since preferredWidth() can cause call of sizeHint
-
+                // or was preferred width set from outside of this class?
+                || d->mLastConstraint.width()>0) {
+#ifdef HB_TEXT_ITEM_LOGS
+                qDebug() << "HbTextItem::setText: skiping updateGeometry for: "
+                        << objectName() << " text:" << d->mText.left(KMaxLogedTextLength);
+#endif
                 // in those cases skip updateGeometry
                 return;
             }
@@ -1086,11 +1108,6 @@
     Q_UNUSED(option);
     Q_UNUSED(widget);
 
-    // optimalization:
-    if (option->exposedRect.isEmpty()) {
-        return;
-    }
-
     // Save painter's state
     QPen oldPen = painter->pen();
 
@@ -1112,7 +1129,14 @@
 
     Q_ASSERT(d->mPaintFaded == d->fadeNeeded(contentsRect()));
     if(d->mPaintFaded ) {
+        // there is issue with restoring state of painter when
+        // setClipPath is used. It is impossible to restore
+        // original clipPath without save and restore whole painter
+        painter->save(); // see comment above
+
         d->paintWithFadeEffect(painter);
+
+        painter->restore(); // see comment above
     } else {
         d->mTextLayout.draw(painter,
                             d->mOffsetPos,
@@ -1139,8 +1163,14 @@
         // called method HbWidgetBase::setGeometry(rect) so size is used which
         // holds current size
         Q_D(HbTextItem);
-        if (d->isAdjustHightNeeded(size(), preferredSize())) {
-            updateGeometry();
+        if (d->isAdjustHightNeeded(size().width(),
+                                   preferredHeight(),
+                                   minimumHeight(),
+                                   maximumHeight())) {
+            updateGeometry();            
+#ifdef HB_TEXT_ITEM_LOGS
+            qDebug() << "isAdjustHightNeeded returned true - updateGeometry was called";
+#endif // HB_TEXT_ITEM_LOGS
         }
     }
 }
@@ -1175,7 +1205,7 @@
 #ifdef HB_TEXT_ITEM_LOGS
         qWarning() << "Font change was not recieved on time: work-around is active"
                 << objectName()
-                << " test: " << d->mText.left(20)
+                << " test: " << d->mText.left(KMaxLogedTextLength)
                 << " oldFont:" << d->mTextLayout.font()
                 << " newFont:" << font();
 #endif // HB_TEXT_ITEM_LOGS
@@ -1203,7 +1233,7 @@
         {
             if ( !d->mText.isEmpty() ) {
                 size.setWidth(MinimumWidth); // just to show something  -- should not matter in read use-case
-                size = d->respectSizeLimits(size);
+                size.setHeight(d->respectHeightLimits(size.height()));
             }
             break;
         }
@@ -1213,12 +1243,12 @@
             if ( !effectiveOrientations.testFlag(Qt::Horizontal)
                     && (d->mMinLines == d->mMaxLines) ) {
                 //optimize single line if the horizontal sizeHint is ignored
-                size = d->respectSizeLimits(size);
+                size.setHeight(d->respectHeightLimits(size.height()));
                 break;
             }
 
             size = d->calculatePrefferedSize(constraint);
-            size = d->respectSizeLimits(size);
+            size.setHeight(d->respectHeightLimits(size.height()));
             break;
         }
 
@@ -1252,7 +1282,7 @@
 
 #ifdef HB_TEXT_ITEM_LOGS
                 qDebug() << "fontChangeEvent: " << objectName()
-                        << " text: " << text().left(20)
+                        << " text: " << text().left(KMaxLogedTextLength)
                         << " font: " << font();
 #endif // HB_TEXT_ITEM_LOGS
 
@@ -1323,8 +1353,8 @@
             if (d->mAdjustedSize.isValid() &&
                 d->mAdjustedSize.width() > size().width()) {
                 // restore default size hint
-                d->mAdjustedSize = d->respectSizeLimits(
-                        QSizeF(d->mAdjustedSize.width(), d->mDefaultHeight));
+                d->mAdjustedSize.setHeight(
+                        d->respectHeightLimits(d->mDefaultHeight));
                 d->mMinWidthForAdjust = d->mAdjustedSize.width();
                 d->mMaxWidthForAdjust = QWIDGETSIZE_MAX;
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/primitives/hbtextitem_p.h
--- a/src/hbcore/primitives/hbtextitem_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/primitives/hbtextitem_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -65,10 +65,14 @@
     int findIndexOfLastLineBeforeY(qreal y) const;
 
     QString elideLayoutedText(const QSizeF& size, const QFontMetricsF& metrics) const;
-    bool isAdjustHightNeeded(const QSizeF& newSize, const QSizeF& prefSize);
+    bool isAdjustHightNeeded(qreal newWidth,
+                             qreal prefHeight,
+                             qreal minHeight,
+                             qreal maxHeight);
+
     void clearAdjustedSizeCache();
 
-    QSizeF respectSizeLimits(QSizeF size) const;
+    qreal respectHeightLimits(qreal height) const;
 
     inline QSizeF calculatePrefferedSize(const QSizeF& constraint) const;
 
@@ -145,6 +149,7 @@
     mutable qreal mMinWidthForAdjust;
     mutable qreal mMaxWidthForAdjust;
     mutable qreal mDefaultHeight;
+    mutable QSizeF mLastConstraint;
 
     mutable bool mUpdateColor;
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/primitives/hbtoucharea.cpp
--- a/src/hbcore/primitives/hbtoucharea.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/primitives/hbtoucharea.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -30,9 +30,9 @@
 #include <QStyleOptionGraphicsItem>
 #include <QGraphicsLayout>
 #include <QPainter>
+#include <QGraphicsScene>
 #include <hbmainwindow.h>
 #include <hbinstance.h>
-#include <qgraphicsscene.h>
 
 bool HbTouchAreaPrivate::outlinesEnabled = false;
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/displaydefinition.xml
--- a/src/hbcore/resources/displaydefinition.xml	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/displaydefinition.xml	Tue Jul 06 14:36:53 2010 +0300
@@ -15,7 +15,7 @@
     resolutionWidth="360" 
     resolutionHeight="640"
     ppiValue="229"
-    orientationAngle="270"
+    orientationAngle="0"
     unitValue="6.7" />
 
     <display
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/animations/hbdefault/qtg_anim_battery_charging.axml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/animations/hbdefault/qtg_anim_battery_charging.axml	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,14 @@
+<animations>
+<icon name="qtg_anim_battery_charging" frame_duration="100" playmode="loop">
+<frame>qtg_anim_battery_charging_01</frame>
+<frame>qtg_anim_battery_charging_02</frame>
+<frame>qtg_anim_battery_charging_03</frame>
+<frame>qtg_anim_battery_charging_04</frame>
+<frame>qtg_anim_battery_charging_05</frame>
+<frame>qtg_anim_battery_charging_06</frame>
+<frame>qtg_anim_battery_charging_07</frame>
+<frame>qtg_anim_battery_charging_08</frame>
+<frame>qtg_anim_battery_charging_09</frame>
+<frame frame_duration="500">qtg_anim_battery_charging_10</frame>
+</icon>
+</animations>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/animations/hbdefault/qtg_anim_battery_full.axml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/animations/hbdefault/qtg_anim_battery_full.axml	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,14 @@
+<animations>
+<icon name="qtg_anim_battery_full" frame_duration="200" playmode="loop">
+<frame>qtg_anim_battery_full_01</frame>
+<frame>qtg_anim_battery_full_02</frame>
+<frame>qtg_anim_battery_full_03</frame>
+<frame>qtg_anim_battery_full_04</frame>
+<frame frame_duration="800">qtg_anim_battery_full_05</frame>
+<frame>qtg_anim_battery_full_06</frame>
+<frame>qtg_anim_battery_full_07</frame>
+<frame>qtg_anim_battery_full_08</frame>
+<frame>qtg_anim_battery_full_09</frame>
+<frame frame_duration="800">qtg_anim_battery_full_10</frame>
+</icon>
+</animations>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/camera_standby_appear.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/camera_standby_appear.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,9 @@
+<layers>
+	<visual>
+	    <param name="opacity" type="anim">
+	        <duration>0.3</duration>
+	        <keyframe at="0.0">0.0</keyframe>
+	        <keyframe at="1.0">1.0</keyframe>
+	    	</param>
+	</visual>
+</layers>
\ No newline at end of file
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/camera_standby_disappear.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/camera_standby_disappear.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,9 @@
+<layers>
+	<visual>
+   	    <param name="opacity" type="anim">
+	        <duration>0.3</duration>
+	        <keyframe at="0.0">1.0</keyframe>
+	        <keyframe at="1.0">0.0</keyframe>
+	    		</param>
+	</visual>
+</layers>
\ No newline at end of file
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/camera_toolbarextension_appear.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/camera_toolbarextension_appear.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,22 @@
+<layers>
+	<visual>
+	    <param name="translation_x" type="anim">
+	        <duration>0.3</duration>
+	        <style>outquad</style>
+	        <keyframe at="0.0">0.0</keyframe>
+	        <keyframe at="1.0">1.0</keyframe>
+	        <start ref="visual.width">-0.5</start>
+	        <end ref="visual.left">1</end>
+	    </param>
+	    
+	    
+  		<param name="opacity" type="anim">
+			<style>linear</style>
+			<duration>0.3</duration>
+			<keyframe at="0.0">0.0</keyframe>
+			<keyframe at="1.0">1.0</keyframe>
+		</param>
+	    
+	    
+	</visual>
+</layers>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/camera_toolbarextension_disappear.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/camera_toolbarextension_disappear.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,21 @@
+<layers>
+	<visual>
+  <param name="translation_x" type="anim">
+    <duration>0.3</duration>
+    <style>inoutquad</style>
+          <keyframe at="0.0">0.0</keyframe>
+          <keyframe at="1.0">1.0</keyframe>     
+    <start ref="visual.left">1</start>
+    <end ref="visual.width">-0.5</end>
+       
+  </param>
+   
+  		<param name="opacity" type="anim">
+			<style>linear</style>
+			<duration>0.3</duration>
+			<keyframe at="0.0">1.0</keyframe>
+			<keyframe at="1.0">0.0</keyframe>
+		</param>
+		
+	</visual>
+</layers>
\ No newline at end of file
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/camera_zoom_appear.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/camera_zoom_appear.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,12 @@
+<layers>
+	<visual>
+	    <param name="translation_x" type="anim">
+	        <duration>0.3</duration>
+	        <style>outquad</style>
+	        <keyframe at="0.0">0.0</keyframe>
+	        <keyframe at="1.0">1.0</keyframe>
+	        <start ref="screen.width">1.0</start>
+	        <end ref="visual.left">1</end>
+	    </param>
+	</visual>
+</layers>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/camera_zoom_disappear.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/camera_zoom_disappear.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,15 @@
+<layers>
+	<visual>
+	    <param name="translation_x" type="anim">
+	        <duration>0.4</duration>
+	        <style>inoutquad</style>
+	        <keyframe at="0.0">0.0</keyframe>
+	        <keyframe at="1.0">1.0</keyframe>
+	        <start ref="visual.left">1.0</start>
+	        <end ref="screen.width">1</end>
+	    </param>
+	</visual>
+</layers>
+
+
+		
\ No newline at end of file
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/gridviewitem_press.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/gridviewitem_press.fxml	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/gridviewitem_press.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -1,20 +1,11 @@
 <layers>
   <visual>
-    <param name="scale_x" type="anim">
-      <duration>0.3</duration>
-       <style>outquad</style> 
-      <keyframe at="0.0">1.0</keyframe>
-      <keyframe at="1.0">0.9</keyframe>
-    </param>
-    <param name="scale_y" type="anim">
-    	<style>outquad</style> 
-      <duration>0.3</duration>
-      <keyframe at="0.0">1.0</keyframe>
-      <keyframe at="1.0">0.9</keyframe>
-    </param>
-
-    <param name="scale_origin_x" ref="visual.width">0.5</param>
-    <param name="scale_origin_y" ref="visual.height">0.5</param>
+		<param name="opacity" type="anim">
+			<style>linear</style>
+			<duration>0.3</duration>
+			<keyframe at="0.0">1.0</keyframe>
+			<keyframe at="1.0">0.5</keyframe>
+		</param>
 
   </visual>
 </layers>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/gridviewitem_release.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/gridviewitem_release.fxml	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/gridviewitem_release.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -1,20 +1,11 @@
 <layers>
   <visual>
-    <param name="scale_x" type="anim">
-      <duration>0.3</duration>
-      <style>inoutquad</style> 
-      <keyframe at="0.0">0.9</keyframe>
-      <keyframe at="1.0">1.0</keyframe>
-    </param>
-    <param name="scale_y" type="anim">
-      <style>inoutquad</style> 
-      <duration>0.3</duration>
-      <keyframe at="0.0">0.9</keyframe>
-      <keyframe at="1.0">1.0</keyframe>
-    </param>
-
-    <param name="scale_origin_x" ref="visual.width">0.5</param>
-    <param name="scale_origin_y" ref="visual.height">0.5</param>
+		<param name="opacity" type="anim">
+			<style>linear</style>
+			<duration>0.3</duration>
+			<keyframe at="0.0">0.5</keyframe>
+			<keyframe at="1.0">1.0</keyframe>
+		</param>
 
   </visual>
 </layers>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/listviewitem_press.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/listviewitem_press.fxml	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/listviewitem_press.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -1,20 +1,11 @@
 <layers>
   <visual>
-    <param name="scale_x" type="anim">
-      <duration>0.3</duration>
-       <style>outquad</style> 
-      <keyframe at="0.0">1.0</keyframe>
-      <keyframe at="1.0">0.9</keyframe>
-    </param>
-    <param name="scale_y" type="anim">
-    	<style>outquad</style> 
-      <duration>0.3</duration>
-      <keyframe at="0.0">1.0</keyframe>
-      <keyframe at="1.0">0.9</keyframe>
-    </param>
-
-    <param name="scale_origin_x" ref="visual.width">0.5</param>
-    <param name="scale_origin_y" ref="visual.height">0.5</param>
+		<param name="opacity" type="anim">
+			<style>linear</style>
+			<duration>0.3</duration>
+			<keyframe at="0.0">1.0</keyframe>
+			<keyframe at="1.0">0.5</keyframe>
+		</param>
 
   </visual>
 </layers>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/listviewitem_release.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/listviewitem_release.fxml	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/listviewitem_release.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -1,20 +1,11 @@
 <layers>
   <visual>
-    <param name="scale_x" type="anim">
-      <duration>0.3</duration>
-      <style>inoutquad</style> 
-      <keyframe at="0.0">0.9</keyframe>
-      <keyframe at="1.0">1.0</keyframe>
-    </param>
-    <param name="scale_y" type="anim">
-      <style>inoutquad</style> 
-      <duration>0.3</duration>
-      <keyframe at="0.0">0.9</keyframe>
-      <keyframe at="1.0">1.0</keyframe>
-    </param>
-
-    <param name="scale_origin_x" ref="visual.width">0.5</param>
-    <param name="scale_origin_y" ref="visual.height">0.5</param>
+		<param name="opacity" type="anim">
+			<style>linear</style>
+			<duration>0.3</duration>
+			<keyframe at="0.0">0.5</keyframe>
+			<keyframe at="1.0">1.0</keyframe>
+		</param>
 
   </visual>
 </layers>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/mail_widget_collapse.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/mail_widget_collapse.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,12 @@
+<layers>
+	<visual>
+	    <param name="translation_y" type="anim">
+	        <duration>0.3</duration>
+	        <style>inoutquad</style>
+	        <keyframe at="0.0">0.0</keyframe>
+	        <keyframe at="1.0">1.0</keyframe>
+	        <start ref="visual.top">1.0</start>
+            <end ref="extrect.top">1</end>
+	    </param>
+	</visual>
+</layers>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/mail_widget_expand.fxml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/mail_widget_expand.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,13 @@
+<layers>
+	<visual>
+	    <param name="translation_y" type="anim">
+	        <duration>0.3</duration>
+	        <style>outquad</style>
+	        <keyframe at="0.0">0.0</keyframe>
+	        <keyframe at="1.0">1.0</keyframe>
+	        <start ref="extrect.top">1</start>
+            <end ref="visual.top">1</end>
+	    </param>
+	</visual>
+</layers>
+
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/popup_appear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/popup_appear.fxml	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/popup_appear.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -5,7 +5,7 @@
 			<style>outback</style>
 			<keyframe at="0.0">0</keyframe>
 			<keyframe at="1.0">1</keyframe>
-			<start ref="visual.width">0.5</start>
+			<start ref="visual.width">0.8</start>
 			<end ref="visual.width">1.0</end>
 		</param>
 		<param name="scale_y" type="anim">
@@ -13,7 +13,7 @@
 			<style>outback</style>
 			<keyframe at="0.0">0</keyframe>
 			<keyframe at="1.0">1</keyframe>
-			<start ref="visual.height">0.5</start>
+			<start ref="visual.height">0.8</start>
 			<end ref="visual.height">1.0</end>
 		</param>
 		<param name="opacity" type="anim">
@@ -25,22 +25,7 @@
 		<param name="scale_origin_x" ref="visual.width">0.5</param>
 		<param name="scale_origin_y" ref="visual.height">0.5</param>
 	</visual>
-	<filter name="Drop Shadow" type="drop_shadow">
-		<param name="offset_x">0.0</param>
-		<param name="offset_y">5.0</param>
-		<param name="opacity" type="anim">
-			<style>linear</style>
-			<duration>0.3</duration>
-			<keyframe at="0.0">0.0</keyframe>
-			<keyframe at="0.5">0.0</keyframe>
-			<keyframe at="1.0">1.0</keyframe>
-		</param>
-		<param name="steepness">8.0</param>
-		<param name="outline_x">1.0</param>
-		<param name="outline_y">1.0</param>
-		<param name="color">#000000</param>
-	</filter>
-</layers>
+	</layers>
 
 
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/popup_disappear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/popup_disappear.fxml	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/popup_disappear.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -1,13 +1,12 @@
 <layers>
 <visual>
-
 	<param name="scale_x" type="anim">
 			<duration>0.3</duration>
 			<style>inoutquad</style>
 			<keyframe at="0.0">0</keyframe>
 			<keyframe at="1.0">1</keyframe>
 			<start ref="visual.width">1.0</start>
-			<end ref="visual.width">0.5</end>
+			<end ref="visual.width">0.8</end>
 		</param>
 		<param name="scale_y" type="anim">
 			<duration>0.3</duration>
@@ -15,7 +14,7 @@
 			<keyframe at="0.0">0</keyframe>
 			<keyframe at="1.0">1</keyframe>
 			<start ref="visual.height">1.0</start>
-			<end ref="visual.height">0.5</end>
+			<end ref="visual.height">0.8</end>
 		</param>
 		<param name="scale_origin_x" ref="visual.width">0.5</param>
 		<param name="scale_origin_y" ref="visual.height">0.5</param>
@@ -26,18 +25,4 @@
 			<keyframe at="1.0">0.0</keyframe>
 		</param>
 	</visual>
-	<filter name="Drop Shadow" type="drop_shadow">
-		<param name="offset_x">0.0</param>
-		<param name="offset_y">5.0</param>
-		<param name="opacity" type="anim">
-			<style>linear</style>
-			<duration>0.3</duration>
-			<keyframe at="0.0">1.0</keyframe>
-			<keyframe at="1.0">0.0</keyframe>
-		</param>
-		<param name="steepness">8.0</param>
-		<param name="outline_x">1.0</param>
-		<param name="outline_y">1.0</param>
-		<param name="color">#000000</param>
-	</filter>
 </layers>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/radiobuttonlistitem_press.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/radiobuttonlistitem_press.fxml	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/radiobuttonlistitem_press.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -1,20 +1,11 @@
 <layers>
   <visual>
-    <param name="scale_x" type="anim">
-      <duration>0.3</duration>
-       <style>outquad</style> 
-      <keyframe at="0.0">1.0</keyframe>
-      <keyframe at="1.0">0.8</keyframe>
-    </param>
-    <param name="scale_y" type="anim">
-    	<style>outquad</style> 
-      <duration>0.2</duration>
-      <keyframe at="0.0">1.0</keyframe>
-      <keyframe at="1.0">0.8</keyframe>
-    </param>
-
-    <param name="scale_origin_x" ref="visual.width">0.5</param>
-    <param name="scale_origin_y" ref="visual.height">0.5</param>
+		<param name="opacity" type="anim">
+			<style>linear</style>
+			<duration>0.3</duration>
+			<keyframe at="0.0">1.0</keyframe>
+			<keyframe at="1.0">0.5</keyframe>
+		</param>
 
   </visual>
 </layers>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/radiobuttonlistitem_release.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/radiobuttonlistitem_release.fxml	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/radiobuttonlistitem_release.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -1,20 +1,11 @@
 <layers>
   <visual>
-    <param name="scale_x" type="anim">
-      <duration>0.3</duration>
-      <style>inoutquad</style> 
-      <keyframe at="0.0">0.8</keyframe>
-      <keyframe at="1.0">1.0</keyframe>
-    </param>
-    <param name="scale_y" type="anim">
-      <style>inoutquad</style> 
-      <duration>0.2</duration>
-      <keyframe at="0.0">0.8</keyframe>
-      <keyframe at="1.0">1.0</keyframe>
-    </param>
-
-    <param name="scale_origin_x" ref="visual.width">0.5</param>
-    <param name="scale_origin_y" ref="visual.height">0.5</param>
+		<param name="opacity" type="anim">
+			<style>linear</style>
+			<duration>0.3</duration>
+			<keyframe at="0.0">0.5</keyframe>
+			<keyframe at="1.0">1.0</keyframe>
+		</param>
 
   </visual>
 </layers>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/taskswapper_appear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/taskswapper_appear.fxml	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/taskswapper_appear.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -25,21 +25,7 @@
 		<param name="scale_origin_x" ref="visual.width">0.5</param>
 		<param name="scale_origin_y" ref="visual.height">0.5</param>
 	</visual>
-	<filter name="Drop Shadow" type="drop_shadow">
-		<param name="offset_x">0.0</param>
-		<param name="offset_y">5.0</param>
-		<param name="opacity" type="anim">
-			<style>linear</style>
-			<duration>0.4</duration>
-			<keyframe at="0.0">0.0</keyframe>
-			<keyframe at="0.5">0.0</keyframe>
-			<keyframe at="1.0">1.0</keyframe>
-		</param>
-		<param name="steepness">8.0</param>
-		<param name="outline_x">1.0</param>
-		<param name="outline_y">1.0</param>
-		<param name="color">#000000</param>
-	</filter>
+
 </layers>
 
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/effects/hbdefault/taskswapper_disappear.fxml
--- a/src/hbcore/resources/themes/effects/hbdefault/taskswapper_disappear.fxml	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/taskswapper_disappear.fxml	Tue Jul 06 14:36:53 2010 +0300
@@ -26,18 +26,5 @@
 			<keyframe at="1.0">0.0</keyframe>
 		</param>
 	</visual>
-	<filter name="Drop Shadow" type="drop_shadow">
-		<param name="offset_x">0.0</param>
-		<param name="offset_y">5.0</param>
-		<param name="opacity" type="anim">
-			<style>linear</style>
-			<duration>0.2</duration>
-			<keyframe at="0.0">1.0</keyframe>
-			<keyframe at="1.0">0.0</keyframe>
-		</param>
-		<param name="steepness">8.0</param>
-		<param name="outline_x">1.0</param>
-		<param name="outline_y">1.0</param>
-		<param name="color">#000000</param>
-	</filter>
+
 </layers>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/hbdefault.themeindex
Binary file src/hbcore/resources/themes/hbdefault.themeindex has changed
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_b.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_b.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="80" x="0"/>
+<rect fill="#E6E6E6" height="10" width="80" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_bl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_bl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10" x="0"/>
+<rect fill="#E6E6E6" height="10" width="10" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_br.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_br.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10" x="0"/>
+<rect fill="#E6E6E6" height="10" width="10" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_c.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="80" width="80" x="0"/>
+<rect fill="#E6E6E6" height="80" width="80" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_l.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="#E6E6E6" height="80" width="10" x="0"/>
+<rect fill="#E6E6E6" height="80" width="10" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_r.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="#E6E6E6" height="80" width="10" x="0"/>
+<rect fill="#E6E6E6" height="80" width="10" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_t.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_t.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="#E6E6E6" height="10" width="80" x="0"/>
+<rect fill="#E6E6E6" height="10" width="80" x="0"/>
+<rect fill="#E6E6E6" height="1" width="80" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_tl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_tl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="#E6E6E6" height="10" width="10" x="0"/>
+<rect fill="#E6E6E6" height="10" width="10" x="0"/>
+<rect fill="#E6E6E6" height="1" width="10" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_tr.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_icon_bg_tr.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="#E6E6E6" height="10" width="10" x="0"/>
+<rect fill="#E6E6E6" height="10" width="10" x="0"/>
+<rect fill="#E6E6E6" height="1" width="10" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_b.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_b.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="#FFFFFF" height="10" width="80" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_bl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_bl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="#FFFFFF" height="10" width="10" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_br.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_br.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="#FFFFFF" height="10" width="10" x="0"/>
+<rect fill="#FFFFFF" height="10" width="10" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_c.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 80 80" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="80" width="80" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_l.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="#FFFFFF" height="80" width="10" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_r.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="80px" version="1.1" viewBox="0 0 10 80" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="#FFFFFF" height="80" width="10" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_t.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_t.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 80 10" width="80px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="#FFFFFF" height="10" width="80" x="0"/>
+<rect fill="#E6E6E6" height="1" width="80" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_tl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_tl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="#FFFFFF" height="10" width="10" x="0"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_tr.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_coverflow_list_bg_tr.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="#FFFFFF" height="10" width="10" x="-0.001"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_c.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_c.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,20 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" style="enable-background:new 0 0 30 60;" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<g>
-<rect height="59" style="fill:url(#SVGID_1_);" width="30" y="0.5"/>
-<rect height="1" style="fill:#E0E0E0;" width="30"/>
-<rect height="1" style="fill:#E0E0E0;" width="30" y="59"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="59.2354" y2="-0.6073">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
-</g>
-<g>
-<rect height="60" style="fill:none;" width="30"/>
-</g>
-</g>
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="60" width="30"/>
+<rect fill="#AAAAAF" height="60" width="30"/>
+<rect fill="#C8C8C8" height="56" width="30" y="2"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_cl.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_cl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" style="enable-background:new 0 0 30 60;" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect height="59" style="fill:url(#SVGID_1_);" width="30.006" x="-0.003" y="0.5"/>
-<rect height="1" style="fill:#E0E0E0;" width="30" x="0.003"/>
-<rect height="1" style="fill:#E0E0E0;" width="30" x="0.003" y="59"/>
-<g>
-<polygon points="1.003,58 0.003,58 0.003,2 1.003,2 1.003,58   " style="fill:#FFFFFF;"/>
-</g>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="59.2354" y2="-0.6073">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
-</g>
-<g>
-<rect height="60" style="fill:none;" width="30"/>
-</g>
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="60" width="30"/>
+<rect fill="#AAAAAF" height="60" width="30"/>
+<rect fill="#C8C8C8" height="56" width="28" x="2" y="2"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_cr.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_cr.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" style="enable-background:new 0 0 30 60;" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<rect height="59" style="fill:url(#SVGID_1_);" width="29.993" x="0.003" y="0.5"/>
-<rect height="1" style="fill:#E0E0E0;" width="30.006" x="-0.003"/>
-<rect height="1" style="fill:#E0E0E0;" width="30.006" x="-0.003" y="59"/>
-<g>
-<polygon points="30.003,58 29.003,58 29.003,2 30.003,2 30.003,58   " style="fill:#E0E0E0;"/>
-</g>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="59.2354" y2="-0.6073">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
-</g>
-<g>
-<rect height="60" style="fill:none;" width="30"/>
-</g>
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="60" width="30"/>
+<rect fill="#AAAAAF" height="60" width="30"/>
+<rect fill="#C8C8C8" height="56" width="28" y="2"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_l.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_l.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" style="enable-background:new 0 0 30 60;" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<path d="M30,0.5H3.131C1.68,0.5,0.5,2.07,0.5,4v52c0,1.93,1.18,3.5,2.631,3.5H30V0.5z" style="fill:url(#SVGID_1_);"/>
-<path d="M29.993,59H3.131C1.976,59,1,57.626,1,56V4c0-1.626,0.976-3,2.131-3h26.862V0H3.131   C1.402,0,0,1.791,0,4v52c0,2.207,1.402,4,3.131,4h26.862V59z" style="fill:#E0E0E0;"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.2505" x2="15.2505" y1="59.2354" y2="-0.6073">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
-</g>
-<g>
-<polygon points="29.993,60 0,60 0,0 30,0  " style="fill:none;"/>
-</g>
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="60" width="30"/>
+<path d="M6,0C2.699,0,0,2.7,0,6v48c0,3.3,2.699,6,6,6h24V0H6z" fill="#AAAAAF"/>
+<path d="M6,58c-2.206,0-4-1.794-4-4V6c0-2.206,1.794-4,4-4h24v56H6z" fill="#C8C8C8"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_r.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_disabled_r.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60px" style="enable-background:new 0 0 30 60;" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
-<path d="M0,0.5h26.869c1.45,0,2.631,1.57,2.631,3.5v52c0,1.93-1.181,3.5-2.631,3.5H0V0.5z" style="fill:url(#SVGID_1_);"/>
-<path d="M0.007,59h26.862C28.024,59,29,57.626,29,56V4c0-1.626-0.976-3-2.131-3H0.007V0h26.862   C28.598,0,30,1.791,30,4v52c0,2.207-1.402,4-3.131,4H0.007V59z" style="fill:#E0E0E0;"/>
-<defs>
-<linearGradient gradientTransform="matrix(-1 0 0 1 30 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.2505" x2="15.2505" y1="59.2354" y2="-0.6073">
-<stop offset="0" style="stop-color:#D2D2D2"/>
-<stop offset="1" style="stop-color:#AAAAAA"/>
-</linearGradient>
-</defs>
-</g>
-<g>
-<polygon points="0.007,60 30,60 30,0 0,0  " style="fill:none;"/>
-</g>
+<svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="60" width="30"/>
+<path d="M24,0H0v60h24c3.299,0,6-2.7,6-6V6C30,2.7,27.299,0,24,0z" fill="#AAAAAF"/>
+<path d="M0,58V2h24c2.206,0,4,1.794,4,4v48c0,2.206-1.794,4-4,4H0z" fill="#C8C8C8"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_c.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_c.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,14 +2,14 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="60" width="30"/>
-<rect fill="#14141E" fill-opacity="0.2" height="60" stroke-opacity="0.2" width="30"/>
+<rect fill="#96969B" height="60" width="30"/>
 <rect fill="url(#SVGID_1_)" height="58" width="30" y="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="58"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="1"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="30" y="58"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="30" y="1"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1" y2="59.0005">
 <stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="1" style="stop-color:#D2D2DC"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_cl.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_cl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,15 +2,15 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="60" width="30"/>
-<rect fill="#14141E" fill-opacity="0.2" height="60" stroke-opacity="0.2" width="30"/>
+<rect fill="#96969B" height="60" width="30"/>
 <rect fill="url(#SVGID_1_)" height="58" width="30" y="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="58"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="58" stroke-opacity="0.4" width="1" y="1"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="30" y="58"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="30" y="1"/>
+<rect fill="#FFFFFF" fill-opacity="0.8" height="58" stroke-opacity="0.8" width="1" y="1"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1" y2="59.0005">
 <stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="1" style="stop-color:#D2D2DC"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_cr.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_cr.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,15 +2,15 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="60" width="30"/>
-<rect fill="#14141E" fill-opacity="0.2" height="60" stroke-opacity="0.2" width="30"/>
+<rect fill="#96969B" height="60" width="30"/>
 <rect fill="url(#SVGID_1_)" height="58" width="30" y="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="58"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="30" y="1"/>
-<rect fill="#9696A0" fill-opacity="0.5" height="58" stroke-opacity="0.5" width="1" x="29" y="1"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="30" y="58"/>
+<rect fill="#FFFFFF" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="30" y="1"/>
+<rect fill-opacity="0.2" height="58" stroke-opacity="0.2" width="1" x="29" y="1"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1" y2="59.0005">
 <stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="1" style="stop-color:#D2D2DC"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_l.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_l.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,13 +2,13 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="60" width="30"/>
-<path d="M6,0C2.7,0,0,2.7,0,6v48c0,3.3,2.7,6,6,6h24V0H6z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v48c0,2.757,2.243,5,5,5h24V1H6z" fill="url(#SVGID_1_)"/>
-<path d="M6,58c-2.206,0-4-1.795-4-4V6c0-2.205,1.794-4,4-4h24V1H6C3.243,1,1,3.243,1,6v48  c0,2.757,2.243,5,5,5h24v-1H6z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M6,0C2.699,0,0,2.7,0,6v48c0,3.3,2.699,6,6,6h24V0H6z" fill="#96969B"/>
+<path d="M6,1C3.242,1,1,3.243,1,6v48c0,2.757,2.242,5,5,5h24V1H6z" fill="url(#SVGID_1_)"/>
+<path d="M6,58c-2.207,0-4-1.795-4-4V6c0-2.205,1.793-4,4-4h24V1H6C3.242,1,1,3.243,1,6v48  c0,2.757,2.242,5,5,5h24v-1H6z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.5" x2="15.5" y1="1" y2="59.0005">
 <stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="1" style="stop-color:#D2D2DC"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_r.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_normal_r.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,13 +2,13 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="60" width="30"/>
-<path d="M24,0H0v60h24c3.3,0,6-2.7,6-6V6C30,2.7,27.3,0,24,0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M24,1H0v58h24c2.757,0,5-2.243,5-5V6C29,3.243,26.757,1,24,1z" fill="url(#SVGID_1_)"/>
-<path d="M24,1H0v1h24c2.205,0,4,1.795,4,4v48c0,2.205-1.795,4-4,4H0v1h24c2.757,0,5-2.243,5-5V6  C29,3.243,26.757,1,24,1z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M24,0H0v60h24c3.299,0,6-2.7,6-6V6C30,2.7,27.299,0,24,0z" fill="#96969B"/>
+<path d="M24,1H0v58h24c2.756,0,5-2.243,5-5V6C29,3.243,26.756,1,24,1z" fill="url(#SVGID_1_)"/>
+<path d="M24,1H0v1h24c2.205,0,4,1.795,4,4v48c0,2.205-1.795,4-4,4H0v1h24c2.756,0,5-2.243,5-5V6  C29,3.243,26.756,1,24,1z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.5" x2="14.5" y1="1" y2="59.0005">
 <stop offset="0" style="stop-color:#FAFAFF"/>
-<stop offset="1" style="stop-color:#D2D2DC"/>
+<stop offset="1" style="stop-color:#D2D2D7"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_c.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_c.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,16 +2,17 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="60" width="30"/>
-<rect fill="#14141E" fill-opacity="0.2" height="60" stroke-opacity="0.2" width="30"/>
-<rect fill="url(#SVGID_1_)" height="58" width="30" y="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="30" y="2"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="30" y="57"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="30" y="1"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="30" y="58"/>
+<rect fill="url(#SVGID_1_)" height="60" width="30"/>
+<rect fill-opacity="0.05" height="5" width="30"/>
+<rect fill-opacity="0.1" height="4" width="30"/>
+<rect fill-opacity="0.1" height="3" width="30"/>
+<rect fill-opacity="0.1" height="2" width="30"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="30" y="59"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="30"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="59" y2="1.0005">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="60" y2="4.882813e-004">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_cl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_cl.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_cl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,15 +2,16 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="60" width="30"/>
-<rect fill="#14141E" fill-opacity="0.2" height="60" stroke-opacity="0.2" width="30"/>
-<rect fill="url(#SVGID_1_)" height="58" width="30" y="1"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="30" y="1"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="30" y="58"/>
-<polygon fill="#FFFFFF" fill-opacity="0.2" points="30,3 30,2 0,2 0,58 30,58 30,57 1,57 1,3 " stroke-opacity="0.2"/>
+<rect fill="url(#SVGID_1_)" height="60" width="30"/>
+<polygon fill-opacity="0.05" points="0,0 0,60 2,60 2,5 30,5 30,0 "/>
+<rect fill-opacity="0.1" height="4" width="30"/>
+<rect fill-opacity="0.1" height="3" width="30"/>
+<rect fill-opacity="0.1" height="2" width="30"/>
+<polygon fill-opacity="0.2" points="1,59 1,1 30,1 30,0 0,0 0,60 30,60 30,59 " stroke-opacity="0.2"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="59" y2="1.0005">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="60" y2="4.882813e-004">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_cr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_cr.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_cr.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,15 +2,16 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="60" width="30"/>
-<rect fill="#14141E" fill-opacity="0.2" height="60" stroke-opacity="0.2" width="30"/>
-<rect fill="url(#SVGID_1_)" height="58" width="30" y="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="29" y="2"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="29" y="57"/>
-<polygon fill-opacity="0.2" points="0,1 0,2 29,2 29,58 0,58 0,59 30,59 30,1 " stroke-opacity="0.2"/>
+<rect fill="url(#SVGID_1_)" height="60" width="30"/>
+<polygon fill-opacity="0.05" points="0,0 0,5 28,5 28,60 30,60 30,0 "/>
+<rect fill-opacity="0.1" height="4" width="30"/>
+<rect fill-opacity="0.1" height="3" width="30"/>
+<rect fill-opacity="0.1" height="2" width="30"/>
+<polygon fill-opacity="0.2" points="30,0 0,0 0,1 29,1 29,59 0,59 0,60 30,60 " stroke-opacity="0.2"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="59" y2="1.0005">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="60" y2="4.882813e-004">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_l.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_l.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,14 +2,16 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="60" width="30"/>
-<path d="M6,0C2.7,0,0,2.7,0,6v48c0,3.3,2.7,6,6,6h24V0H6z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6,1C3.243,1,1,3.243,1,6v48c0,2.757,2.243,5,5,5h24V1H6z" fill="url(#SVGID_1_)"/>
-<path d="M6,57c-1.654,0-3-1.346-3-3V6c0-1.654,1.346-3,3-3h24V2H6C3.794,2,2,3.794,2,6v48  c0,2.206,1.794,4,4,4h24v-1H6z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6,58c-2.206,0-4-1.795-4-4V6c0-2.205,1.794-4,4-4h24V1H6C3.243,1,1,3.243,1,6v48c0,2.757,2.243,5,5,5h24v-1  H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M6,0C2.699,0,0,2.7,0,6v48c0,3.3,2.699,6,6,6h24V0H6z" fill="url(#SVGID_1_)"/>
+<path d="M6,0C2.7,0,0,2.7,0,6v48c0,3.3,2.7,6,6,6c-2.205,0-4-1.794-4-4V6c0-0.542,0.458-1,1-1h27V0H6z" fill-opacity="0.05"/>
+<path d="M6,0C2.7,0,0,2.7,0,6c0-1.084,0.916-2,2-2h28V0H6z" fill-opacity="0.1"/>
+<path d="M6,0C2.7,0,0,2.7,0,6c0-1.654,1.346-3,3-3h27V0H6z" fill-opacity="0.1"/>
+<path d="M6,0C2.7,0,0,2.7,0,6c0-2.206,1.795-4,4-4h26V0H6z" fill-opacity="0.1"/>
+<path d="M6,59c-2.757,0-5-2.243-5-5V6c0-2.757,2.243-5,5-5h24V0H6C2.7,0,0,2.7,0,6v48c0,3.3,2.7,6,6,6h24v-1H6z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.5" x2="15.5" y1="59" y2="1.0005">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="60" y2="4.882813e-004">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_r.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsbutton_pressed_r.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,14 +2,16 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="60px" version="1.1" viewBox="0 0 30 60" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="60" width="30"/>
-<path d="M24,0H0v60h24c3.3,0,6-2.7,6-6V6C30,2.7,27.3,0,24,0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M24,1H0v58h24c2.757,0,5-2.243,5-5V6C29,3.243,26.757,1,24,1z" fill="url(#SVGID_1_)"/>
-<path d="M24,2H0v1h24c1.654,0,3,1.346,3,3v48c0,1.654-1.346,3-3,3H0v1h24c2.205,0,4-1.794,4-4V6  C28,3.794,26.205,2,24,2z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M24,1H0v1h24c2.205,0,4,1.795,4,4v48c0,2.205-1.795,4-4,4H0v1h24c2.757,0,5-2.243,5-5V6  C29,3.243,26.757,1,24,1z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M24,0H0v60h24c3.299,0,6-2.7,6-6V6C30,2.7,27.299,0,24,0z" fill="url(#SVGID_1_)"/>
+<path d="M24,0H0v5h27c0.542,0,1,0.458,1,1v50c0,2.206-1.795,4-4,4c3.3,0,6-2.7,6-6V6C30,2.7,27.3,0,24,0z" fill-opacity="0.05"/>
+<path d="M24,0H0v4h28c1.084,0,2,0.916,2,2C30,2.7,27.3,0,24,0z" fill-opacity="0.1"/>
+<path d="M24,0H0v3h27c1.654,0,3,1.346,3,3C30,2.7,27.3,0,24,0z" fill-opacity="0.1"/>
+<path d="M24,0H0v2h26c2.205,0,4,1.794,4,4C30,2.7,27.3,0,24,0z" fill-opacity="0.1"/>
+<path d="M24,0H0v1h24c2.757,0,5,2.243,5,5v48c0,2.757-2.243,5-5,5H0v1h24c3.3,0,6-2.7,6-6V6C30,2.7,27.3,0,24,0z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.5" x2="14.5" y1="59" y2="1.0005">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="60" y2="4.882813e-004">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_b.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_b.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 62 10" width="62px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="62"/>
+<g fill-opacity="0.1" stroke-opacity="0.1">
+<rect fill="#14141E" height="10" width="62"/>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<rect fill="#14141E" height="9" width="62"/>
+</g>
+<g>
+<rect fill="url(#SVGID_1_)" height="8" width="62"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.9995" x2="30.9995" y1="-71.1655" y2="7.6982">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.92" style="stop-color:#9B9BA0"/>
+<stop offset="0.92" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
+</linearGradient>
+</defs>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<rect fill="#FFFFFF" height="1" width="62" y="6"/>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<rect height="1" width="62" y="7"/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_bl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_bl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10"/>
+<g fill-opacity="0.1" stroke-opacity="0.1">
+<rect fill="#14141E" height="10" width="10"/>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<rect fill="#14141E" height="9" width="10"/>
+</g>
+<g>
+<rect fill="url(#SVGID_1_)" height="8" width="10"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-71.1655" y2="7.6982">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.92" style="stop-color:#9B9BA0"/>
+<stop offset="0.92" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
+</linearGradient>
+</defs>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<polygon fill="#FFFFFF" points="1,0 1,7 10,7 10,6 2,6 2,0  "/>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<polygon points="0,0 0,8 10,8 10,7 1,7 1,0  "/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_br.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_br.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10"/>
+<g fill-opacity="0.1" stroke-opacity="0.1">
+<rect fill="#14141E" height="10" width="10"/>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<rect fill="#14141E" height="9" width="10"/>
+</g>
+<g>
+<rect fill="url(#SVGID_1_)" height="8" width="10"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-71.1655" y2="7.6982">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.92" style="stop-color:#9B9BA0"/>
+<stop offset="0.92" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
+</linearGradient>
+</defs>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<polygon fill="#FFFFFF" points="8,6 0,6 0,7 9,7 9,0 8,0  "/>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<polygon points="9,7 0,7 0,8 10,8 10,0 9,0  "/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_c.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="62px" version="1.1" viewBox="0 0 62 62" width="62px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="62" width="62"/>
+<g>
+<rect fill="url(#SVGID_1_)" height="62" width="62"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.9995" x2="30.9995" y1="-9.166" y2="69.6984">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.92" style="stop-color:#9B9BA0"/>
+<stop offset="0.92" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_l.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="62px" version="1.1" viewBox="0 0 10 62" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="62" width="10"/>
+<g>
+<rect fill="url(#SVGID_1_)" height="62" width="10"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-9.166" y2="69.6984">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.92" style="stop-color:#9B9BA0"/>
+<stop offset="0.92" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
+</linearGradient>
+</defs>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<rect fill="#FFFFFF" height="62" width="1" x="1"/>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<rect height="62" width="1"/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_r.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="62px" version="1.1" viewBox="0 0 10 62" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="62" width="10"/>
+<g>
+<rect fill="url(#SVGID_1_)" height="62" width="10"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="-9.166" y2="69.6984">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.92" style="stop-color:#9B9BA0"/>
+<stop offset="0.92" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
+</linearGradient>
+</defs>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<rect fill="#FFFFFF" height="62" width="1" x="8"/>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<rect height="62" width="1" x="9"/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_t.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_t.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 62 10" width="62px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="62"/>
+<g fill-opacity="0.1" stroke-opacity="0.1">
+<rect fill="#14141E" height="10" width="62"/>
+</g>
+<g>
+<rect fill="url(#SVGID_1_)" height="9" width="62" y="1"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.9995" x2="30.9995" y1="0.834" y2="79.6977">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.92" style="stop-color:#9B9BA0"/>
+<stop offset="0.92" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
+</linearGradient>
+</defs>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<rect fill="#FFFFFF" height="1" width="62" y="2"/>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<rect height="1" width="62" y="1"/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_tl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_tl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10"/>
+<g fill-opacity="0.1" stroke-opacity="0.1">
+<rect fill="#14141E" height="10" width="10"/>
+</g>
+<g>
+<rect fill="url(#SVGID_1_)" height="9" width="10" y="1"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="0.834" y2="79.6977">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.92" style="stop-color:#9B9BA0"/>
+<stop offset="0.92" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
+</linearGradient>
+</defs>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<polygon fill="#FFFFFF" points="2,3 10,3 10,2 1,2 1,10 2,10  "/>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<polygon points="1,2 10,2 10,1 0,1 0,10 1,10  "/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_tr.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_latched_tr.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10"/>
+<g fill-opacity="0.1" stroke-opacity="0.1">
+<rect fill="#14141E" height="10" width="10"/>
+</g>
+<g>
+<rect fill="url(#SVGID_1_)" height="9" width="10" y="1"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="0.834" y2="79.6977">
+<stop offset="0" style="stop-color:#CDCDD2"/>
+<stop offset="0.92" style="stop-color:#9B9BA0"/>
+<stop offset="0.92" style="stop-color:#919196"/>
+<stop offset="1" style="stop-color:#87878C"/>
+</linearGradient>
+</defs>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<polygon fill="#FFFFFF" points="9,2 0,2 0,3 8,3 8,10 9,10  "/>
+</g>
+<g fill-opacity="0.2" stroke-opacity="0.2">
+<polygon points="10,1 0,1 0,2 9,2 9,10 10,10  "/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_b.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_b.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,27 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="10px" version="1.1" viewBox="10 0 162 10" width="162px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="10" width="10"/>
-<rect fill="none" height="10" width="162" x="10"/>
-<g fill-opacity="0.1" stroke-opacity="0.1">
-<rect fill="#14141E" height="10" width="162" x="10"/>
-</g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<rect fill="#14141E" height="9" width="162" x="10"/>
-</g>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 62 10" width="62px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="62"/>
 <g>
-<rect fill="url(#SVGID_1_)" height="8" width="162" x="10"/>
+<rect fill="url(#SVGID_1_)" height="10" width="62"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="91" x2="91" y1="8" y2="-70.836">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.0005" x2="31.0005" y1="9.875" y2="-71.9095">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<rect fill="#FFFFFF" height="1" width="162" x="10" y="6"/>
-</g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<rect height="1" width="162" x="10" y="7"/>
-</g>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="62" y="9"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_bl.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_bl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,26 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="10" width="10" x="0"/>
-<g fill-opacity="0.1" stroke-opacity="0.1">
-<rect fill="#14141E" height="10" width="10"/>
-</g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<rect fill="#14141E" height="9" width="10"/>
-</g>
+<rect fill="none" height="10" width="10"/>
 <g>
-<rect fill="url(#SVGID_1_)" height="8" width="10"/>
+<rect fill="url(#SVGID_1_)" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="8" y2="-70.836">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="9.875" y2="-71.9095">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<polygon fill="#FFFFFF" points="1,0 1,7 10,7 10,6 2,6 2,0  "/>
-</g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<polygon points="0,0 0,8 10,8 10,7 1,7 1,0  "/>
-</g>
+<rect fill-opacity="0.05" height="10" width="2"/>
+<polygon fill-opacity="0.2" points="1,9 1,0 0,0 0,10 10,10 10,9 " stroke-opacity="0.2"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_br.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_br.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,25 +2,15 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="10" width="10"/>
-<g fill-opacity="0.1" stroke-opacity="0.1">
-<rect fill="#14141E" height="10" width="10"/>
-</g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<rect fill="#14141E" height="9" width="10"/>
-</g>
 <g>
-<rect fill="url(#SVGID_1_)" height="8" width="10"/>
+<rect fill="url(#SVGID_1_)" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="8" y2="-70.836">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="9.875" y2="-71.9095">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<polygon fill="#FFFFFF" points="8,6 0,6 0,7 9,7 9,0 8,0  "/>
-</g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<polygon points="9,7 0,7 0,8 10,8 10,0 9,0  "/>
-</g>
+<rect fill-opacity="0.05" height="10" width="2" x="8"/>
+<polygon fill-opacity="0.2" points="10,0 9,0 9,9 0,9 0,10 10,10 " stroke-opacity="0.2"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_c.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_c.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="62px" version="1.1" viewBox="0 0 62 62" width="62px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="62" width="62"/>
+<g>
 <rect fill="url(#SVGID_1_)" height="62" width="62"/>
 <defs>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -101.0195 -54.4805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="132.0205" x2="132.0205" y1="-124.4795" y2="-45.644">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.0005" x2="31.0005" y1="71.875" y2="-9.9088">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_l.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_l.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="62px" version="1.1" viewBox="0 0 10 62" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="62" width="10" x="0"/>
-<g fill-opacity="0.1" stroke-opacity="0.1">
-<rect fill="#14141E" height="62" width="10"/>
-</g>
+<rect fill="none" height="62" width="10"/>
 <g>
 <rect fill="url(#SVGID_1_)" height="62" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="70" y2="-8.8355">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="71.875" y2="-9.9088">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<rect fill="#FFFFFF" height="62" width="1" x="1"/>
-</g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<rect height="62" width="1"/>
-</g>
+<rect fill-opacity="0.05" height="62" width="2"/>
+<rect fill-opacity="0.2" height="62" stroke-opacity="0.2" width="1"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_r.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_r.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,22 +2,15 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="62px" version="1.1" viewBox="0 0 10 62" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="62" width="10"/>
-<g fill-opacity="0.1" stroke-opacity="0.1">
-<rect fill="#14141E" height="62" width="10"/>
-</g>
 <g>
 <rect fill="url(#SVGID_1_)" height="62" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="70" y2="-8.8355">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="71.875" y2="-9.9088">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<rect fill="#FFFFFF" height="62" width="1" x="8"/>
-</g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<rect height="62" width="1" x="9"/>
-</g>
+<rect fill-opacity="0.05" height="62" width="2" x="8"/>
+<rect fill-opacity="0.2" height="62" stroke-opacity="0.2" width="1" x="9"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_t.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_t.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,24 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="10px" version="1.1" viewBox="10 0 162 10" width="162px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="10" width="10"/>
-<rect fill="none" height="10" width="162" x="10"/>
-<g fill-opacity="0.1" stroke-opacity="0.1">
-<rect fill="#14141E" height="10" width="162" x="10"/>
-</g>
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 62 10" width="62px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="62"/>
 <g>
-<rect fill="url(#SVGID_1_)" height="9" width="162" x="10" y="1"/>
+<rect fill="url(#SVGID_1_)" height="10" width="62"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="91" x2="91" y1="80.001" y2="1.165">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.0005" x2="31.0005" y1="81.875" y2="0.0905">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<rect fill="#FFFFFF" height="1" width="162" x="10" y="2"/>
-</g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<rect height="1" width="162" x="10" y="1"/>
-</g>
+<rect fill-opacity="0.05" height="5" width="62"/>
+<rect fill-opacity="0.1" height="4" width="62"/>
+<rect fill-opacity="0.1" height="3" width="62"/>
+<rect fill-opacity="0.1" height="2" width="62"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="62"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_tl.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_tl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="10" width="10" x="0"/>
-<g fill-opacity="0.1" stroke-opacity="0.1">
-<rect fill="#14141E" height="10" width="10"/>
-</g>
+<rect fill="none" height="10" width="10"/>
 <g>
-<rect fill="url(#SVGID_1_)" height="9" width="10" y="1"/>
+<rect fill="url(#SVGID_1_)" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="80.001" y2="1.165">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="81.875" y2="0.0905">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<polygon fill="#FFFFFF" points="2,3 10,3 10,2 1,2 1,10 2,10  "/>
-</g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<polygon points="1,2 10,2 10,1 0,1 0,10 1,10  "/>
-</g>
+<polygon fill-opacity="0.05" points="0,0 0,10 2,10 2,5 10,5 10,0 "/>
+<rect fill-opacity="0.1" height="4" width="10"/>
+<rect fill-opacity="0.1" height="3" width="10"/>
+<rect fill-opacity="0.1" height="2" width="10"/>
+<polygon fill-opacity="0.2" points="0,0 0,10 1,10 1,1 10,1 10,0 " stroke-opacity="0.2"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_tr.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems2_pressed_tr.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,22 +2,18 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="10" width="10"/>
-<g fill-opacity="0.1" stroke-opacity="0.1">
-<rect fill="#14141E" height="10" width="10"/>
-</g>
 <g>
-<rect fill="url(#SVGID_1_)" height="9" width="10" y="1"/>
+<rect fill="url(#SVGID_1_)" height="10" width="10"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="80.001" y2="1.165">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="81.875" y2="0.0905">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<polygon fill="#FFFFFF" points="9,2 0,2 0,3 8,3 8,10 9,10  "/>
-</g>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<polygon points="10,1 0,1 0,2 9,2 9,10 10,10  "/>
-</g>
+<polygon fill-opacity="0.05" points="0,0 0,5 8,5 8,10 10,10 10,0 "/>
+<rect fill-opacity="0.1" height="4" width="10"/>
+<rect fill-opacity="0.1" height="3" width="10"/>
+<rect fill-opacity="0.1" height="2" width="10"/>
+<polygon fill-opacity="0.2" points="0,0 0,1 9,1 9,10 10,10 10,0 " stroke-opacity="0.2"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_b.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_b.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 62 10" width="62px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="62"/>
+<rect fill="url(#SVGID_1_)" height="10" width="62"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="62" y="9"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.0005" x2="31.0005" y1="10" y2="-71.6335">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="1" style="stop-color:#A0A0A5"/>
+</linearGradient>
+</defs>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_bl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_bl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10"/>
+<path d="M0,0v3c0,3.859,3.14,7,7,7h3V0H0z" fill="url(#SVGID_1_)"/>
+<path d="M0,3c0,1.901,0.765,3.627,2,4.89V0H0V3z" fill-opacity="0.05"/>
+<path d="M7,9C3.691,9,1,6.309,1,3V0H0v3c0,3.859,3.14,7,7,7h3V9H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="10" y2="-71.6335">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="1" style="stop-color:#A0A0A5"/>
+</linearGradient>
+</defs>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_br.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_br.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10"/>
+<path d="M0,0v10h3c3.859,0,7-3.141,7-7V0H0z" fill="url(#SVGID_1_)"/>
+<path d="M8,7.89C9.235,6.627,10,4.901,10,3V0H8V7.89z" fill-opacity="0.05"/>
+<path d="M9,0v3c0,3.309-2.691,6-6,6H0v1h3c3.859,0,7-3.141,7-7V0H9z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="10" y2="-71.6335">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="1" style="stop-color:#A0A0A5"/>
+</linearGradient>
+</defs>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_c.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="62px" version="1.1" viewBox="0 0 62 62" width="62px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="62" width="62"/>
+<rect fill="url(#SVGID_1_)" height="62" width="62"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.0005" x2="31.0005" y1="72" y2="-9.6329">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="1" style="stop-color:#A0A0A5"/>
+</linearGradient>
+</defs>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_l.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="62px" version="1.1" viewBox="0 0 10 62" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="62" width="10"/>
+<rect fill="url(#SVGID_1_)" height="62" width="10"/>
+<rect fill-opacity="0.05" height="62" width="2"/>
+<rect fill-opacity="0.2" height="62" stroke-opacity="0.2" width="1"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="72" y2="-9.6329">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="1" style="stop-color:#A0A0A5"/>
+</linearGradient>
+</defs>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_r.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="62px" version="1.1" viewBox="0 0 10 62" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="62" width="10"/>
+<rect fill="url(#SVGID_1_)" height="62" width="10"/>
+<rect fill-opacity="0.05" height="62" width="2" x="8"/>
+<rect fill-opacity="0.2" height="62" stroke-opacity="0.2" width="1" x="9"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="72" y2="-9.6329">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="1" style="stop-color:#A0A0A5"/>
+</linearGradient>
+</defs>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_t.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_t.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 62 10" width="62px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="62"/>
+<rect fill="url(#SVGID_1_)" height="10" width="62"/>
+<rect fill-opacity="0.05" height="5" width="62"/>
+<rect fill-opacity="0.1" height="4" width="62"/>
+<rect fill-opacity="0.1" height="3" width="62"/>
+<rect fill-opacity="0.1" height="2" width="62"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="62"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.0005" x2="31.0005" y1="82.001" y2="0.3675">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="1" style="stop-color:#A0A0A5"/>
+</linearGradient>
+</defs>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_tl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_tl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10"/>
+<path d="M7,0C3.14,0,0,3.141,0,7v3h10V0H7z" fill="url(#SVGID_1_)"/>
+<path d="M7,0C3.14,0,0,3.141,0,7v3h2V7c0-1.103,0.897-2,2-2h6V0H7z" fill-opacity="0.05"/>
+<path d="M7,0C3.14,0,0,3.141,0,7c0-1.654,1.346-3,3-3h7V0H7z" fill-opacity="0.1"/>
+<path d="M7,0C3.14,0,0,3.141,0,7c0-2.206,1.794-4,4-4h6V0H7z" fill-opacity="0.1"/>
+<path d="M7,0C3.14,0,0,3.141,0,7c0-2.757,2.243-5,5-5h5V0H7z" fill-opacity="0.1"/>
+<path d="M7,0C3.14,0,0,3.141,0,7v3h1V7c0-3.309,2.691-6,6-6h3V0H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="82.001" y2="0.3675">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="1" style="stop-color:#A0A0A5"/>
+</linearGradient>
+</defs>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_tr.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_latched_tr.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10"/>
+<path d="M10,7c0-3.859-3.141-7-7-7H0v10h10V7z" fill="url(#SVGID_1_)"/>
+<path d="M3,0H0v5h6c1.104,0,2,0.897,2,2v3h2V7C10,3.141,6.859,0,3,0z" fill-opacity="0.05"/>
+<path d="M3,0H0v4h7c1.654,0,3,1.346,3,3C10,3.141,6.859,0,3,0z" fill-opacity="0.1"/>
+<path d="M3,0H0v3h6c2.205,0,4,1.794,4,4C10,3.141,6.859,0,3,0z" fill-opacity="0.1"/>
+<path d="M3,0H0v2h5c2.757,0,5,2.243,5,5C10,3.141,6.859,0,3,0z" fill-opacity="0.1"/>
+<path d="M3,0H0v1h3c3.309,0,6,2.691,6,6v3h1V7C10,3.141,6.859,0,3,0z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="82.001" y2="0.3675">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="1" style="stop-color:#A0A0A5"/>
+</linearGradient>
+</defs>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_b.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_b.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_b.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,15 +2,12 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 62 10" width="62px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="10" width="62"/>
-<rect fill="#14141E" fill-opacity="0.1" height="10" stroke-opacity="0.1" width="62"/>
-<rect fill="#14141E" fill-opacity="0.2" height="9" stroke-opacity="0.2" width="62"/>
-<rect fill="url(#SVGID_1_)" height="8" width="62"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="62" y="6"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="62" y="7"/>
+<rect fill="url(#SVGID_1_)" height="10" width="62"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="62" y="9"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.0005" x2="31.0005" y1="8" y2="-70.6289">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.0005" x2="31.0005" y1="10" y2="-71.6335">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_bl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_bl.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_bl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,15 +2,13 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="10" width="10"/>
-<path d="M0,0v3c0,3.859,3.141,7,7,7h3V0H0z" fill="#14141E" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M1,0v3c0,3.3,2.7,6,6,6h3V0H1z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M1,0v2c0,3.3,2.7,6,6,6h3V0H1z" fill="url(#SVGID_1_)"/>
-<path d="M7,6C4.794,6,3,4.205,3,2V0H2v2c0,2.757,2.243,5,5,5h3V6H7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M7,7C4.243,7,2,4.757,2,2V0H1v2c0,3.3,2.7,6,6,6h3V7H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M0,0v3c0,3.859,3.14,7,7,7h3V0H0z" fill="url(#SVGID_1_)"/>
+<path d="M0,3c0,1.901,0.765,3.627,2,4.89V0H0V3z" fill-opacity="0.05"/>
+<path d="M7,9C3.691,9,1,6.309,1,3V0H0v3c0,3.859,3.14,7,7,7h3V9H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="8" y2="-70.6289">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="10" y2="-71.6335">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_br.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_br.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_br.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,15 +2,13 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="10" width="10"/>
-<path d="M0,0v10h3c3.859,0,7-3.141,7-7V0H0z" fill="#14141E" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M0,0v9h3c3.3,0,6-2.7,6-6V0H0z" fill="#14141E" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M0,0v8h3c3.3,0,6-2.7,6-6V0H0z" fill="url(#SVGID_1_)"/>
-<path d="M7,0v2c0,2.205-1.794,4-4,4H0v1h3c2.757,0,5-2.243,5-5V0H7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M8,0v2c0,2.757-2.243,5-5,5H0v1h3c3.3,0,6-2.7,6-6V0H8z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M0,0v10h3c3.859,0,7-3.141,7-7V0H0z" fill="url(#SVGID_1_)"/>
+<path d="M8,7.89C9.235,6.627,10,4.901,10,3V0H8V7.89z" fill-opacity="0.05"/>
+<path d="M9,0v3c0,3.309-2.691,6-6,6H0v1h3c3.859,0,7-3.141,7-7V0H9z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="8" y2="-70.6289">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="10" y2="-71.6335">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_c.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_c.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_c.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,9 @@
 <rect fill="none" height="62" width="62"/>
 <rect fill="url(#SVGID_1_)" height="62" width="62"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.0005" x2="31.0005" y1="70" y2="-8.6284">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.0005" x2="31.0005" y1="72" y2="-9.6329">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_l.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_l.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_l.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,14 +2,13 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="62px" version="1.1" viewBox="0 0 10 62" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="62" width="10"/>
-<rect fill="#14141E" fill-opacity="0.1" height="62" stroke-opacity="0.1" width="10"/>
-<rect fill="url(#SVGID_1_)" height="62" width="9" x="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="62" stroke-opacity="0.2" width="1" x="2"/>
-<rect fill-opacity="0.2" height="62" stroke-opacity="0.2" width="1" x="1"/>
+<rect fill="url(#SVGID_1_)" height="62" width="10"/>
+<rect fill-opacity="0.05" height="62" width="2"/>
+<rect fill-opacity="0.2" height="62" stroke-opacity="0.2" width="1"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="70" y2="-8.6284">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="72" y2="-9.6329">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_r.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_r.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_r.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,14 +2,13 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="62px" version="1.1" viewBox="0 0 10 62" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="62" width="10"/>
-<rect fill="#14141E" fill-opacity="0.1" height="62" stroke-opacity="0.1" width="10"/>
-<rect fill="url(#SVGID_1_)" height="62" width="9"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="62" stroke-opacity="0.2" width="1" x="7"/>
-<rect fill-opacity="0.2" height="62" stroke-opacity="0.2" width="1" x="8"/>
+<rect fill="url(#SVGID_1_)" height="62" width="10"/>
+<rect fill-opacity="0.05" height="62" width="2" x="8"/>
+<rect fill-opacity="0.2" height="62" stroke-opacity="0.2" width="1" x="9"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="70" y2="-8.6284">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="72" y2="-9.6329">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_t.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_t.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_t.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,14 +2,16 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 62 10" width="62px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="10" width="62"/>
-<rect fill="#14141E" fill-opacity="0.1" height="10" stroke-opacity="0.1" width="62"/>
-<rect fill="url(#SVGID_1_)" height="9" width="62" y="1"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="62" y="2"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="62" y="1"/>
+<rect fill="url(#SVGID_1_)" height="10" width="62"/>
+<rect fill-opacity="0.05" height="5" width="62"/>
+<rect fill-opacity="0.1" height="4" width="62"/>
+<rect fill-opacity="0.1" height="3" width="62"/>
+<rect fill-opacity="0.1" height="2" width="62"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="62"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.0005" x2="31.0005" y1="80.001" y2="1.3721">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="31.0005" x2="31.0005" y1="82.001" y2="0.3675">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_tl.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_tl.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_tl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,14 +2,16 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="10" width="10"/>
-<path d="M7,0C3.141,0,0,3.14,0,7v3h10V0H7z" fill="#14141E" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M7,1C3.7,1,1,3.7,1,7v3h9V1H7z" fill="url(#SVGID_1_)"/>
-<path d="M7,2C4.243,2,2,4.243,2,7v3h1V7c0-2.206,1.794-4,4-4h3V2H7z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M7,1C3.7,1,1,3.7,1,7v3h1V7c0-2.757,2.243-5,5-5h3V1H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M7,0C3.14,0,0,3.141,0,7v3h10V0H7z" fill="url(#SVGID_1_)"/>
+<path d="M7,0C3.14,0,0,3.141,0,7v3h2V7c0-1.103,0.897-2,2-2h6V0H7z" fill-opacity="0.05"/>
+<path d="M7,0C3.14,0,0,3.141,0,7c0-1.654,1.346-3,3-3h7V0H7z" fill-opacity="0.1"/>
+<path d="M7,0C3.14,0,0,3.141,0,7c0-2.206,1.794-4,4-4h6V0H7z" fill-opacity="0.1"/>
+<path d="M7,0C3.14,0,0,3.141,0,7c0-2.757,2.243-5,5-5h5V0H7z" fill-opacity="0.1"/>
+<path d="M7,0C3.14,0,0,3.141,0,7v3h1V7c0-3.309,2.691-6,6-6h3V0H7z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="80.001" y2="1.3721">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="82.001" y2="0.3675">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_tr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_tr.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_hsitems_pressed_tr.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,14 +2,16 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="10" width="10"/>
-<path d="M10,7c0-3.86-3.141-7-7-7H0v10h10V7z" fill="#14141E" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M9,7c0-3.3-2.7-6-6-6H0v9h9V7z" fill="url(#SVGID_1_)"/>
-<path d="M3,2H0v1h3c2.206,0,4,1.794,4,4v3h1V7C8,4.243,5.757,2,3,2z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M3,1H0v1h3c2.757,0,5,2.243,5,5v3h1V7C9,3.7,6.3,1,3,1z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M10,7c0-3.859-3.141-7-7-7H0v10h10V7z" fill="url(#SVGID_1_)"/>
+<path d="M3,0H0v5h6c1.104,0,2,0.897,2,2v3h2V7C10,3.141,6.859,0,3,0z" fill-opacity="0.05"/>
+<path d="M3,0H0v4h7c1.654,0,3,1.346,3,3C10,3.141,6.859,0,3,0z" fill-opacity="0.1"/>
+<path d="M3,0H0v3h6c2.205,0,4,1.794,4,4C10,3.141,6.859,0,3,0z" fill-opacity="0.1"/>
+<path d="M3,0H0v2h5c2.757,0,5,2.243,5,5C10,3.141,6.859,0,3,0z" fill-opacity="0.1"/>
+<path d="M3,0H0v1h3c3.309,0,6,2.691,6,6v3h1V7C10,3.141,6.859,0,3,0z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.5" x2="4.5" y1="80.001" y2="1.3721">
-<stop offset="0" style="stop-color:#65B8CC"/>
-<stop offset="1" style="stop-color:#306D8C"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="82.001" y2="0.3675">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 </defs>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_b.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_b.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="300"/>
+<rect fill="#AAAAAF" height="10" width="300"/>
+<rect fill="#C8C8C8" height="8" width="300"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_bl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_bl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10"/>
+<path d="M0,0v6c0,2.2,1.8,4,4,4h6V0H0z" fill="#AAAAAF"/>
+<path d="M2,0v6c0,1.103,0.897,2,2,2h6V0H2z" fill="#C8C8C8"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_br.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_br.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10"/>
+<path d="M0,0v10h6c2.2,0,4-1.8,4-4V0H0z" fill="#AAAAAF"/>
+<path d="M0,0v8h6c1.104,0,2-0.897,2-2V0H0z" fill="#C8C8C8"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_c.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 300 20" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="20" width="300"/>
+<rect fill="#AAAAAF" height="20" width="300"/>
+<rect fill="#C8C8C8" height="20" width="300"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_l.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="20" width="10"/>
+<rect fill="#AAAAAF" height="20" width="10"/>
+<rect fill="#C8C8C8" height="20" width="8" x="2"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_r.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="20" width="10"/>
+<rect fill="#AAAAAF" height="20" width="10"/>
+<rect fill="#C8C8C8" height="20" width="8"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_t.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_t.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="300"/>
+<rect fill="#AAAAAF" height="10" width="300"/>
+<rect fill="#C8C8C8" height="8" width="300" y="2"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_tl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_tl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10"/>
+<path d="M4,0C1.8,0,0,1.8,0,4v6h10V0H4z" fill="#AAAAAF"/>
+<path d="M4,2C2.897,2,2,2.897,2,4v6h8V2H4z" fill="#C8C8C8"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_tr.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_disabled_tr.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10"/>
+<path d="M10,4c0-2.2-1.8-4-4-4H0v10h10V4z" fill="#AAAAAF"/>
+<path d="M8,4c0-1.103-0.896-2-2-2H0v8h8V4z" fill="#C8C8C8"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_b.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_b.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="300"/>
+<rect fill="#AAAAAF" height="10" width="300"/>
+<rect fill="#C8C8C8" height="8" width="300"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_bl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_bl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10"/>
+<path d="M0,0v6c0,2.2,1.8,4,4,4h6V0H0z" fill="#AAAAAF"/>
+<path d="M2,0v6c0,1.103,0.897,2,2,2h6V0H2z" fill="#C8C8C8"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_br.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_br.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10"/>
+<path d="M0,0v10h6c2.2,0,4-1.8,4-4V0H0z" fill="#AAAAAF"/>
+<path d="M0,0v8h6c1.104,0,2-0.897,2-2V0H0z" fill="#C8C8C8"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_c.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_c.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 300 20" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="20" width="300"/>
+<rect fill="#AAAAAF" height="20" width="300"/>
+<rect fill="#C8C8C8" height="20" width="300"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_l.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="20" width="10"/>
+<rect fill="#AAAAAF" height="20" width="10"/>
+<rect fill="#C8C8C8" height="20" width="8" x="2"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_r.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 10 20" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="20" width="10"/>
+<rect fill="#AAAAAF" height="20" width="10"/>
+<rect fill="#C8C8C8" height="20" width="8"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_t.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_t.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 300 10" width="300px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="300"/>
+<rect fill="#AAAAAF" height="10" width="300"/>
+<rect fill="#C8C8C8" height="8" width="300" y="2"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_tl.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_tl.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10"/>
+<path d="M4,0C1.8,0,0,1.8,0,4v6h10V0H4z" fill="#AAAAAF"/>
+<path d="M4,2C2.897,2,2,2.897,2,4v6h8V2H4z" fill="#C8C8C8"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_tr.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_disabled_tr.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="10" width="10"/>
+<path d="M10,4c0-2.2-1.8-4-4-4H0v10h10V4z" fill="#AAAAAF"/>
+<path d="M8,4c0-1.103-0.896-2-2-2H0v8h8V4z" fill="#C8C8C8"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_b.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_b.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="url(#SVGID_1_)" height="10" width="10"/>
+<defs>
+<linearGradient gradientTransform="matrix(-1.192488e-008 1 -1 -1.192488e-008 9.9999 -9.727478e-005)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0" x2="10" y1="5" y2="5">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000;stop-opacity:0"/>
+</linearGradient>
+</defs>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_l.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_l.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="url(#SVGID_1_)" height="10" width="10"/>
+<defs>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 10 9.999)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0" x2="10" y1="4.9995" y2="4.9995">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000;stop-opacity:0"/>
+</linearGradient>
+</defs>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_r.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_r.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="url(#SVGID_1_)" height="10" width="10"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0" x2="10" y1="5" y2="5">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000;stop-opacity:0"/>
+</linearGradient>
+</defs>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_t.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_scrollarea_mask_t.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="url(#SVGID_1_)" height="10" width="10"/>
+<defs>
+<linearGradient gradientTransform="matrix(1.192488e-008 -1 1 1.192488e-008 9.727478e-005 10.0001)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="0" x2="10" y1="5" y2="5">
+<stop offset="0" style="stop-color:#000000"/>
+<stop offset="1" style="stop-color:#000000;stop-opacity:0"/>
+</linearGradient>
+</defs>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_disabled.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_disabled.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_disabled.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 20 40" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M0,20c0-5.513,4.485-10,10-10c5.513,0,10,4.487,10,10c0,5.516-4.487,10-10,10  C4.484,30,0,25.516,0,20L0,20z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M0,20c0-5.513,4.485-10,10-10c5.514,0,10,4.487,10,10c0,5.516-4.486,10-10,10  C4.484,30,0,25.516,0,20L0,20z" fill="#E4E4E4"/>
 <rect fill="none" height="40" width="20"/>
 <circle cx="10.002" cy="20" fill="#969696" r="9.23"/>
-<path d="M19.232,20c0-5.098-4.133-9.231-9.231-9.231c-5.098,0-9.229,4.134-9.229,9.231  S4.902,29.229,10,29.229C15.099,29.229,19.232,25.098,19.232,20z M1.537,20c0-4.665,3.799-8.462,8.463-8.462  c4.665,0,8.462,3.797,8.462,8.462c0,4.664-3.797,8.463-8.462,8.463C5.336,28.463,1.537,24.664,1.537,20z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M19.232,20c0-5.098-4.133-9.231-9.231-9.231c-5.098,0-9.229,4.134-9.229,9.231  c0,5.098,4.13,9.229,9.228,9.229C15.1,29.229,19.232,25.098,19.232,20z M1.537,20c0-4.665,3.799-8.462,8.463-8.462  c4.665,0,8.462,3.797,8.462,8.462c0,4.664-3.797,8.463-8.462,8.463C5.336,28.463,1.537,24.664,1.537,20z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_normal.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_normal.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_normal.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,19 +2,19 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 20 40" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="40" width="20"/>
-<path d="M10,30C4.487,30,0,25.516,0,20c0-5.513,4.487-10,10-10c5.516,0,10,4.487,10,10  C20,25.516,15.516,30,10,30L10,30z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -277.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="287.4785" x2="287.4785" y1="-370.7881" y2="-389.248">
+<path d="M10,30C4.487,30,0,25.516,0,20c0-5.513,4.487-10,10-10c5.516,0,10,4.487,10,10  C20,25.516,15.516,30,10,30L10,30z" fill="#E4E4E4"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -569.9609 -786.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="579.9609" x2="579.9609" y1="796.8086" y2="815.2676">
 <stop offset="0" style="stop-color:#FAFAFA"/>
 <stop offset="1" style="stop-color:#EBEBF5"/>
 </linearGradient>
 <circle cx="10" cy="19.999" fill="url(#SVGID_1_)" r="9.23"/>
-<path d="M10,11.538c-4.665,0-8.462,3.797-8.462,8.462  c0,4.664,3.797,8.463,8.462,8.463c4.664,0,8.463-3.799,8.463-8.463C18.463,15.335,14.664,11.538,10,11.538z M10,27.691  c-4.243,0-7.691-3.449-7.691-7.691c0-4.243,3.449-7.691,7.691-7.691c4.242,0,7.691,3.449,7.691,7.691  C17.691,24.242,14.242,27.691,10,27.691z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M10,11.538c-4.665,0-8.462,3.797-8.462,8.462  c0,4.664,3.797,8.463,8.462,8.463c4.664,0,8.463-3.799,8.463-8.463C18.463,15.335,14.664,11.538,10,11.538z M10,27.691  c-4.243,0-7.691-3.449-7.691-7.691c0-4.243,3.449-7.691,7.691-7.691s7.691,3.449,7.691,7.691S14.242,27.691,10,27.691z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <circle cx="10" cy="20.001" fill="#FFFFFF" fill-opacity="0.5" r="4.616" stroke-opacity="0.5"/>
-<path d="M10,10.769c-5.098,0-9.231,4.133-9.231,9.231S4.902,29.229,10,29.229  s9.229-4.13,9.229-9.229S15.098,10.769,10,10.769z M10,28.463c-4.665,0-8.462-3.799-8.462-8.463c0-4.665,3.797-8.462,8.462-8.462  c4.664,0,8.463,3.797,8.463,8.462C18.463,24.664,14.664,28.463,10,28.463z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -277.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="287.4805" x2="287.4805" y1="-383.8652" y2="-376.1738">
+<path d="M10,10.769c-5.098,0-9.231,4.133-9.231,9.231c0,5.098,4.133,9.229,9.231,9.229  c5.098,0,9.229-4.129,9.229-9.229C19.229,14.901,15.098,10.769,10,10.769z M10,28.463c-4.665,0-8.462-3.799-8.462-8.463  c0-4.665,3.797-8.462,8.462-8.462c4.664,0,8.463,3.797,8.463,8.462C18.463,24.664,14.664,28.463,10,28.463z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -569.9609 -786.0391)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="579.96" x2="579.96" y1="809.8857" y2="802.1934">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 <circle cx="10" cy="20" fill="url(#SVGID_2_)" r="3.846"/>
-<path d="M10,16.154c-2.124,0-3.846,1.722-3.846,3.846c0,2.123,1.722,3.846,3.846,3.846  c2.123,0,3.846-1.723,3.846-3.846C13.846,17.876,12.123,16.154,10,16.154z M10,23.076c-1.696,0-3.077-1.38-3.077-3.076  S8.304,16.923,10,16.923c1.695,0,3.076,1.381,3.076,3.077S11.695,23.076,10,23.076z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M10,16.154c-2.124,0-3.846,1.722-3.846,3.846c0,2.123,1.722,3.846,3.846,3.846  c2.123,0,3.846-1.723,3.846-3.846C13.846,17.876,12.123,16.154,10,16.154z M10,23.076c-1.696,0-3.077-1.381-3.077-3.076  c0-1.696,1.381-3.077,3.077-3.077c1.695,0,3.076,1.381,3.076,3.077C13.076,21.695,11.695,23.076,10,23.076z" fill-opacity="0.1" stroke-opacity="0.1"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_pressed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_pressed.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_pressed.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,19 +2,19 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="40px" version="1.1" viewBox="0 0 20 40" width="20px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="40" width="20"/>
-<path d="M10,30C4.487,30,0,25.516,0,20c0-5.513,4.487-10,10-10c5.516,0,10,4.487,10,10  C20,25.516,15.516,30,10,30L10,30z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -287.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="297.4785" x2="297.4785" y1="-370.7881" y2="-389.248">
+<path d="M10,30C4.487,30,0,25.516,0,20c0-5.513,4.487-10,10-10c5.516,0,10,4.487,10,10  C20,25.516,15.516,30,10,30L10,30z" fill="#E4E4E4"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -579.9609 -786.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="589.9609" x2="589.9609" y1="796.8086" y2="815.2676">
 <stop offset="0" style="stop-color:#C8C8D2"/>
 <stop offset="1" style="stop-color:#F0F0FA"/>
 </linearGradient>
 <circle cx="10" cy="19.999" fill="url(#SVGID_1_)" r="9.23"/>
-<path d="M10,11.538c-4.665,0-8.462,3.797-8.462,8.462  c0,4.664,3.797,8.463,8.462,8.463c4.664,0,8.463-3.799,8.463-8.463C18.463,15.335,14.664,11.538,10,11.538z M10,27.691  c-4.243,0-7.691-3.449-7.691-7.691c0-4.243,3.449-7.691,7.691-7.691c4.242,0,7.691,3.449,7.691,7.691  C17.691,24.242,14.242,27.691,10,27.691z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M10,11.538c-4.665,0-8.462,3.797-8.462,8.462  c0,4.664,3.797,8.463,8.462,8.463c4.664,0,8.463-3.799,8.463-8.463C18.463,15.335,14.664,11.538,10,11.538z M10,27.691  c-4.243,0-7.691-3.449-7.691-7.691c0-4.243,3.449-7.691,7.691-7.691s7.691,3.449,7.691,7.691S14.242,27.691,10,27.691z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <circle cx="10" cy="20.001" fill="#FFFFFF" fill-opacity="0.2" r="4.616" stroke-opacity="0.2"/>
-<path d="M10,10.769c-5.098,0-9.231,4.133-9.231,9.231S4.902,29.229,10,29.229  s9.229-4.13,9.229-9.229S15.098,10.769,10,10.769z M10,28.463c-4.665,0-8.462-3.799-8.462-8.463c0-4.665,3.797-8.462,8.462-8.462  c4.664,0,8.463,3.797,8.463,8.462C18.463,24.664,14.664,28.463,10,28.463z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -287.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="297.4795" x2="297.4795" y1="-376.1738" y2="-383.8652">
+<path d="M10,10.769c-5.098,0-9.231,4.133-9.231,9.231c0,5.098,4.133,9.229,9.231,9.229  c5.098,0,9.229-4.129,9.229-9.229C19.229,14.901,15.098,10.769,10,10.769z M10,28.463c-4.665,0-8.462-3.799-8.462-8.463  c0-4.665,3.797-8.462,8.462-8.462c4.664,0,8.463,3.797,8.463,8.462C18.463,24.664,14.664,28.463,10,28.463z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -579.9609 -786.0391)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="589.9609" x2="589.9609" y1="802.1934" y2="809.8848">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 <circle cx="10" cy="20" fill="url(#SVGID_2_)" r="3.846"/>
-<path d="M10,16.154c-2.124,0-3.846,1.722-3.846,3.846c0,2.123,1.722,3.846,3.846,3.846  c2.123,0,3.846-1.723,3.846-3.846C13.846,17.876,12.123,16.154,10,16.154z M10,23.076c-1.695,0-3.077-1.38-3.077-3.076  S8.305,16.923,10,16.923s3.076,1.381,3.076,3.077S11.695,23.076,10,23.076z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M10,16.154c-2.124,0-3.846,1.722-3.846,3.846c0,2.123,1.722,3.846,3.846,3.846  c2.123,0,3.846-1.723,3.846-3.846C13.846,17.876,12.123,16.154,10,16.154z M10,23.076c-1.695,0-3.077-1.381-3.077-3.076  c0-1.696,1.382-3.077,3.077-3.077c1.695,0,3.076,1.381,3.076,3.077C13.076,21.695,11.695,23.076,10,23.076z" fill-opacity="0.1" stroke-opacity="0.1"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_disabled.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_disabled.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_disabled.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M20,20c-5.513,0-10-4.484-10-10c0-5.513,4.487-10,10-10c5.516,0,10,4.487,10,10  C30,15.516,25.516,20,20,20L20,20z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<rect fill="none" height="20" width="40" y="0"/>
+<path d="M20,20c-5.513,0-10-4.484-10-10c0-5.513,4.487-10,10-10c5.516,0,10,4.487,10,10  C30,15.516,25.516,20,20,20L20,20z" fill="#E4E4E4"/>
+<rect fill="none" height="20" width="40"/>
 <circle cx="20" cy="9.999" fill="#969696" r="9.23"/>
-<path d="M20,0.769c-5.098,0-9.231,4.133-9.231,9.231c0,5.098,4.134,9.229,9.231,9.229  s9.229-4.131,9.229-9.229C29.229,4.901,25.098,0.769,20,0.769z M20,18.463c-4.665,0-8.462-3.799-8.462-8.463S15.335,1.538,20,1.538  c4.664,0,8.463,3.797,8.463,8.462S24.664,18.463,20,18.463z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M20,0.769c-5.098,0-9.231,4.133-9.231,9.231c0,5.098,4.134,9.229,9.231,9.229  c5.098,0,9.229-4.131,9.229-9.229C29.229,4.901,25.098,0.769,20,0.769z M20,18.463c-4.665,0-8.462-3.799-8.462-8.463  S15.335,1.538,20,1.538c4.664,0,8.463,3.797,8.463,8.462S24.664,18.463,20,18.463z" fill-opacity="0.2" stroke-opacity="0.2"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_normal.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_normal.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_normal.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,19 +2,19 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="20" width="40"/>
-<path d="M20,20c-5.513,0-10-4.484-10-10c0-5.513,4.487-10,10-10c5.516,0,10,4.487,10,10  C30,15.516,25.516,20,20,20L20,20z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -277.4805 -380.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="297.4785" x2="297.4785" y1="-380.7881" y2="-399.248">
+<path d="M20,20c-5.513,0-10-4.484-10-10c0-5.513,4.487-10,10-10c5.516,0,10,4.487,10,10  C30,15.516,25.516,20,20,20L20,20z" fill="#E4E4E4"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -569.9609 -806.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="589.9609" x2="589.9609" y1="806.8086" y2="825.2676">
 <stop offset="0" style="stop-color:#FAFAFA"/>
 <stop offset="1" style="stop-color:#EBEBF5"/>
 </linearGradient>
 <circle cx="20" cy="9.999" fill="url(#SVGID_1_)" r="9.23"/>
-<path d="M20,1.538c-4.665,0-8.462,3.797-8.462,8.462  c0,4.664,3.797,8.463,8.462,8.463c4.664,0,8.463-3.799,8.463-8.463C28.463,5.335,24.664,1.538,20,1.538z M20,17.691  c-4.243,0-7.691-3.449-7.691-7.691c0-4.243,3.449-7.691,7.691-7.691c4.242,0,7.691,3.449,7.691,7.691  C27.691,14.242,24.242,17.691,20,17.691z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20,1.538c-4.665,0-8.462,3.797-8.462,8.462  c0,4.664,3.797,8.463,8.462,8.463c4.664,0,8.463-3.799,8.463-8.463C28.463,5.335,24.664,1.538,20,1.538z M20,17.691  c-4.243,0-7.691-3.449-7.691-7.691c0-4.243,3.449-7.691,7.691-7.691S27.691,5.758,27.691,10S24.242,17.691,20,17.691z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <circle cx="20" cy="10.001" fill="#FFFFFF" fill-opacity="0.5" r="4.616" stroke-opacity="0.5"/>
-<path d="M20,0.769c-5.098,0-9.231,4.133-9.231,9.231s4.134,9.229,9.231,9.229  s9.229-4.13,9.229-9.229S25.098,0.769,20,0.769z M20,18.463c-4.665,0-8.462-3.799-8.462-8.463c0-4.665,3.797-8.462,8.462-8.462  c4.664,0,8.463,3.797,8.463,8.462C28.463,14.664,24.664,18.463,20,18.463z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -277.4805 -380.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="297.4805" x2="297.4805" y1="-393.8652" y2="-386.1738">
+<path d="M20,0.769c-5.098,0-9.231,4.133-9.231,9.231c0,5.098,4.134,9.229,9.231,9.229  c5.098,0,9.229-4.129,9.229-9.229C29.229,4.901,25.098,0.769,20,0.769z M20,18.463c-4.665,0-8.462-3.799-8.462-8.463  c0-4.665,3.797-8.462,8.462-8.462c4.664,0,8.463,3.797,8.463,8.462C28.463,14.664,24.664,18.463,20,18.463z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -569.9609 -806.0391)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="589.96" x2="589.96" y1="819.8857" y2="812.1934">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 <circle cx="20" cy="10" fill="url(#SVGID_2_)" r="3.846"/>
-<path d="M20,6.154c-2.124,0-3.846,1.722-3.846,3.846c0,2.123,1.722,3.846,3.846,3.846  c2.123,0,3.846-1.723,3.846-3.846C23.846,7.876,22.123,6.154,20,6.154z M20,13.076c-1.696,0-3.077-1.38-3.077-3.076  S18.304,6.923,20,6.923c1.695,0,3.076,1.381,3.076,3.077S21.695,13.076,20,13.076z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M20,6.154c-2.124,0-3.846,1.722-3.846,3.846c0,2.123,1.722,3.846,3.846,3.846  c2.123,0,3.846-1.723,3.846-3.846C23.846,7.876,22.123,6.154,20,6.154z M20,13.076c-1.696,0-3.077-1.381-3.077-3.076  c0-1.696,1.381-3.077,3.077-3.077c1.695,0,3.076,1.381,3.076,3.077C23.076,11.695,21.695,13.076,20,13.076z" fill-opacity="0.1" stroke-opacity="0.1"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_pressed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_pressed.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_pressed.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,19 +2,19 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="20px" version="1.1" viewBox="0 0 40 20" width="40px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="20" width="40"/>
-<path d="M20,20c-5.513,0-10-4.484-10-10c0-5.513,4.487-10,10-10c5.516,0,10,4.487,10,10  C30,15.516,25.516,20,20,20L20,20z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -287.4805 -380.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="307.4785" x2="307.4785" y1="-380.7881" y2="-399.248">
+<path d="M20,20c-5.513,0-10-4.484-10-10c0-5.513,4.487-10,10-10c5.516,0,10,4.487,10,10  C30,15.516,25.516,20,20,20L20,20z" fill="#E4E4E4"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -579.9609 -806.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="599.9609" x2="599.9609" y1="806.8086" y2="825.2676">
 <stop offset="0" style="stop-color:#C8C8D2"/>
 <stop offset="1" style="stop-color:#F0F0FA"/>
 </linearGradient>
 <circle cx="20" cy="9.999" fill="url(#SVGID_1_)" r="9.23"/>
-<path d="M20,1.538c-4.665,0-8.462,3.797-8.462,8.462  c0,4.664,3.797,8.463,8.462,8.463c4.664,0,8.463-3.799,8.463-8.463C28.463,5.335,24.664,1.538,20,1.538z M20,17.691  c-4.243,0-7.691-3.449-7.691-7.691c0-4.243,3.449-7.691,7.691-7.691c4.242,0,7.691,3.449,7.691,7.691  C27.691,14.242,24.242,17.691,20,17.691z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M20,1.538c-4.665,0-8.462,3.797-8.462,8.462  c0,4.664,3.797,8.463,8.462,8.463c4.664,0,8.463-3.799,8.463-8.463C28.463,5.335,24.664,1.538,20,1.538z M20,17.691  c-4.243,0-7.691-3.449-7.691-7.691c0-4.243,3.449-7.691,7.691-7.691S27.691,5.758,27.691,10S24.242,17.691,20,17.691z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <circle cx="20" cy="10.001" fill="#FFFFFF" fill-opacity="0.2" r="4.616" stroke-opacity="0.2"/>
-<path d="M20,0.769c-5.098,0-9.231,4.133-9.231,9.231s4.134,9.229,9.231,9.229  s9.229-4.13,9.229-9.229S25.098,0.769,20,0.769z M20,18.463c-4.665,0-8.462-3.799-8.462-8.463c0-4.665,3.797-8.462,8.462-8.462  c4.664,0,8.463,3.797,8.463,8.462C28.463,14.664,24.664,18.463,20,18.463z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -287.4805 -380.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="307.4795" x2="307.4795" y1="-386.1738" y2="-393.8652">
+<path d="M20,0.769c-5.098,0-9.231,4.133-9.231,9.231c0,5.098,4.134,9.229,9.231,9.229  c5.098,0,9.229-4.129,9.229-9.229C29.229,4.901,25.098,0.769,20,0.769z M20,18.463c-4.665,0-8.462-3.799-8.462-8.463  c0-4.665,3.797-8.462,8.462-8.462c4.664,0,8.463,3.797,8.463,8.462C28.463,14.664,24.664,18.463,20,18.463z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -579.9609 -806.0391)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="599.9609" x2="599.9609" y1="812.1934" y2="819.8848">
 <stop offset="0" style="stop-color:#66B8CC"/>
 <stop offset="1" style="stop-color:#3F89A9"/>
 </linearGradient>
 <circle cx="20" cy="10" fill="url(#SVGID_2_)" r="3.846"/>
-<path d="M20,6.154c-2.124,0-3.846,1.722-3.846,3.846c0,2.123,1.722,3.846,3.846,3.846  c2.123,0,3.846-1.723,3.846-3.846C23.846,7.876,22.123,6.154,20,6.154z M20,13.076c-1.695,0-3.077-1.38-3.077-3.076  S18.305,6.923,20,6.923S23.076,8.304,23.076,10S21.695,13.076,20,13.076z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M20,6.154c-2.124,0-3.846,1.722-3.846,3.846c0,2.123,1.722,3.846,3.846,3.846  c2.123,0,3.846-1.723,3.846-3.846C23.846,7.876,22.123,6.154,20,6.154z M20,13.076c-1.695,0-3.077-1.381-3.077-3.076  c0-1.696,1.382-3.077,3.077-3.077c1.695,0,3.076,1.381,3.076,3.077C23.076,11.695,21.695,13.076,20,13.076z" fill-opacity="0.1" stroke-opacity="0.1"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_about.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_about.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_about.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,25 +4,25 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07  c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11  c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304  v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001  z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" fill-opacity="0.6" height="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
@@ -31,80 +31,80 @@
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+<stop offset="0" style="stop-color:#AADAC6"/>
+<stop offset="1" style="stop-color:#6A99AA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
-<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
+<rect fill="#BCE2D2" height="0.767" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+<stop offset="1" style="stop-color:#D3D7D5"/>
 </linearGradient>
 <path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785  c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+<stop offset="0" style="stop-color:#6F7172"/>
+<stop offset="1" style="stop-color:#BFC2C1"/>
 </linearGradient>
 <path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51  c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951  h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183  h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606  c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
 <path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534  h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303  c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307  c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+<stop offset="0" style="stop-color:#C6B17B"/>
+<stop offset="0.7455" style="stop-color:#98604F"/>
+<stop offset="1" style="stop-color:#7F3736"/>
 </linearGradient>
 <path d="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307  c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -116,21 +116,21 @@
 <path d="M15.159,10.697c0.525,0,0.947-0.13,1.264-0.39  c0.316-0.259,0.474-0.615,0.474-1.07c0-0.44-0.164-0.795-0.49-1.061c-0.326-0.264-0.741-0.398-1.248-0.398  c-0.531,0-0.951,0.132-1.261,0.395c-0.311,0.262-0.465,0.617-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07  C14.224,10.567,14.641,10.697,15.159,10.697z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <path d="M15.159,10.369c0.525,0,0.947-0.129,1.264-0.389  c0.316-0.26,0.474-0.615,0.474-1.07c0-0.441-0.164-0.795-0.49-1.061c-0.326-0.266-0.741-0.398-1.248-0.398  c-0.531,0-0.951,0.13-1.261,0.394c-0.311,0.263-0.465,0.616-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07  C14.224,10.24,14.641,10.369,15.159,10.369z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <radialGradient cx="-2178.8628" cy="3345.4287" gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="26.49">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </radialGradient>
 <path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1c7.721,0,14,6.28,14,14S22.72,29,15,29L15,29z" fill="url(#SVGID_1__)"/>
 <polygon fill-opacity="0.1" points="12.46,13.847 13.555,13.847 13.555,23.318 16.741,23.318 16.741,12.032   12.46,12.032 " stroke-opacity="0.1"/>
 <polygon fill-opacity="0.2" points="12.46,13.519 13.555,13.519 13.555,22.99 16.741,22.99 16.741,11.704   12.46,11.704 " stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2179.3994" x2="-2179.3994" y1="3340.2148" y2="3324.8184">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#F9FCF9"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="12.46,13.191 13.555,13.191 13.555,22.663 16.741,22.663 16.741,11.377 12.46,11.377 "/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-2178.8477" x2="-2178.8477" y1="3340.2158" y2="3324.8235">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#F9FCF9"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M15.148,10.205c0.524,0,0.945-0.129,1.262-0.389c0.316-0.259,0.475-0.615,0.475-1.07  c0-0.441-0.163-0.795-0.489-1.061c-0.327-0.264-0.743-0.397-1.248-0.397c-0.531,0-0.952,0.131-1.262,0.394  c-0.312,0.262-0.466,0.617-0.466,1.064c0,0.455,0.159,0.812,0.477,1.07C14.212,10.076,14.63,10.205,15.148,10.205z" fill="url(#SVGID_3__)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_accessibility.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_accessibility.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_accessibility.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,17 +3,17 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientTransform="matrix(1 0 0 1 -574.9609 -786.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="604.9609" x2="604.9609" y1="788.3066" y2="844.3066">
-<stop offset="0" style="stop-color:#A1DCFF"/>
-<stop offset="0.3879" style="stop-color:#2A93EE"/>
-<stop offset="0.6788" style="stop-color:#085BC2"/>
-<stop offset="1" style="stop-color:#36B5FF"/>
+<stop offset="0" style="stop-color:#BDE3D5"/>
+<stop offset="0.3879" style="stop-color:#6598B3"/>
+<stop offset="0.6788" style="stop-color:#40568A"/>
+<stop offset="1" style="stop-color:#72B9C3"/>
 </linearGradient>
 <circle cx="30" cy="30" fill="url(#SVGID_1_)" r="28"/>
 <radialGradient cx="605.2275" cy="791.2412" gradientTransform="matrix(1 0 0 1 -574.9609 -786.0391)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="51.4678">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="0.1576" style="stop-color:#36B5FF"/>
-<stop offset="0.8242" style="stop-color:#1B66D8"/>
-<stop offset="1" style="stop-color:#2183E0"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="0.1576" style="stop-color:#72B9C3"/>
+<stop offset="0.8242" style="stop-color:#546F9F"/>
+<stop offset="1" style="stop-color:#5A82A7"/>
 </radialGradient>
 <path d="M30.001,57.197c-15,0-27.2-12.199-27.2-27.197c0-15,12.2-27.2,27.2-27.2C45,2.8,57.201,15,57.201,30  C57.201,44.998,45,57.197,30.001,57.197L30.001,57.197z" fill="url(#SVGID_2_)"/>
 <circle cx="30.001" cy="18.348" r="6.724"/>
@@ -23,13 +23,13 @@
 <linearGradient gradientTransform="matrix(1 0 0 1 -574.9609 -786.0391)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="604.9609" x2="604.9609" y1="796.9902" y2="835.9901">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.5273" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CAD1D4"/>
+<stop offset="1" style="stop-color:#CDD1CF"/>
 </linearGradient>
 <circle cx="30.001" cy="17.675" fill="url(#SVGID_3_)" r="6.724"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -574.9609 -786.0391)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="605.6348" x2="605.6348" y1="796.9932" y2="835.9828">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.5273" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CAD1D4"/>
+<stop offset="1" style="stop-color:#CDD1CF"/>
 </linearGradient>
 <path d="M49.466,23.513c-0.694-1.098-2.146-1.425-3.243-0.729c-18.279,11.575-30.235,0.748-30.744,0.275  c-0.941-0.887-2.426-0.848-3.317,0.094c-0.896,0.941-0.859,2.429,0.084,3.324c0.079,0.075,4.402,4.065,11.705,5.646V49.27h12.104  V32.107c3.881-0.815,8.131-2.465,12.688-5.35C49.837,26.064,50.166,24.611,49.466,23.513z" fill="url(#SVGID_4_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_account_setup.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_account_setup.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<path d="M6.917,52.783v-1.5c0-4.818,2.172-8.519,6.283-10.699  c1.059-0.564,3.787-1.602,6.194-2.518c0.87-0.33,1.66-0.631,2.299-0.881l0.986-0.43c0.268-0.776,0.156-2.01-0.009-2.316l-0.609-0.99  l0.006-0.005c-0.477-0.811-0.928-1.653-1.347-2.516c-1.481-0.104-2.916-1.358-3.614-3.185c-0.731-1.911-0.45-3.901,0.643-4.98  c-0.984-4.118-0.784-7.288,0.595-9.426c0.821-1.273,2.087-2.172,3.585-2.55c1.423-1.708,3.591-3.575,7.675-3.575  c4.679,0.156,8.319,1.761,10.55,4.641c2.173,2.806,2.864,6.706,1.954,11.001c1.044,1.116,1.256,3.072,0.488,4.962  c-0.677,1.671-1.935,2.824-3.292,3.062c-0.272,0.561-0.566,1.127-0.875,1.689c-0.381,0.694-0.74,1.304-1.099,1.863  c-0.177,0.303-0.299,1.717,0.037,2.46l1.25,0.499l1.473,0.547c2.69,0.999,5.678,2.108,6.696,2.639  c1.05,0.547,6.29,3.635,6.289,10.707v1.5H6.917z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M7.667,52.033v-0.75c0-4.523,2.035-7.994,5.884-10.037  c1.021-0.544,3.739-1.577,6.136-2.489c0.844-0.32,1.638-0.622,2.279-0.873l1.283-0.559c0.522-1,0.371-2.794,0.048-3.299  l-0.151-0.245l-0.104-0.169c0,0-1.311-2.285-1.853-3.443c-0.088,0.012-0.178,0.017-0.268,0.017c-1.243,0-2.495-1.089-3.115-2.71  c-0.702-1.834-0.35-3.688,0.783-4.433c-1.058-4.136-0.93-7.262,0.384-9.298c0.764-1.185,1.954-1.988,3.373-2.283  c1.427-1.767,3.432-3.499,7.257-3.499c4.433,0.148,7.868,1.652,9.958,4.351c2.067,2.669,2.696,6.425,1.771,10.577  c0,0-0.016,0.081-0.049,0.229c1.057,0.794,1.344,2.627,0.617,4.417c-0.635,1.568-1.874,2.625-3.092,2.64  c-0.316,0.673-0.664,1.354-1.037,2.032c-0.373,0.68-0.724,1.274-1.073,1.82c-0.352,0.6-0.471,2.557,0.146,3.464l1.495,0.596  l1.488,0.554c2.507,0.931,5.627,2.088,6.611,2.601s5.887,3.408,5.886,10.042v0.75H7.667z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
+<rect fill="none" height="60" width="60"/>
+<path d="M34.994,27.07c0.014-0.011,0.029-0.026,0.041-0.038  c0.002,0.009,0.005,0.016,0.008,0.026C35.025,27.061,35.012,27.068,34.994,27.07z M38.518,22.661L38.518,22.661  c-0.018-0.003-0.041-0.014-0.061-0.015C38.477,22.646,38.499,22.657,38.518,22.661z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15"/>
+<radialGradient cx="297.79" cy="-375.7397" gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="16.2293">
+<stop offset="0" style="stop-color:#DDC4B0"/>
+<stop offset="0.2" style="stop-color:#DDC4B0"/>
+<stop offset="0.96" style="stop-color:#A57665"/>
+<stop offset="1" style="stop-color:#A57665"/>
+</radialGradient>
+<path d="M36.914,38.52c-1.525-0.664-1.477-3.914-0.848-4.897c0.108-0.171,0.209-0.345,0.314-0.515H23.614  c0.105,0.17,0.204,0.344,0.314,0.515c0.63,0.983,0.679,4.233-0.848,4.897c-1.527,0.662,7.098,6.437,7.098,6.437  S38.441,39.182,36.914,38.52z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="297.4756" x2="297.4756" y1="-367.9355" y2="-381.3027">
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.39" style="stop-color:#5F8BA1"/>
+<stop offset="0.89" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
+</linearGradient>
+<path d="M46.094,41.906c-1.605-0.834-9.564-3.621-9.715-3.795L30.3,43.163l-6.531-5.247  c-0.18,0.27-8.046,3.023-9.866,3.992c-2.083,1.105-5.486,3.646-5.486,9.375h43.158C51.576,45.555,47.695,42.742,46.094,41.906z" fill="url(#SVGID_2_)"/>
+<polygon fill="#020202" fill-opacity="0.3" points="22.282,38.564 30.3,44.955 37.832,38.695 36.379,38.111   30.3,43.163 23.77,37.916 " stroke-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="9.5718" x2="22.6592" y1="45.0781" y2="45.0781">
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
+</linearGradient>
+<path d="M22.659,39.577c0,0-11.44,2.987-11.44,11.002c0,0-1.635,0.001-1.647,0  C9.572,45.65,13.418,41.818,22.659,39.577z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="37.1855" x2="50.2734" y1="44.8936" y2="44.8936">
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
+</linearGradient>
+<path d="M37.186,39.393c0,0,11.441,2.986,11.441,11.002c0,0,1.637,0,1.646,0  C50.273,45.465,46.428,41.633,37.186,39.393z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="297.5371" x2="297.5371" y1="-375.5508" y2="-368.1697">
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
+</linearGradient>
+<polygon fill="url(#SVGID_5_)" points="30.3,44.955 22.281,38.564 21.815,38.77 30.3,45.531 38.3,38.879 37.834,38.691 "/>
+<radialGradient cx="298.5801" cy="-345.8398" gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.7801">
+<stop offset="0" style="stop-color:#F4EDE4"/>
+<stop offset="0.51" style="stop-color:#E8D9CA"/>
+<stop offset="0.76" style="stop-color:#DDC4B0"/>
+<stop offset="1" style="stop-color:#BF9C89"/>
+</radialGradient>
+<path d="M40.584,23.573c-0.055-0.026-0.113-0.03-0.17-0.046c0-0.001,0-0.002,0-0.002  c-0.012-0.002-0.021-0.004-0.033-0.007c-0.084-0.021-0.168-0.041-0.256-0.045c-10.658-1.854-15.548-7.759-15.916-6.195  c-0.294,1.244-3.281,3.935-4.847,5.276c0.013,0.06,0.02,0.114,0.034,0.174c0,0,0.056,0.275,0.174,0.744  c-0.125,0.013-0.246,0.039-0.365,0.089c-0.995,0.42-1.308,2.053-0.698,3.647c0.61,1.594,1.913,2.548,2.909,2.13  c0.061-0.027,0.113-0.071,0.169-0.107c0.579,1.301,1.289,2.697,2.159,4.094c1.458,1.731,3.691,3.766,6.157,3.766  c2.983,0,4.808-1.633,6.063-3.278c0.031-0.068,0.063-0.133,0.103-0.189c0.931-1.453,1.684-2.911,2.293-4.268  c0.975,0.337,2.226-0.569,2.846-2.102C41.85,25.666,41.57,24.017,40.584,23.573z" fill="url(#SVGID_6_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="293.6279" x2="302.8386" y1="-368.1089" y2="-358.9682">
+<stop offset="0" style="stop-color:#E8D9CA"/>
+<stop offset="1" style="stop-color:#DDC4B0"/>
+</linearGradient>
+<path d="M29.463,36.254c-1.816,0-3.646-0.846-4.993-2.121c1.425,1.498,3.343,2.957,5.432,2.957  c2.982,0,4.809-1.633,6.064-3.279c0.031-0.067,0.063-0.133,0.101-0.188c0.932-1.453,1.684-2.911,2.295-4.268  C34.967,35.283,32.447,36.254,29.463,36.254z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="297.2969" x2="297.2969" y1="-338.9307" y2="-352.4902">
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.38" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
+</linearGradient>
+<path d="M29.603,8.713c-3.695,0-5.473,1.68-6.845,3.436c-2.23,0.345-5.768,2.39-3.27,11.35  c1.565-1.341,4.427-4.978,4.722-6.222c0.371-1.577,5.343,4.451,16.205,6.248c0.127-0.501,0.185-0.797,0.185-0.797  C42.305,15.077,38.594,9.014,29.603,8.713z" fill="url(#SVGID_8_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="301.9326" x2="289.6528" y1="-351.9048" y2="-344.6049">
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.36" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
+</linearGradient>
+<path d="M24.221,16.543c0,0,5.316,6.983,16.117,6.971C40.338,23.514,35.251,22.716,24.221,16.543z" fill="url(#SVGID_9_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="288.5391" x2="288.6491" y1="-343.1895" y2="-350.9899">
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.38" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
+</linearGradient>
+<path d="M22.943,12.668c0,0-5.204,0.312-3.273,9.132C19.67,21.8,19.034,15.76,22.943,12.668z" fill="url(#SVGID_10_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="299.0225" x2="298.6326" y1="-340.0913" y2="-343.6304">
+<stop offset="0" style="stop-color:#8D7B6A"/>
+<stop offset="1" style="stop-color:#451F1E"/>
+</linearGradient>
+<path d="M32.126,13.891c-2.423-0.346-6.521-2.493-8.129-1.726c0,0,5.26-6,14.538,0.831  C38.535,12.997,36.326,14.489,32.126,13.891z" fill="url(#SVGID_11_)"/>
+<rect fill="none" height="59.996" width="59.996"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<path d="M15,29.505c-0.657,0-1.337-0.048-2.019-0.144l-0.594-0.082l-0.435-1.304c-0.171-0.517-0.3-1.313-0.3-1.854  v-0.687c-0.006-0.031-0.063-0.11-0.102-0.131l-1.339-0.548l-0.099-0.032c-0.06,0-0.112,0.021-0.127,0.031l-0.479,0.479  c-0.383,0.383-1.038,0.855-1.522,1.098l-1.232,0.612l-0.477-0.36c-1.081-0.815-2.042-1.775-2.856-2.854L3.057,23.25l0.616-1.23  c0.246-0.489,0.718-1.144,1.099-1.523l0.484-0.485c0.018-0.026,0.033-0.119,0.021-0.157L4.72,18.511  c-0.041-0.095-0.118-0.151-0.159-0.158l-0.676,0.001c-0.545,0-1.343-0.13-1.855-0.302l-1.303-0.434l-0.083-0.594  C0.548,16.346,0.5,15.666,0.5,15.005s0.048-1.34,0.144-2.02l0.083-0.594l1.305-0.434c0.507-0.171,1.306-0.301,1.853-0.301h0.687  c0.031-0.006,0.108-0.062,0.127-0.099l0.553-1.344c0.04-0.098,0.025-0.19,0-0.224L4.772,9.511C4.387,9.125,3.915,8.47,3.674,7.987  L3.059,6.758L3.42,6.279c0.814-1.079,1.774-2.04,2.855-2.855l0.479-0.362l1.231,0.617c0.486,0.244,1.14,0.715,1.522,1.097  l0.487,0.485c0.008,0.005,0.06,0.025,0.119,0.025l0.034-0.017l0.064-0.014l1.285-0.531c0.094-0.04,0.15-0.118,0.156-0.16l0-0.676  c0-0.543,0.129-1.34,0.301-1.854l0.435-1.304l0.594-0.083c0.676-0.095,1.356-0.143,2.02-0.143c0.662,0,1.342,0.048,2.02,0.143  l0.595,0.083l0.434,1.305c0.17,0.515,0.301,1.312,0.301,1.853v0.687c0.006,0.031,0.063,0.11,0.1,0.129l1.341,0.551l0.098,0.031  c0.061,0,0.113-0.02,0.129-0.031l0.478-0.478c0.385-0.385,1.038-0.856,1.521-1.098l1.233-0.613l0.476,0.36  c1.08,0.813,2.041,1.773,2.856,2.855l0.362,0.479L26.27,8.106c-0.253,0.506-0.391,0.758-1.04,1.407L24.744,10  c-0.017,0.026-0.032,0.119-0.021,0.158l0.557,1.344c0.04,0.093,0.117,0.15,0.158,0.156l0.678,0c0.544,0,1.343,0.13,1.854,0.302  l1.303,0.433l0.083,0.594c0.095,0.677,0.144,1.356,0.144,2.021c0,0.666-0.049,1.345-0.144,2.021l-0.085,0.593l-1.303,0.434  c-0.508,0.172-1.305,0.302-1.853,0.302h-0.688c-0.032,0.006-0.109,0.063-0.131,0.102l-0.547,1.339  c-0.04,0.097-0.026,0.191-0.002,0.226l0.479,0.479c0.383,0.381,0.857,1.038,1.099,1.525l0.613,1.226l-0.36,0.479  c-0.815,1.08-1.774,2.041-2.854,2.855l-0.479,0.361l-1.231-0.615c-0.485-0.244-1.14-0.716-1.521-1.097l-0.487-0.486  c-0.006-0.004-0.059-0.023-0.119-0.023l-0.031,0.017l-0.066,0.015l-1.284,0.529c-0.094,0.04-0.15,0.118-0.156,0.159v0.677  c0,0.54-0.129,1.337-0.301,1.853l-0.434,1.306l-0.595,0.082C16.335,29.457,15.656,29.505,15,29.505L15,29.505z M15,11.208  c-2.094,0-3.798,1.704-3.798,3.798c0,2.094,1.704,3.798,3.798,3.798s3.797-1.704,3.797-3.798C18.797,12.912,17.094,11.208,15,11.208  L15,11.208z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="282.4795" x2="282.4795" y1="-361.4912" y2="-388.438">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.1" style="stop-color:#FFFFFF"/>
+<stop offset="0.74" style="stop-color:#939595"/>
+<stop offset="1" style="stop-color:#C8C8C8"/>
+</linearGradient>
+<path d="M26.116,12.624H25.43c-0.437,0-0.906-0.339-1.042-0.754l-0.531-1.285  c-0.196-0.389-0.105-0.96,0.204-1.269l0.485-0.486c0.615-0.615,0.659-0.759,0.916-1.271l0.349-0.695  c-0.761-1.008-1.659-1.906-2.668-2.666l-0.694,0.346c-0.389,0.195-0.961,0.608-1.271,0.917l-0.485,0.486  c-0.31,0.309-0.882,0.401-1.271,0.203L18.138,5.62c-0.417-0.137-0.755-0.608-0.755-1.044V3.889c0-0.437-0.113-1.134-0.251-1.548  l-0.246-0.735C16.269,1.519,15.641,1.472,15,1.472c-0.641,0-1.27,0.047-1.886,0.133L12.869,2.34  c-0.138,0.415-0.251,1.111-0.251,1.548v0.687c0,0.436-0.339,0.906-0.754,1.042l-1.285,0.53C10.19,6.346,9.62,6.254,9.311,5.946  L8.824,5.46C8.515,5.151,7.942,4.739,7.553,4.543L6.858,4.195C5.851,4.956,4.953,5.854,4.192,6.862l0.347,0.694  c0.195,0.391,0.608,0.963,0.917,1.272l0.486,0.486c0.309,0.309,0.4,0.88,0.202,1.269l-0.531,1.286  c-0.136,0.415-0.605,0.754-1.042,0.754H3.884c-0.438,0-1.134,0.112-1.548,0.252l-0.736,0.245c-0.086,0.617-0.134,1.245-0.134,1.886  c0,0.64,0.047,1.269,0.134,1.885l0.736,0.246c0.414,0.139,1.11,0.251,1.548,0.251h0.687c0.438,0,0.906,0.34,1.042,0.755l0.53,1.284  c0.198,0.389,0.106,0.961-0.203,1.269l-0.486,0.486c-0.309,0.308-0.721,0.882-0.917,1.271L4.19,23.146  c0.761,1.008,1.659,1.905,2.667,2.665l0.694-0.345c0.391-0.196,0.963-0.608,1.271-0.917l0.486-0.485  c0.309-0.309,0.881-0.401,1.27-0.203l1.284,0.529c0.416,0.138,0.755,0.608,0.755,1.044v0.687c0,0.438,0.113,1.133,0.251,1.549  l0.245,0.734c0.617,0.086,1.245,0.134,1.886,0.134c0.64,0,1.267-0.048,1.886-0.134l0.244-0.734c0.138-0.416,0.251-1.111,0.251-1.549  v-0.687c0-0.438,0.34-0.906,0.755-1.043l1.284-0.53c0.391-0.197,0.959-0.105,1.269,0.203l0.485,0.485  c0.31,0.309,0.882,0.721,1.272,0.917l0.695,0.347c1.008-0.76,1.904-1.657,2.665-2.666l-0.347-0.693  c-0.194-0.391-0.608-0.964-0.918-1.271l-0.483-0.486c-0.31-0.309-0.4-0.88-0.204-1.27l0.529-1.284  c0.14-0.416,0.607-0.755,1.044-0.755h0.688c0.435,0,1.132-0.111,1.547-0.251l0.736-0.246c0.087-0.615,0.134-1.245,0.134-1.885  c0-0.641-0.047-1.269-0.134-1.886l-0.736-0.245C27.249,12.736,26.553,12.624,26.116,12.624z M15,19.771  c-2.632,0-4.765-2.133-4.765-4.765c0-2.631,2.132-4.765,4.765-4.765c2.63,0,4.764,2.134,4.764,4.765  C19.764,17.638,17.63,19.771,15,19.771z" fill="url(#SVGID_1__)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="277.6816" x2="287.2746" y1="-377.2241" y2="-377.2241">
+<stop offset="0" style="stop-color:#7A7A7A"/>
+<stop offset="0.5" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<path d="M15,19.771c2.63,0,4.764-2.133,4.764-4.765c0-0.125-0.01-0.246-0.018-0.367  c-0.188,2.459-2.239,4.398-4.746,4.398c-2.508,0-4.558-1.939-4.746-4.398c-0.01,0.122-0.019,0.243-0.019,0.367  C10.235,17.638,12.367,19.771,15,19.771z" fill="url(#SVGID_2__)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="282.4805" x2="282.4805" y1="-383.0635" y2="-366.7921">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="0.52" style="stop-color:#C8C8C8"/>
+<stop offset="1" style="stop-color:#939595"/>
+</linearGradient>
+<path d="M15,6.52c-4.687,0-8.487,3.8-8.487,8.487s3.8,8.486,8.487,8.486s8.487-3.799,8.487-8.486  S19.687,6.52,15,6.52z M15,21.563c-3.621,0-6.559-2.935-6.559-6.557c0-3.622,2.937-6.558,6.559-6.558  c3.62,0,6.557,2.936,6.557,6.558C21.557,18.629,18.619,21.563,15,21.563z" fill="url(#SVGID_3__)"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,29 +3,29 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+<stop offset="0" style="stop-color:#93AC5D"/>
+<stop offset="0.297" style="stop-color:#93AC5D"/>
+<stop offset="0.6667" style="stop-color:#356742"/>
+<stop offset="0.7939" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#447B42"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399  c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514  c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737  c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12  c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B1BE95" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B1BE95" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+<stop offset="0" style="stop-color:#315D3E"/>
+<stop offset="0.5" style="stop-color:#1E3A31"/>
+<stop offset="1" style="stop-color:#2E593D"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31  c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535  c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_mode.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_mode.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_mode.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,25 +4,25 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07  c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11  c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304  v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001  z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" fill-opacity="0.6" height="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
@@ -31,80 +31,80 @@
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+<stop offset="0" style="stop-color:#AADAC6"/>
+<stop offset="1" style="stop-color:#6A99AA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
-<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
+<rect fill="#BCE2D2" height="0.767" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+<stop offset="1" style="stop-color:#D3D7D5"/>
 </linearGradient>
 <path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785  c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+<stop offset="0" style="stop-color:#6F7172"/>
+<stop offset="1" style="stop-color:#BFC2C1"/>
 </linearGradient>
 <path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51  c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951  h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183  h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606  c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
 <path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534  h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303  c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307  c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+<stop offset="0" style="stop-color:#C6B17B"/>
+<stop offset="0.7455" style="stop-color:#98604F"/>
+<stop offset="1" style="stop-color:#7F3736"/>
 </linearGradient>
 <path d="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307  c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -114,30 +114,30 @@
 <path d="M20.752,15.001H1.27c-0.555,0-0.998,0.273-1.186,0.73c-0.186,0.459-0.059,0.966,0.34,1.355l10.515,10.314  c0.339,0.335,0.687,0.404,0.918,0.404c0.565,0,1.165-0.448,1.165-1.28v-4.398h7.73c0.842,0,1.527-0.69,1.527-1.538v-4.051  C22.279,15.69,21.594,15.001,20.752,15.001z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <path d="M29.58,12.911L19.063,2.596c-0.339-0.333-0.685-0.402-0.916-0.402c-0.564,0-1.165,0.449-1.165,1.281v4.399  h-7.73c-0.842,0-1.525,0.689-1.525,1.537v4.051c0,0.847,0.684,1.535,1.525,1.535h19.482c0.555,0,0.998-0.273,1.186-0.73  C30.105,13.808,29.979,13.301,29.58,12.911z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="11.1406" x2="11.1406" y1="16.103" y2="27.0009">
-<stop offset="0" style="stop-color:#CDEDBD"/>
-<stop offset="0.9879" style="stop-color:#139900"/>
-<stop offset="1" style="stop-color:#139900"/>
+<stop offset="0" style="stop-color:#D6DFCB"/>
+<stop offset="0.9879" style="stop-color:#2E6B4D"/>
+<stop offset="1" style="stop-color:#2E6B4D"/>
 </linearGradient>
 <path d="M21.279,20.589c0,0.294-0.236,0.538-0.527,0.538h-8.205c-0.287,0-0.525,0.241-0.525,0.537v4.861  c0,0.295-0.172,0.37-0.38,0.165L1.125,16.373c-0.211-0.205-0.144-0.372,0.145-0.372h19.482c0.289,0,0.527,0.241,0.527,0.537V20.589z  " fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="11.7783" x2="11.7783" y1="17.0737" y2="24.8819">
-<stop offset="0" style="stop-color:#82C94C"/>
-<stop offset="0.2545" style="stop-color:#439020"/>
-<stop offset="0.5091" style="stop-color:#0D4D07"/>
-<stop offset="1" style="stop-color:#0D4D07"/>
+<stop offset="0" style="stop-color:#88A372"/>
+<stop offset="0.2545" style="stop-color:#426E4B"/>
+<stop offset="0.5091" style="stop-color:#1C3837"/>
+<stop offset="1" style="stop-color:#1C3837"/>
 </linearGradient>
 <path d="M3.336,17.06h16.885v3.009h-7.674c-0.872,0-1.584,0.715-1.584,1.596v2.878L3.336,17.06z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="18.8643" x2="18.8643" y1="3.2227" y2="14.1618">
-<stop offset="0" style="stop-color:#CDEDBD"/>
-<stop offset="0.4909" style="stop-color:#CDEDBD"/>
-<stop offset="0.9879" style="stop-color:#139900"/>
-<stop offset="1" style="stop-color:#139900"/>
+<stop offset="0" style="stop-color:#D6DFCB"/>
+<stop offset="0.4909" style="stop-color:#D6DFCB"/>
+<stop offset="0.9879" style="stop-color:#2E6B4D"/>
+<stop offset="1" style="stop-color:#2E6B4D"/>
 </linearGradient>
 <path d="M8.727,9.411c0-0.296,0.235-0.537,0.525-0.537h8.206c0.288,0,0.524-0.242,0.524-0.538V3.475  c0-0.297,0.172-0.37,0.381-0.165l10.516,10.315c0.211,0.205,0.144,0.372-0.145,0.372H9.252c-0.289,0-0.525-0.241-0.525-0.535V9.411z  " fill="url(#SVGID_3__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="18.2266" x2="18.2266" y1="5.4292" y2="12.9712">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.703" style="stop-color:#439020"/>
-<stop offset="0.9879" style="stop-color:#0D4D07"/>
-<stop offset="1" style="stop-color:#0D4D07"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.703" style="stop-color:#426E4B"/>
+<stop offset="0.9879" style="stop-color:#1C3837"/>
+<stop offset="1" style="stop-color:#1C3837"/>
 </linearGradient>
 <path d="M9.785,12.938V9.933h7.673c0.872,0,1.583-0.718,1.583-1.597V5.458l7.627,7.48H9.785z" fill="url(#SVGID_4__)"/>
 <rect fill="none" height="30" width="30" x="0.002"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_contact_picture.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_contact_picture.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_contact_picture.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -22,7 +22,7 @@
 <path d="M1.777,26.306C0.797,26.306,0,25.502,0,24.514V7.489c0-0.988,0.797-1.792,1.777-1.792h0.125V5.495  c0-1.01,0.771-1.801,1.754-1.801h3.548c0.657,0,1.22,0.354,1.521,0.892c0.326-0.405,0.824-0.665,1.381-0.665h18.116  c0.98,0,1.778,0.804,1.778,1.792v18.801c0,0.988-0.798,1.792-1.778,1.792H1.777z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="2.8789" x2="7.9217" y1="6.0669" y2="6.0669">
 <stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="0.4788" style="stop-color:#7C8284"/>
+<stop offset="0.4788" style="stop-color:#7E8182"/>
 <stop offset="1" style="stop-color:#E6E6E6"/>
 </linearGradient>
 <path d="M7.957,7.439V5.495c0-0.458-0.339-0.801-0.753-0.801H3.656c-0.414,0-0.754,0.342-0.754,0.801v1.944  H7.957z" fill="url(#SVGID_1__)"/>
@@ -32,15 +32,15 @@
 </radialGradient>
 <path d="M7.204,4.694H3.656c-0.414,0-0.754,0.342-0.754,0.801v0.393c0-0.459,0.34-0.801,0.754-0.801h3.548  c0.414,0,0.753,0.342,0.753,0.801V5.495C7.957,5.037,7.618,4.694,7.204,4.694z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="4.8916" y2="25.3392">
-<stop offset="0" style="stop-color:#D0D4D5"/>
-<stop offset="0.1212" style="stop-color:#D0D4D5"/>
-<stop offset="0.4182" style="stop-color:#B0B6B8"/>
-<stop offset="0.4182" style="stop-color:#9FA6A8"/>
-<stop offset="0.6606" style="stop-color:#7D8588"/>
-<stop offset="0.9697" style="stop-color:#ADB3B5"/>
-<stop offset="0.9697" style="stop-color:#595C5E"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D2D3D2"/>
+<stop offset="0.1212" style="stop-color:#D2D3D2"/>
+<stop offset="0.4182" style="stop-color:#B2B6B5"/>
+<stop offset="0.4182" style="stop-color:#A2A5A5"/>
+<stop offset="0.6606" style="stop-color:#808485"/>
+<stop offset="0.9697" style="stop-color:#AFB3B2"/>
+<stop offset="0.9697" style="stop-color:#5B5B5D"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M28.222,4.921H10.105c-0.428,0-0.777,0.355-0.777,0.792v0.984H1.777C1.35,6.697,1,7.053,1,7.489  v17.024c0,0.436,0.35,0.792,0.777,0.792h26.444c0.427,0,0.778-0.356,0.778-0.792V5.713C29,5.276,28.648,4.921,28.222,4.921z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="24.7998" x2="24.7998" y1="6.1997" y2="9.553">
@@ -53,7 +53,7 @@
 <stop offset="1" style="stop-color:#3B3B3B"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="2.801" width="4.583" x="22.509" y="6.468"/>
-<path d="M23.174,15.992c-0.002,4.312-3.498,8.564-7.811,8.563c-4.311-0.002-7.806-4.257-7.806-8.568  c0.003-4.312,3.499-7.806,7.812-7.804S23.174,11.681,23.174,15.992z" fill="#231F20" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M23.174,15.992c-0.002,4.312-3.498,8.564-7.811,8.563c-4.311-0.002-7.806-4.257-7.806-8.568  c0.003-4.312,3.499-7.806,7.812-7.804S23.174,11.681,23.174,15.992z" fill="#222021" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.3652" x2="15.3652" y1="7.8438" y2="23.4871">
 <stop offset="0" style="stop-color:#CFCFCF"/>
 <stop offset="0.1091" style="stop-color:#CFCFCF"/>
@@ -63,7 +63,7 @@
 <circle cx="15.366" cy="15.674" fill="url(#SVGID_6_)" r="7.778"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.3652" x2="15.3652" y1="8.1816" y2="22.9943">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#606769"/>
+<stop offset="1" style="stop-color:#636566"/>
 </linearGradient>
 <circle cx="15.366" cy="15.675" fill="url(#SVGID_7_)" r="7.388"/>
 <linearGradient gradientTransform="matrix(1 3.000000e-004 -3.000000e-004 1 -0.7997 -0.8701)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="11.9092" x2="20.4338" y1="12.2778" y2="20.8025">
@@ -83,11 +83,11 @@
 </radialGradient>
 <circle cx="15.365" cy="15.674" fill="url(#SVGID_9_)" r="5.639"/>
 <radialGradient cx="8.0361" cy="-26.853" gradientTransform="matrix(0.9785 3.000000e-004 -3.000000e-004 0.9786 6.3194 35.8131)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="11.413">
-<stop offset="0" style="stop-color:#A700F5"/>
-<stop offset="0.3091" style="stop-color:#A700F5"/>
-<stop offset="0.4364" style="stop-color:#5E008A"/>
-<stop offset="0.8061" style="stop-color:#0E1402"/>
-<stop offset="1" style="stop-color:#0E1402"/>
+<stop offset="0" style="stop-color:#8D4AAB"/>
+<stop offset="0.3091" style="stop-color:#8D4AAB"/>
+<stop offset="0.4364" style="stop-color:#532961"/>
+<stop offset="0.8061" style="stop-color:#070F0F"/>
+<stop offset="1" style="stop-color:#070F0F"/>
 </radialGradient>
 <path d="M19.449,15.674c-0.001,2.256-1.83,4.084-4.086,4.084c-2.252-0.002-4.081-1.831-4.081-4.086  c0.002-2.256,1.831-4.082,4.083-4.082C17.623,11.592,19.449,13.42,19.449,15.674z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="5.5742" x2="5.5742" y1="11.8188" y2="9.3852">
@@ -96,7 +96,7 @@
 </linearGradient>
 <circle cx="5.575" cy="10.556" fill="url(#SVGID_11_)" r="1.167"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="15.3457" x2="15.3457" y1="10.6523" y2="15.6356">
-<stop offset="0" style="stop-color:#F8FBFF"/>
+<stop offset="0" style="stop-color:#FAFDFB"/>
 <stop offset="1" style="stop-color:#808080"/>
 </linearGradient>
 <path d="M15.346,15.611c1.81,0,3.515-0.274,5.02-0.758c-0.428-2.386-2.51-4.201-5.02-4.201  s-4.592,1.814-5.02,4.201C11.83,15.337,13.536,15.611,15.346,15.611z" fill="url(#SVGID_12_)" fill-opacity="0.35" stroke-opacity="0.35"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_group_picture.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_group_picture.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_group_picture.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -37,7 +37,7 @@
 <path d="M1.777,26.306C0.797,26.306,0,25.502,0,24.514V7.489c0-0.988,0.797-1.792,1.777-1.792h0.125V5.495  c0-1.01,0.771-1.801,1.754-1.801h3.548c0.657,0,1.22,0.354,1.521,0.892c0.326-0.405,0.824-0.665,1.381-0.665h18.116  c0.98,0,1.778,0.804,1.778,1.792v18.801c0,0.988-0.798,1.792-1.778,1.792H1.777z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="2.8789" x2="7.9217" y1="6.0669" y2="6.0669">
 <stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="0.4788" style="stop-color:#7C8284"/>
+<stop offset="0.4788" style="stop-color:#7E8182"/>
 <stop offset="1" style="stop-color:#E6E6E6"/>
 </linearGradient>
 <path d="M7.957,7.439V5.495c0-0.458-0.339-0.801-0.753-0.801H3.656c-0.414,0-0.754,0.342-0.754,0.801v1.944  H7.957z" fill="url(#SVGID_1__)"/>
@@ -47,15 +47,15 @@
 </radialGradient>
 <path d="M7.204,4.694H3.656c-0.414,0-0.754,0.342-0.754,0.801v0.393c0-0.459,0.34-0.801,0.754-0.801h3.548  c0.414,0,0.753,0.342,0.753,0.801V5.495C7.957,5.037,7.618,4.694,7.204,4.694z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="4.8916" y2="25.3392">
-<stop offset="0" style="stop-color:#D0D4D5"/>
-<stop offset="0.1212" style="stop-color:#D0D4D5"/>
-<stop offset="0.4182" style="stop-color:#B0B6B8"/>
-<stop offset="0.4182" style="stop-color:#9FA6A8"/>
-<stop offset="0.6606" style="stop-color:#7D8588"/>
-<stop offset="0.9697" style="stop-color:#ADB3B5"/>
-<stop offset="0.9697" style="stop-color:#595C5E"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D2D3D2"/>
+<stop offset="0.1212" style="stop-color:#D2D3D2"/>
+<stop offset="0.4182" style="stop-color:#B2B6B5"/>
+<stop offset="0.4182" style="stop-color:#A2A5A5"/>
+<stop offset="0.6606" style="stop-color:#808485"/>
+<stop offset="0.9697" style="stop-color:#AFB3B2"/>
+<stop offset="0.9697" style="stop-color:#5B5B5D"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M28.222,4.921H10.105c-0.428,0-0.777,0.355-0.777,0.792v0.984H1.777C1.35,6.697,1,7.053,1,7.489  v17.024c0,0.436,0.35,0.792,0.777,0.792h26.444c0.427,0,0.778-0.356,0.778-0.792V5.713C29,5.276,28.648,4.921,28.222,4.921z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="24.7998" x2="24.7998" y1="6.1997" y2="9.553">
@@ -68,7 +68,7 @@
 <stop offset="1" style="stop-color:#3B3B3B"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="2.801" width="4.583" x="22.509" y="6.468"/>
-<path d="M23.174,15.992c-0.002,4.312-3.498,8.564-7.811,8.563c-4.311-0.002-7.806-4.257-7.806-8.568  c0.003-4.312,3.499-7.806,7.812-7.804S23.174,11.681,23.174,15.992z" fill="#231F20" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M23.174,15.992c-0.002,4.312-3.498,8.564-7.811,8.563c-4.311-0.002-7.806-4.257-7.806-8.568  c0.003-4.312,3.499-7.806,7.812-7.804S23.174,11.681,23.174,15.992z" fill="#222021" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.3652" x2="15.3652" y1="7.8438" y2="23.4871">
 <stop offset="0" style="stop-color:#CFCFCF"/>
 <stop offset="0.1091" style="stop-color:#CFCFCF"/>
@@ -78,7 +78,7 @@
 <circle cx="15.366" cy="15.674" fill="url(#SVGID_6_)" r="7.778"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.3652" x2="15.3652" y1="8.1816" y2="22.9943">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#606769"/>
+<stop offset="1" style="stop-color:#636566"/>
 </linearGradient>
 <circle cx="15.366" cy="15.675" fill="url(#SVGID_7_)" r="7.388"/>
 <linearGradient gradientTransform="matrix(1 3.000000e-004 -3.000000e-004 1 -0.7997 -0.8701)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="11.9092" x2="20.4338" y1="12.2778" y2="20.8025">
@@ -98,11 +98,11 @@
 </radialGradient>
 <circle cx="15.365" cy="15.674" fill="url(#SVGID_9_)" r="5.639"/>
 <radialGradient cx="8.0361" cy="-26.853" gradientTransform="matrix(0.9785 3.000000e-004 -3.000000e-004 0.9786 6.3194 35.8131)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="11.413">
-<stop offset="0" style="stop-color:#A700F5"/>
-<stop offset="0.3091" style="stop-color:#A700F5"/>
-<stop offset="0.4364" style="stop-color:#5E008A"/>
-<stop offset="0.8061" style="stop-color:#0E1402"/>
-<stop offset="1" style="stop-color:#0E1402"/>
+<stop offset="0" style="stop-color:#8D4AAB"/>
+<stop offset="0.3091" style="stop-color:#8D4AAB"/>
+<stop offset="0.4364" style="stop-color:#532961"/>
+<stop offset="0.8061" style="stop-color:#070F0F"/>
+<stop offset="1" style="stop-color:#070F0F"/>
 </radialGradient>
 <path d="M19.449,15.674c-0.001,2.256-1.83,4.084-4.086,4.084c-2.252-0.002-4.081-1.831-4.081-4.086  c0.002-2.256,1.831-4.082,4.083-4.082C17.623,11.592,19.449,13.42,19.449,15.674z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="5.5742" x2="5.5742" y1="11.8188" y2="9.3852">
@@ -111,7 +111,7 @@
 </linearGradient>
 <circle cx="5.575" cy="10.556" fill="url(#SVGID_11_)" r="1.167"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="15.3457" x2="15.3457" y1="10.6523" y2="15.6356">
-<stop offset="0" style="stop-color:#F8FBFF"/>
+<stop offset="0" style="stop-color:#FAFDFB"/>
 <stop offset="1" style="stop-color:#808080"/>
 </linearGradient>
 <path d="M15.346,15.611c1.81,0,3.515-0.274,5.02-0.758c-0.428-2.386-2.51-4.201-5.02-4.201  s-4.592,1.814-5.02,4.201C11.83,15.337,13.536,15.611,15.346,15.611z" fill="url(#SVGID_12_)" fill-opacity="0.35" stroke-opacity="0.35"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_als.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_als.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_als.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,25 +3,25 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.5586" x2="39.5586" y1="1" y2="45.1092">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M53.992,42.767c0,1.357-1.1,2.457-2.457,2.457H27.581c-1.356,0-2.457-1.1-2.457-2.457V3.456  C25.124,2.099,26.225,1,27.581,1h23.954c1.357,0,2.457,1.099,2.457,2.456V42.767z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="39.5586" x2="39.5586" y1="1" y2="44.3417">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M51.535,1H27.581c-1.356,0-2.457,1.099-2.457,2.456v39.311c0,0.655,0.261,1.247,0.68,1.688  c-0.038-0.147-0.065-0.3-0.065-0.459v-1.229V4.685V3.456c0-1.017,0.827-1.842,1.842-1.842h23.954c1.018,0,1.844,0.825,1.844,1.842  v1.229v38.082v1.229c0,0.159-0.027,0.312-0.066,0.459c0.42-0.44,0.68-1.032,0.68-1.688V3.456C53.992,2.099,52.893,1,51.535,1z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="39.5586" x2="39.5586" y1="4.1138" y2="33.5567">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" fill-opacity="0.6" height="29.483" stroke-opacity="0.6" width="25.184" x="26.967" y="4.07"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="39.5586" x2="39.5586" y1="4.7266" y2="32.9417">
@@ -41,82 +41,82 @@
 <polygon fill="url(#SVGID_6_)" points="50.922,14.514 28.195,16.969 28.195,5.913 50.922,5.913 "/>
 <rect fill="#FFFFFF" fill-opacity="0.7" height="0.614" stroke-opacity="0.7" width="22.727" x="28.195" y="5.299"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="39.4639" x2="39.4639" y1="34.1924" y2="43.3226">
-<stop offset="0" style="stop-color:#B6BBBD"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M37.244,43.381c-1.316,0-2.387-1.06-2.387-2.362v-4.489  c0-1.303,1.07-2.362,2.387-2.362h4.439c1.316,0,2.387,1.06,2.387,2.362v4.489c0,1.303-1.07,2.362-2.387,2.362H37.244z" fill="url(#SVGID_7_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M37.24,42.767c-0.975,0-1.77-0.784-1.77-1.748v-4.489c0-0.964,0.795-1.747,1.77-1.747h4.447  c0.975,0,1.77,0.783,1.77,1.747v4.489c0,0.964-0.795,1.748-1.77,1.748H37.24z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="39.4639" x2="39.4639" y1="35.3643" y2="42.1641">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M42.842,41.019c0,0.627-0.516,1.134-1.15,1.134h-4.455c-0.635,0-1.15-0.507-1.15-1.134v-4.489  c0-0.626,0.516-1.134,1.15-1.134h4.455c0.635,0,1.15,0.508,1.15,1.134V41.019z" fill="url(#SVGID_8_)"/>
 <path d="M38.543,40.924c-0.678,0-1.229-0.55-1.229-1.229v-1.843c0-0.679,0.551-1.228,1.229-1.228  h1.842c0.678,0,1.229,0.549,1.229,1.228v1.843c0,0.679-0.551,1.229-1.229,1.229H38.543z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="39.4639" x2="39.4639" y1="37.2236" y2="40.3145">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M38.543,40.31c-0.338,0-0.615-0.276-0.615-0.614v-1.843c0-0.338,0.277-0.614,0.615-0.614h1.842  c0.338,0,0.615,0.276,0.615,0.614v1.843c0,0.338-0.277,0.614-0.615,0.614H38.543z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.6831" x2="29.6831" y1="34.748" y2="42.165">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M29.329,42.152c-1.302,0-2.362-1.06-2.362-2.362v-2.646  c0-1.303,1.06-2.362,2.362-2.362h0.709c1.302,0,2.362,1.06,2.362,2.362v2.646c0,1.303-1.061,2.362-2.362,2.362H29.329z" fill="url(#SVGID_10_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.6831" x2="29.6831" y1="35.3672" y2="41.5488">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M29.329,41.538c-0.963,0-1.748-0.784-1.748-1.748v-2.646  c0-0.963,0.785-1.749,1.748-1.749h0.709c0.964,0,1.747,0.786,1.747,1.749v2.646c0,0.964-0.783,1.748-1.747,1.748H29.329z" fill="url(#SVGID_11_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="29.6831" x2="29.6831" y1="35.9873" y2="40.9326">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M31.172,39.79c0,0.626-0.508,1.134-1.134,1.134h-0.709c-0.625,0-1.134-0.508-1.134-1.134v-2.646  c0-0.627,0.508-1.135,1.134-1.135h0.709c0.626,0,1.134,0.508,1.134,1.135V39.79z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="48.9043" x2="48.9043" y1="34.748" y2="42.165">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M48.549,42.152c-1.301,0-2.361-1.06-2.361-2.362v-2.646  c0-1.303,1.061-2.362,2.361-2.362h0.709c1.303,0,2.363,1.06,2.363,2.362v2.646c0,1.303-1.061,2.362-2.363,2.362H48.549z" fill="url(#SVGID_13_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="48.9033" x2="48.9033" y1="35.3672" y2="41.5488">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M48.549,41.538c-0.963,0-1.748-0.784-1.748-1.748v-2.646  c0-0.963,0.785-1.749,1.748-1.749h0.709c0.965,0,1.748,0.786,1.748,1.749v2.646c0,0.964-0.783,1.748-1.748,1.748H48.549z" fill="url(#SVGID_14_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="48.9043" x2="48.9043" y1="35.9873" y2="40.9326">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+<stop offset="0" style="stop-color:#C6B17B"/>
+<stop offset="0.7455" style="stop-color:#98604F"/>
+<stop offset="1" style="stop-color:#7F3736"/>
 </linearGradient>
 <path d="M50.393,39.79c0,0.626-0.51,1.134-1.135,1.134h-0.709c-0.625,0-1.133-0.508-1.133-1.134v-2.646  c0-0.627,0.508-1.135,1.133-1.135h0.709c0.625,0,1.135,0.508,1.135,1.135V39.79z" fill="url(#SVGID_15_)"/>
 <path d="M45.141,28.398H33.898v-1.411c0-1.2,0.271-2.36,0.813-3.484c0.543-1.122,1.955-2.538,4.24-4.246  c1.324-0.989,2.172-1.764,2.541-2.325c0.369-0.561,0.555-1.121,0.555-1.677c0-0.893-0.32-1.597-0.959-2.108  c-0.639-0.515-1.465-0.771-2.482-0.771c-0.854,0-2.328,0.198-4.42,0.59v-2.086c1.785-0.375,3.35-0.561,4.693-0.561  c1.967,0,3.502,0.434,4.607,1.301c1.102,0.868,1.654,2.052,1.654,3.549c0,0.652-0.135,1.327-0.402,2.023  c-0.27,0.695-0.689,1.332-1.26,1.908c-0.57,0.574-1.395,1.271-2.469,2.086c-1.219,0.911-2.059,1.62-2.52,2.124  c-0.461,0.503-0.813,1.031-1.051,1.582c-0.24,0.553-0.369,1.083-0.389,1.592h8.09V28.398z" fill="#FFFFFF"/>
 <path d="M28.771,6.527h-3.647v36.239c0,0.166,0.018,0.327,0.049,0.482c0.024,0.127,0.066,0.247,0.111,0.366  c0.009,0.025,0.014,0.055,0.024,0.079c0.366,0.896,1.244,1.529,2.272,1.529h4.876V10.213C32.457,8.181,30.804,6.527,28.771,6.527z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <path d="M28.771,7.142h-3.647v35.625c0,0.166,0.018,0.327,0.049,0.482c0.024,0.127,0.066,0.247,0.111,0.366  c0.009,0.025,0.014,0.055,0.024,0.079c0.366,0.896,1.244,1.529,2.272,1.529h4.261V10.213C31.842,8.52,30.465,7.142,28.771,7.142z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="16.7939" x2="16.7939" y1="7.7559" y2="51.8661">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M31.229,49.522c0,1.357-1.1,2.458-2.457,2.458H4.816c-1.356,0-2.457-1.101-2.457-2.458v-39.31  c0-1.357,1.101-2.457,2.457-2.457h23.955c1.357,0,2.457,1.1,2.457,2.457V49.522z" fill="url(#SVGID_16_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="16.7939" x2="16.7939" y1="7.7559" y2="51.0995">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M28.771,7.756H4.816c-1.356,0-2.457,1.1-2.457,2.457v39.31c0,0.656,0.26,1.249,0.68,1.689  c-0.039-0.148-0.066-0.302-0.066-0.46v-1.229V11.441v-1.229c0-1.017,0.827-1.843,1.843-1.843h23.955  c1.017,0,1.842,0.826,1.842,1.843v1.229v38.081v1.229c0,0.158-0.025,0.312-0.064,0.46c0.418-0.44,0.68-1.033,0.68-1.689v-39.31  C31.229,8.855,30.129,7.756,28.771,7.756z" fill="url(#SVGID_17_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="16.7939" x2="16.7939" y1="10.8696" y2="40.3126">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <rect fill="url(#SVGID_18_)" fill-opacity="0.6" height="29.483" stroke-opacity="0.6" width="25.184" x="4.202" y="10.826"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="16.7939" x2="16.7939" y1="11.4834" y2="39.6986">
@@ -136,57 +136,57 @@
 <polygon fill="url(#SVGID_21_)" points="28.157,21.27 5.431,23.725 5.431,12.669 28.157,12.669 "/>
 <rect fill="#FFFFFF" fill-opacity="0.7" height="0.614" stroke-opacity="0.7" width="22.727" x="5.431" y="12.055"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="16.6992" x2="16.6992" y1="40.9492" y2="50.0804">
-<stop offset="0" style="stop-color:#B6BBBD"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M14.479,50.139c-1.316,0-2.387-1.062-2.387-2.363v-4.489  c0-1.303,1.071-2.362,2.387-2.362h4.44c1.315,0,2.387,1.06,2.387,2.362v4.489c0,1.302-1.071,2.363-2.387,2.363H14.479z" fill="url(#SVGID_22_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M14.476,49.522c-0.975,0-1.769-0.783-1.769-1.747v-4.489c0-0.965,0.794-1.748,1.769-1.748  h4.447c0.975,0,1.769,0.783,1.769,1.748v4.489c0,0.964-0.794,1.747-1.769,1.747H14.476z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="16.6992" x2="16.6992" y1="42.1211" y2="48.9199">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M20.077,47.775c0,0.626-0.515,1.133-1.149,1.133h-4.457c-0.634,0-1.15-0.507-1.15-1.133v-4.489  c0-0.625,0.516-1.134,1.15-1.134h4.457c0.634,0,1.149,0.509,1.149,1.134V47.775z" fill="url(#SVGID_23_)"/>
 <path d="M15.777,47.68c-0.677,0-1.228-0.55-1.228-1.229v-1.842c0-0.678,0.551-1.229,1.228-1.229h1.843  c0.677,0,1.229,0.551,1.229,1.229v1.842c0,0.679-0.551,1.229-1.229,1.229H15.777z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="16.6997" x2="16.6997" y1="43.9805" y2="47.0723">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M15.777,47.067c-0.337,0-0.613-0.278-0.613-0.616v-1.842c0-0.338,0.276-0.614,0.613-0.614h1.843  c0.337,0,0.614,0.276,0.614,0.614v1.842c0,0.338-0.277,0.616-0.614,0.616H15.777z" fill="url(#SVGID_24_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="6.9185" x2="6.9185" y1="41.5039" y2="48.9209">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M6.564,48.908c-1.303,0-2.362-1.06-2.362-2.361V43.9c0-1.303,1.06-2.362,2.362-2.362  h0.708c1.303,0,2.362,1.06,2.362,2.362v2.646c0,1.302-1.059,2.361-2.362,2.361H6.564z" fill="url(#SVGID_25_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="6.9189" x2="6.9189" y1="42.124" y2="48.3067">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M6.564,48.296c-0.964,0-1.748-0.785-1.748-1.749V43.9  c0-0.963,0.784-1.748,1.748-1.748h0.708c0.965,0,1.749,0.785,1.749,1.748v2.646c0,0.964-0.784,1.749-1.749,1.749H6.564z" fill="url(#SVGID_26_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="6.9185" x2="6.9185" y1="42.7441" y2="47.6885">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M8.407,46.547c0,0.626-0.508,1.133-1.134,1.133H6.564c-0.625,0-1.134-0.507-1.134-1.133V43.9  c0-0.627,0.508-1.134,1.134-1.134h0.708c0.626,0,1.134,0.507,1.134,1.134V46.547z" fill="url(#SVGID_27_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="26.1392" x2="26.1392" y1="41.5039" y2="48.9209">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M25.785,48.908c-1.303,0-2.362-1.06-2.362-2.361V43.9c0-1.303,1.06-2.362,2.362-2.362  h0.708c1.303,0,2.362,1.06,2.362,2.362v2.646c0,1.302-1.06,2.361-2.362,2.361H25.785z" fill="url(#SVGID_28_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="26.1392" x2="26.1392" y1="42.124" y2="48.3067">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M25.785,48.296c-0.965,0-1.749-0.785-1.749-1.749V43.9  c0-0.963,0.784-1.748,1.749-1.748h0.708c0.964,0,1.748,0.785,1.748,1.748v2.646c0,0.964-0.784,1.749-1.748,1.749H25.785z" fill="url(#SVGID_29_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="26.1392" x2="26.1392" y1="42.7441" y2="47.6885">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+<stop offset="0" style="stop-color:#C6B17B"/>
+<stop offset="0.7455" style="stop-color:#98604F"/>
+<stop offset="1" style="stop-color:#7F3736"/>
 </linearGradient>
 <path d="M27.627,46.547c0,0.626-0.508,1.133-1.134,1.133h-0.708c-0.626,0-1.134-0.507-1.134-1.133V43.9  c0-0.627,0.508-1.134,1.134-1.134h0.708c0.626,0,1.134,0.507,1.134,1.134V46.547z" fill="url(#SVGID_30_)"/>
 <path d="M22.736,35.155H11.479v-1.944h4.089V20.226l-4.089,0.764v-1.944l5.629-1.856h1.541v16.022h4.088V35.155z" fill="#FFFFFF"/>
@@ -199,8 +199,8 @@
 </linearGradient>
 <path d="M57.047,59H35.314c-0.328,0-0.594-0.266-0.594-0.592V32.039c0-0.324,0.266-0.591,0.594-0.591h15.906  c0.396,0,0.988,0.247,1.27,0.526l4.625,4.621c0.279,0.282,0.523,0.874,0.523,1.271v20.542C57.639,58.734,57.375,59,57.047,59  L57.047,59z" fill="url(#SVGID_31_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="46.1816" x2="46.1816" y1="32.1338" y2="58.3145">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+<stop offset="0" style="stop-color:#E7E8E7"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M56.957,58.314H35.406V32.134h15.814c0.213,0,0.633,0.174,0.785,0.326l4.625,4.62  c0.15,0.153,0.326,0.572,0.326,0.786V58.314L56.957,58.314z" fill="url(#SVGID_32_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="44.8232" x2="44.8232" y1="56.125" y2="42.3986">
@@ -210,59 +210,59 @@
 <rect fill="url(#SVGID_33_)" height="13.831" width="16.127" x="36.76" y="42.347"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="0.685" stroke-opacity="0.4" width="16.127" x="36.76" y="56.178"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="39.0664" x2="39.0664" y1="43.0127" y2="55.1728">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_34_)" height="3.772" width="2.934" x="37.6" y="51.523"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35_" x1="46.2803" x2="46.2803" y1="43.1504" y2="55.0011">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_35_)" height="3.771" width="2.713" x="44.924" y="43.142"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_36_" x1="42.7275" x2="42.7275" y1="43.1504" y2="55.0011">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_36_)" height="3.771" width="2.713" x="41.371" y="43.142"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_37_" x1="50.25" x2="50.25" y1="43.1504" y2="55.0011">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_37_)" height="3.771" width="3.551" x="48.475" y="43.142"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_38_" x1="46.2803" x2="46.2803" y1="43.0127" y2="55.1728">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_38_)" height="3.772" width="2.713" x="44.924" y="51.523"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_39_" x1="42.7275" x2="42.7275" y1="43.0127" y2="55.1728">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_39_)" height="3.772" width="2.713" x="41.371" y="51.523"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_40_" x1="44.8125" x2="44.8125" y1="43.1504" y2="54.9801">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <polygon fill="url(#SVGID_40_)" points="40.486,47.752 40.486,43.142 37.6,43.142 37.6,50.685 52.025,50.685 52.025,47.752 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_41_" x1="50.25" x2="50.25" y1="43.0127" y2="55.1728">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_41_)" height="3.772" width="3.551" x="48.475" y="51.523"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_application.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_application.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_application.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,54 +5,54 @@
 <rect fill="none" height="60" width="60"/>
 <g>
 <linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2266.5317" x2="-2266.5317" y1="-3740.9238" y2="-3730.1428">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="1" style="stop-color:#7DC51A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="1" style="stop-color:#66924D"/>
 </linearGradient>
 <path d="M53.46,11.174l-2.885-6.015c0,0-0.652-1.714-2.693-2.042H12.091   c-2.04,0.327-2.693,2.042-2.693,2.042l-2.886,6.015c-0.699,0.789-0.862,1.795-0.897,2.395h48.747   C54.326,12.969,54.163,11.963,53.46,11.174z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2266.5195" x2="-2266.5195" y1="-3734.1553" y2="-3685.6365">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.1394" style="stop-color:#AFED23"/>
-<stop offset="0.6909" style="stop-color:#3E8A0D"/>
-<stop offset="0.9515" style="stop-color:#7EF524"/>
-<stop offset="1" style="stop-color:#7EF524"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.1394" style="stop-color:#98B060"/>
+<stop offset="0.6909" style="stop-color:#336541"/>
+<stop offset="0.9515" style="stop-color:#89B663"/>
+<stop offset="1" style="stop-color:#89B663"/>
 </linearGradient>
 <path d="M54.386,53.631c0,1.926-1.558,3.484-3.481,3.484H9.099c-1.926,0-3.484-1.561-3.484-3.484V13.567   c0-1.923,1.558-3.483,3.484-3.483h41.806c1.921,0,3.481,1.56,3.481,3.483V53.631L54.386,53.631z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2266.5181" x2="-2266.5181" y1="-3734.0898" y2="-3698.1501">
-<stop offset="0" style="stop-color:#67AD1A"/>
-<stop offset="1" style="stop-color:#358C0C"/>
+<stop offset="0" style="stop-color:#4E8146"/>
+<stop offset="1" style="stop-color:#326644"/>
 </linearGradient>
 <path d="M12.583,44.923h34.835c1.927,0,3.486-1.561,3.486-3.485V10.084H9.099v31.353   C9.099,43.362,10.657,44.923,12.583,44.923z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2266.5195" x2="-2266.5195" y1="-3702.2539" y2="-3686.2131">
-<stop offset="0" style="stop-color:#358C0C"/>
-<stop offset="0.7758" style="stop-color:#67AD1A"/>
-<stop offset="1" style="stop-color:#AFED23"/>
+<stop offset="0" style="stop-color:#326644"/>
+<stop offset="0.7758" style="stop-color:#4E8146"/>
+<stop offset="1" style="stop-color:#98B060"/>
 </linearGradient>
 <path d="M49.22,44.408c-0.414,0.252-0.873,0.408-1.372,0.469c-0.115,0.027-0.248,0.046-0.43,0.046H12.583   c-0.183,0-0.317-0.019-0.429-0.046c-0.497-0.062-0.96-0.217-1.37-0.469l-4.68,10.979c0.605,1.029,1.714,1.729,2.995,1.729h41.806   c1.28,0,2.386-0.7,2.992-1.729L49.22,44.408z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2266.5195" x2="-2266.5195" y1="-3702.0195" y2="-3687.3784">
-<stop offset="0" style="stop-color:#0C4A06"/>
-<stop offset="0.3152" style="stop-color:#0A5E1C"/>
-<stop offset="0.7394" style="stop-color:#41AD1A"/>
-<stop offset="1" style="stop-color:#89D920"/>
+<stop offset="0" style="stop-color:#1A3635"/>
+<stop offset="0.3152" style="stop-color:#234345"/>
+<stop offset="0.7394" style="stop-color:#46814C"/>
+<stop offset="1" style="stop-color:#7EA257"/>
 </linearGradient>
 <path d="M10.784,46.15c0.41,0.248,0.873,0.409,1.37,0.474   c0.113,0.025,0.249,0.041,0.429,0.041h34.835c0.182,0,0.315-0.016,0.43-0.041c0.499-0.064,0.958-0.223,1.372-0.474l4.199,9.857   c0.177-0.193,0.345-0.393,0.478-0.62L49.22,44.408c-0.412,0.252-0.873,0.408-1.372,0.469c-0.116,0.027-0.248,0.046-0.428,0.046   H12.583c-0.183,0-0.317-0.019-0.429-0.046c-0.497-0.062-0.96-0.217-1.37-0.469l-4.68,10.979c0.13,0.228,0.298,0.43,0.477,0.62   L10.784,46.15z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2266.5181" x2="-2266.5181" y1="-3734.0898" y2="-3698.1499">
-<stop offset="0" style="stop-color:#87CC1F"/>
-<stop offset="0.6182" style="stop-color:#086311"/>
-<stop offset="1" style="stop-color:#06421E"/>
+<stop offset="0" style="stop-color:#739853"/>
+<stop offset="0.6182" style="stop-color:#234846"/>
+<stop offset="1" style="stop-color:#182830"/>
 </linearGradient>
 <path d="M9.099,10.084v31.353c0,1.926,1.558,3.485,3.484,3.485   h34.835c1.927,0,3.486-1.56,3.486-3.485V10.084H9.099z M49.162,41.437c0,0.963-0.786,1.744-1.744,1.744H12.583   c-0.96,0-1.744-0.781-1.744-1.744V11.826h38.323V41.437L49.162,41.437z" fill="url(#SVGID_6_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-2266.5181" x2="-2266.5181" y1="-3740.9043" y2="-3733.7168">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="1" style="stop-color:#358C0C"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="1" style="stop-color:#326644"/>
 </linearGradient>
 <path d="M50.904,6.6c0-1.922-1.561-3.482-3.486-3.482H12.583c-1.926,0-3.484,1.56-3.484,3.482v3.484h41.806   V6.6z" fill="url(#SVGID_7_)"/>
-<path d="M9.099,10.084h41.806c1.129,0,2.117,0.546,2.761,1.382   c-0.071-0.099-0.125-0.202-0.205-0.293l-2.885-6.015c0,0-0.652-1.714-2.695-2.042H12.091c-2.04,0.327-2.693,2.042-2.693,2.042   l-2.886,6.015c-0.244,0.275-0.405,0.575-0.538,0.876C6.541,10.89,7.717,10.084,9.099,10.084z" fill="#C7FF5A" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M53.867,11.76c0.016,0.025,0.027,0.053,0.046,0.081C53.896,11.811,53.883,11.788,53.867,11.76z" fill="#C7FF5A"/>
-<path d="M5.826,12.412c-0.01,0.023-0.017,0.048-0.023,0.074C5.812,12.461,5.816,12.435,5.826,12.412z" fill="#C7FF5A"/>
+<path d="M9.099,10.084h41.806c1.129,0,2.117,0.546,2.761,1.382   c-0.071-0.099-0.125-0.202-0.205-0.293l-2.885-6.015c0,0-0.652-1.714-2.695-2.042H12.091c-2.04,0.327-2.693,2.042-2.693,2.042   l-2.886,6.015c-0.244,0.275-0.405,0.575-0.538,0.876C6.541,10.89,7.717,10.084,9.099,10.084z" fill="#BBCE8B" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M53.867,11.76c0.016,0.025,0.027,0.053,0.046,0.081C53.896,11.811,53.883,11.788,53.867,11.76z" fill="#BBCE8B"/>
+<path d="M5.826,12.412c-0.01,0.023-0.017,0.048-0.023,0.074C5.812,12.461,5.816,12.435,5.826,12.412z" fill="#BBCE8B"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-2266.5195" x2="-2266.5195" y1="-3734.1553" y2="-3685.636">
-<stop offset="0" style="stop-color:#D4FFA8"/>
-<stop offset="0.6848" style="stop-color:#75D911"/>
-<stop offset="1" style="stop-color:#7EF524"/>
+<stop offset="0" style="stop-color:#D9E5C2"/>
+<stop offset="0.6848" style="stop-color:#699D4D"/>
+<stop offset="1" style="stop-color:#89B663"/>
 </linearGradient>
 <path d="M50.904,10.084H9.099c-1.926,0-3.484,1.56-3.484,3.483v40.064c0,1.926,1.558,3.484,3.484,3.484   h41.806c1.921,0,3.481-1.561,3.481-3.484V13.567C54.386,11.645,52.828,10.084,50.904,10.084z M52.646,53.631   c0,0.964-0.786,1.745-1.742,1.745H9.099c-0.958,0-1.744-0.781-1.744-1.745V13.567c0-0.961,0.784-1.741,1.744-1.741h41.806   c0.956,0,1.741,0.781,1.741,1.741L52.646,53.631L52.646,53.631z" fill="url(#SVGID_8_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_download.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_download.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_download.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,30 +4,30 @@
 <g>
 <rect fill="none" height="59.999" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2163.8232" x2="-2163.8232" y1="4093.1855" y2="4081.4014">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="0.6182" style="stop-color:#8A4117"/>
-<stop offset="1" style="stop-color:#702200"/>
+<stop offset="0" style="stop-color:#AF987C"/>
+<stop offset="0.6182" style="stop-color:#673F3A"/>
+<stop offset="1" style="stop-color:#4E2224"/>
 </linearGradient>
 <path d="M53.646,12.358c0,0-22.377,0-22.842,0c-0.463,0-1.002-0.202-1.332-1.01  c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697c-0.824,0-1.428,0.7-1.428,1.562v14.438h49.814  v-9.968C55.084,12.989,54.473,12.358,53.646,12.358z" fill="url(#SVGID_1_)"/>
-<path d="M53.646,12.358c0,0-22.377,0-22.842,0  c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697  c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236  c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489  v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" fill="#FFF7F5" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M53.646,12.358c0,0-22.377,0-22.842,0  c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697  c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236  c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489  v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" fill="#FCFAF8" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect height="8.728" width="46.906" x="6.73" y="15.817"/>
 <rect fill="#F2F2F2" height="7.271" width="45.451" x="7.457" y="16.545"/>
-<polygon fill="#231F20" fill-opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636   " stroke-opacity="0.4"/>
-<polygon fill="#231F20" fill-opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908   " stroke-opacity="0.15"/>
-<polygon fill="#231F20" fill-opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182   " stroke-opacity="0.05"/>
+<polygon fill="#222021" fill-opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636   " stroke-opacity="0.4"/>
+<polygon fill="#222021" fill-opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908   " stroke-opacity="0.15"/>
+<polygon fill="#222021" fill-opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182   " stroke-opacity="0.05"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="4048.7861" y2="4078.6064">
-<stop offset="0" style="stop-color:#C79101"/>
-<stop offset="0.0303" style="stop-color:#C79101"/>
-<stop offset="0.0364" style="stop-color:#FEEFA7"/>
-<stop offset="0.3273" style="stop-color:#FEE570"/>
-<stop offset="0.6727" style="stop-color:#F0C12B"/>
-<stop offset="1" style="stop-color:#E6A501"/>
+<stop offset="0" style="stop-color:#8C673C"/>
+<stop offset="0.0303" style="stop-color:#8C673C"/>
+<stop offset="0.0364" style="stop-color:#E4E0C1"/>
+<stop offset="0.3273" style="stop-color:#D3CC9B"/>
+<stop offset="0.6727" style="stop-color:#B5A366"/>
+<stop offset="1" style="stop-color:#A18046"/>
 </linearGradient>
 <path d="M56.273,22.362H3.727C2.191,22.362,2,24.065,2,24.065l2.549,25.934  c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184L58,24.065  C58,24.065,57.809,22.362,56.273,22.362z" fill="url(#SVGID_2_)"/>
-<path d="M3.727,23.091h52.547c1.178,0,1.563,0.995,1.68,1.464L58,24.065c0,0-0.191-1.703-1.727-1.703H3.727  C2.191,22.362,2,24.065,2,24.065l0.047,0.489C2.164,24.086,2.549,23.091,3.727,23.091z" fill="#FCF3D0"/>
+<path d="M3.727,23.091h52.547c1.178,0,1.563,0.995,1.68,1.464L58,24.065c0,0-0.191-1.703-1.727-1.703H3.727  C2.191,22.362,2,24.065,2,24.065l0.047,0.489C2.164,24.086,2.549,23.091,3.727,23.091z" fill="#EFEDDD"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0166" x2="-2164.0166" y1="4048.7861" y2="4053.1504">
-<stop offset="0" style="stop-color:#FCDA5E"/>
-<stop offset="1" style="stop-color:#FFB418"/>
+<stop offset="0" style="stop-color:#CDC18D"/>
+<stop offset="1" style="stop-color:#BA9D5D"/>
 </linearGradient>
 <path d="M4.334,47.818l0.215,2.181  c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184l0.184-2.181H4.334z" fill="url(#SVGID_3_)" fill-opacity="0.25" stroke-opacity="0.25"/>
 <rect fill="none" height="59.999" width="60"/>
@@ -36,18 +36,18 @@
 <polygon fill="none" points="30.096,0 0.096,0 0.096,14.833 0,14.833 0.096,14.933 0.096,30 14.601,30 15.021,30.438 15.447,30   30.096,30 30.096,14.963 30.215,14.841 30.096,14.841 "/>
 <polygon fill-opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841   15.021,30.438 " stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2176.5142" x2="-2176.5142" y1="2984.646" y2="2957.3247">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="2.846,15.859 15.025,28.575 27.398,15.845 20.732,15.843 20.727,1.292 9.375,1.291   9.375,15.859 "/>
 <line fill="none" x1="20.727" x2="9.375" y1="1.297" y2="1.296"/>
-<polygon fill="#E7FFB9" points="9.375,1 20.729,1.001 20.727,1.593 9.375,1.592 "/>
-<polygon fill="#E7FFB9" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
-<polygon fill="#E7FFB9" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
+<polygon fill="#E4EACE" points="9.375,1 20.729,1.001 20.727,1.593 9.375,1.592 "/>
+<polygon fill="#E4EACE" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
+<polygon fill="#E4EACE" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2165.6621" x2="-2187.9482" y1="2963.2173" y2="2963.2173">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="27.016,15.844 15.025,28.15 3.172,15.829 2.348,15.83 15.025,29 27.842,15.844 "/>
 <rect fill="none" height="30" width="30" x="0.096"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_games.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_games.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_games.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,30 +4,30 @@
 <g>
 <rect fill="none" height="59.999" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2163.8232" x2="-2163.8232" y1="4093.1855" y2="4081.4014">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="0.6182" style="stop-color:#8A4117"/>
-<stop offset="1" style="stop-color:#702200"/>
+<stop offset="0" style="stop-color:#AF987C"/>
+<stop offset="0.6182" style="stop-color:#673F3A"/>
+<stop offset="1" style="stop-color:#4E2224"/>
 </linearGradient>
 <path d="M53.646,12.358c0,0-22.377,0-22.842,0c-0.463,0-1.002-0.202-1.332-1.01  c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697c-0.824,0-1.428,0.7-1.428,1.562v14.438h49.814  v-9.968C55.084,12.989,54.473,12.358,53.646,12.358z" fill="url(#SVGID_1_)"/>
-<path d="M53.646,12.358c0,0-22.377,0-22.842,0  c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697  c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236  c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489  v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" fill="#FFF7F5" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M53.646,12.358c0,0-22.377,0-22.842,0  c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697  c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236  c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489  v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" fill="#FCFAF8" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect height="8.728" width="46.906" x="6.73" y="15.817"/>
 <rect fill="#F2F2F2" height="7.271" width="45.451" x="7.457" y="16.545"/>
-<polygon fill="#231F20" fill-opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636   " stroke-opacity="0.4"/>
-<polygon fill="#231F20" fill-opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908   " stroke-opacity="0.15"/>
-<polygon fill="#231F20" fill-opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182   " stroke-opacity="0.05"/>
+<polygon fill="#222021" fill-opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636   " stroke-opacity="0.4"/>
+<polygon fill="#222021" fill-opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908   " stroke-opacity="0.15"/>
+<polygon fill="#222021" fill-opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182   " stroke-opacity="0.05"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="4048.7861" y2="4078.6064">
-<stop offset="0" style="stop-color:#C79101"/>
-<stop offset="0.0303" style="stop-color:#C79101"/>
-<stop offset="0.0364" style="stop-color:#FEEFA7"/>
-<stop offset="0.3273" style="stop-color:#FEE570"/>
-<stop offset="0.6727" style="stop-color:#F0C12B"/>
-<stop offset="1" style="stop-color:#E6A501"/>
+<stop offset="0" style="stop-color:#8C673C"/>
+<stop offset="0.0303" style="stop-color:#8C673C"/>
+<stop offset="0.0364" style="stop-color:#E4E0C1"/>
+<stop offset="0.3273" style="stop-color:#D3CC9B"/>
+<stop offset="0.6727" style="stop-color:#B5A366"/>
+<stop offset="1" style="stop-color:#A18046"/>
 </linearGradient>
 <path d="M56.273,22.362H3.727C2.191,22.362,2,24.065,2,24.065l2.549,25.934  c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184L58,24.065  C58,24.065,57.809,22.362,56.273,22.362z" fill="url(#SVGID_2_)"/>
-<path d="M3.727,23.091h52.547c1.178,0,1.563,0.995,1.68,1.464L58,24.065c0,0-0.191-1.703-1.727-1.703H3.727  C2.191,22.362,2,24.065,2,24.065l0.047,0.489C2.164,24.086,2.549,23.091,3.727,23.091z" fill="#FCF3D0"/>
+<path d="M3.727,23.091h52.547c1.178,0,1.563,0.995,1.68,1.464L58,24.065c0,0-0.191-1.703-1.727-1.703H3.727  C2.191,22.362,2,24.065,2,24.065l0.047,0.489C2.164,24.086,2.549,23.091,3.727,23.091z" fill="#EFEDDD"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0166" x2="-2164.0166" y1="4048.7861" y2="4053.1504">
-<stop offset="0" style="stop-color:#FCDA5E"/>
-<stop offset="1" style="stop-color:#FFB418"/>
+<stop offset="0" style="stop-color:#CDC18D"/>
+<stop offset="1" style="stop-color:#BA9D5D"/>
 </linearGradient>
 <path d="M4.334,47.818l0.215,2.181  c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184l0.184-2.181H4.334z" fill="url(#SVGID_3_)" fill-opacity="0.25" stroke-opacity="0.25"/>
 <rect fill="none" height="59.999" width="60"/>
@@ -36,232 +36,232 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M26.458,25.825c-1.436,0-2.695-0.801-3.367-2.143c-0.775-1.542-2.788-6.932-2.788-6.932  c-0.324-0.144-0.635-0.312-0.932-0.503h-8.742c-0.348,0.224-0.715,0.417-1.1,0.576c0,0-1.844,5.316-2.617,6.86  c-0.674,1.342-1.933,2.143-3.368,2.143c-1.565,0-2.854-0.985-3.138-2.395C0.088,21.848,0,10.468,0,10.468  c0.014-3.823,3.107-6.905,6.896-6.905c1.332,0,2.617,0.381,3.734,1.105h8.738c1.117-0.725,2.403-1.105,3.735-1.105  c3.451,0,6.322,2.556,6.818,5.874c0,0-0.121,12.96-0.328,13.995C29.313,24.84,28.022,25.825,26.458,25.825L26.458,25.825z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179.1841" x2="-2179.1841" y1="3223.6826" y2="3213.8577">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.5394" style="stop-color:#A8B2B8"/>
-<stop offset="1" style="stop-color:#A1AAAD"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.0424" style="stop-color:#ECEFED"/>
+<stop offset="0.5394" style="stop-color:#ADB3B3"/>
+<stop offset="1" style="stop-color:#A5A9A9"/>
 </linearGradient>
 <rect fill="url(#SVGID_1__)" height="9.579" width="12.896" x="8.368" y="5.668"/>
 <rect fill="#FFFFFF" height="0.368" width="12.526" x="8.737" y="5.668"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2193.1895" x2="-2186.1226" y1="3212.127" y2="3210.9614">
-<stop offset="0" style="stop-color:#949899"/>
-<stop offset="0.3273" style="stop-color:#B0B5B8"/>
-<stop offset="0.7212" style="stop-color:#848D8F"/>
-<stop offset="1" style="stop-color:#8A9294"/>
+<stop offset="0" style="stop-color:#969798"/>
+<stop offset="0.3273" style="stop-color:#B2B6B5"/>
+<stop offset="0.7212" style="stop-color:#878B8C"/>
+<stop offset="1" style="stop-color:#8D9191"/>
 </linearGradient>
 <path d="M1,10.437c0,0,0,10.875,0.387,12.798c0.386,1.924,3.473,2.309,4.631,0  c1.158-2.309,3.088-7.796,3.088-7.796s-1.543-3.848-3.473-4.616C3.703,10.052,1,10.437,1,10.437z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-2193.2305" x2="-2186.1636" y1="3211.8779" y2="3210.7124">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#303030"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M6.018,22.615c-1.158,2.308-4.245,1.924-4.631,0  c-0.331-1.648-0.378-9.855-0.385-12.178H1c0,0,0,10.875,0.387,12.798c0.386,1.924,3.473,2.309,4.631,0  c1.158-2.309,3.088-7.796,3.088-7.796s-0.041-0.104-0.119-0.281C8.547,16.383,7.003,20.649,6.018,22.615z" fill="url(#SVGID_3__)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(-1 0 0 -1 -3497.2295 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-3526.4194" x2="-3519.3518" y1="3212.127" y2="3210.9612">
-<stop offset="0" style="stop-color:#949899"/>
-<stop offset="0.3273" style="stop-color:#B0B5B8"/>
-<stop offset="0.7212" style="stop-color:#848D8F"/>
-<stop offset="1" style="stop-color:#8A9294"/>
+<stop offset="0" style="stop-color:#969798"/>
+<stop offset="0.3273" style="stop-color:#B2B6B5"/>
+<stop offset="0.7212" style="stop-color:#878B8C"/>
+<stop offset="1" style="stop-color:#8D9191"/>
 </linearGradient>
 <path d="M29,10.437c0,0,0,10.875-0.387,12.798c-0.385,1.924-3.473,2.309-4.631,0  c-1.158-2.309-3.088-7.796-3.088-7.796s1.545-3.848,3.475-4.616C26.299,10.052,29,10.437,29,10.437z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2172.3784" x2="-2165.251" y1="3212.6367" y2="3211.4612">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#303030"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M28.614,22.615c-0.385,1.924-3.473,2.308-4.631,0  c-0.986-1.965-2.53-6.231-2.967-7.458c-0.078,0.177-0.121,0.281-0.121,0.281s1.93,5.487,3.088,7.796  c1.158,2.309,4.246,1.924,4.631,0C29,21.312,29,10.437,29,10.437l0,0C28.993,12.76,28.946,20.967,28.614,22.615z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2183.0532" x2="-2183.0532" y1="3223.5195" y2="3214.0896">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#303030"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M8.368,15.247h3.101c1.265-1.209,2.057-2.907,2.057-4.79  c0-1.884-0.792-3.581-2.057-4.79H8.368V15.247z" fill="url(#SVGID_6_)" fill-opacity="0.05" stroke-opacity="0.05"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-2183.2368" x2="-2183.2368" y1="3223.5195" y2="3214.0896">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#303030"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M8.368,15.247h2.556c1.364-1.149,2.234-2.87,2.234-4.79  c0-1.92-0.87-3.64-2.234-4.79H8.368V15.247z" fill="url(#SVGID_7_)" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-2188.9473" x2="-2188.9473" y1="3218.873" y2="3212.23">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#303030"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M5.633,10.822C3.703,10.052,1,10.437,1,10.437  s0,1.299,0.016,3.077c1.108,2.121,3.326,3.575,5.881,3.575c0.587,0,1.154-0.085,1.697-0.229c0.311-0.85,0.512-1.421,0.512-1.421  S7.563,11.591,5.633,10.822z" fill="url(#SVGID_8_)" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-2188.9473" x2="-2188.9473" y1="3218.877" y2="3212.5967">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#303030"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M5.633,10.822C3.703,10.052,1,10.437,1,10.437  s0,0.86,0.009,2.139c0.873,2.413,3.179,4.146,5.888,4.146c0.643,0,1.266-0.1,1.851-0.281c0.221-0.611,0.358-1.001,0.358-1.001  S7.563,11.591,5.633,10.822z" fill="url(#SVGID_9_)" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-2187.1045" x2="-2187.1045" y1="3224.4238" y2="3213.1807">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.4" style="stop-color:#D4D9DB"/>
-<stop offset="0.7333" style="stop-color:#B0BCBF"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.0424" style="stop-color:#ECEFED"/>
+<stop offset="0.4" style="stop-color:#D6D9D7"/>
+<stop offset="0.7333" style="stop-color:#B4BBB9"/>
+<stop offset="1" style="stop-color:#D4DAD7"/>
 </linearGradient>
 <path d="M6.896,4.747c3.152,0,5.709,2.557,5.709,5.71c0,3.155-2.557,5.71-5.709,5.71  c-3.156,0-5.711-2.556-5.711-5.71C1.186,7.304,3.74,4.747,6.896,4.747z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-2187.105" x2="-2187.105" y1="3224.6045" y2="3212.999">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="0.0424" style="stop-color:#F6FDFF"/>
-<stop offset="0.4" style="stop-color:#E6EBED"/>
-<stop offset="0.7333" style="stop-color:#B0BCBF"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
+<stop offset="0" style="stop-color:#F9FCF9"/>
+<stop offset="0.0424" style="stop-color:#F9FCF9"/>
+<stop offset="0.4" style="stop-color:#E8EBE9"/>
+<stop offset="0.7333" style="stop-color:#B4BBB9"/>
+<stop offset="1" style="stop-color:#D4DAD7"/>
 </linearGradient>
 <path d="M6.896,4.563C3.639,4.563,1,7.202,1,10.458c0,3.254,2.639,5.894,5.896,5.894  c3.254,0,5.894-2.64,5.894-5.894C12.79,7.202,10.15,4.563,6.896,4.563z M6.896,15.984c-3.049,0-5.528-2.479-5.528-5.526  s2.479-5.526,5.528-5.526c3.046,0,5.524,2.479,5.524,5.526S9.942,15.984,6.896,15.984z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="-2175.1309" x2="-2175.1309" y1="3223.5195" y2="3214.0898">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#303030"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M16.475,10.458c0,1.883,0.792,3.58,2.058,4.79h2.731  V5.668h-2.731C17.267,6.876,16.475,8.574,16.475,10.458z" fill="url(#SVGID_12_)" fill-opacity="0.05" stroke-opacity="0.05"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-2174.9473" x2="-2174.9473" y1="3223.5195" y2="3214.0898">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#303030"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M16.842,10.458c0,1.919,0.87,3.64,2.236,4.79h2.186  V5.668h-2.186C17.712,6.817,16.842,8.537,16.842,10.458z" fill="url(#SVGID_13_)" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-2169.0527" x2="-2169.0527" y1="3218.874" y2="3212.231">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#303030"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M28.985,13.515C29,11.735,29,10.437,29,10.437  s-2.701-0.384-4.631,0.386c-1.93,0.769-3.475,4.616-3.475,4.616s0.202,0.571,0.512,1.422c0.543,0.144,1.112,0.229,1.698,0.229  C25.659,17.089,27.875,15.636,28.985,13.515z" fill="url(#SVGID_14_)" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="-2169.0527" x2="-2169.0527" y1="3218.877" y2="3212.5967">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#303030"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M28.991,12.575C29,11.297,29,10.437,29,10.437  s-2.701-0.384-4.631,0.386c-1.93,0.769-3.475,4.616-3.475,4.616s0.138,0.39,0.359,1.001c0.586,0.182,1.208,0.281,1.85,0.281  C25.815,16.721,28.12,14.988,28.991,12.575z" fill="url(#SVGID_15_)" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="-2170.8945" x2="-2170.8945" y1="3224.4238" y2="3213.1809">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.4" style="stop-color:#D4D9DB"/>
-<stop offset="0.7333" style="stop-color:#B0BCBF"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.0424" style="stop-color:#ECEFED"/>
+<stop offset="0.4" style="stop-color:#D6D9D7"/>
+<stop offset="0.7333" style="stop-color:#B4BBB9"/>
+<stop offset="1" style="stop-color:#D4DAD7"/>
 </linearGradient>
 <path d="M23.104,4.747c3.154,0,5.713,2.557,5.713,5.71c0,3.155-2.559,5.71-5.713,5.71  c-3.152,0-5.709-2.556-5.709-5.71C17.395,7.304,19.952,4.747,23.104,4.747z" fill="url(#SVGID_16_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="-2170.8945" x2="-2170.8945" y1="3224.6045" y2="3212.9993">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="0.0424" style="stop-color:#F6FDFF"/>
-<stop offset="0.4" style="stop-color:#E6EBED"/>
-<stop offset="0.7333" style="stop-color:#B0BCBF"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
+<stop offset="0" style="stop-color:#F9FCF9"/>
+<stop offset="0.0424" style="stop-color:#F9FCF9"/>
+<stop offset="0.4" style="stop-color:#E8EBE9"/>
+<stop offset="0.7333" style="stop-color:#B4BBB9"/>
+<stop offset="1" style="stop-color:#D4DAD7"/>
 </linearGradient>
 <path d="M23.104,4.563c-3.254,0-5.894,2.64-5.894,5.895c0,3.254,2.64,5.894,5.894,5.894  c3.258,0,5.896-2.64,5.896-5.894C29,7.202,26.362,4.563,23.104,4.563z M23.104,15.984c-3.046,0-5.525-2.479-5.525-5.526  s2.479-5.526,5.525-5.526c3.051,0,5.527,2.479,5.527,5.526S26.155,15.984,23.104,15.984z" fill="url(#SVGID_17_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="-2187.106" x2="-2187.106" y1="3221.9912" y2="3215.072">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#303030"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M6.58,14.142c-0.437,0-0.79-0.355-0.79-0.791v-1.419  H4.369c-0.436,0-0.791-0.354-0.791-0.791v-0.683c0-0.436,0.355-0.79,0.791-0.79H5.79V8.299c0-0.435,0.354-0.789,0.79-0.789h0.683  c0.437,0,0.791,0.354,0.791,0.789v1.369h1.419c0.438,0,0.737,0.354,0.737,0.79v0.683c0,0.437-0.3,0.791-0.737,0.791H8.054v1.419  c0,0.436-0.354,0.791-0.791,0.791H6.58z" fill="url(#SVGID_18_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="-2187.106" x2="-2187.106" y1="3222.3604" y2="3215.4402">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#666666"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M6.58,13.773c-0.437,0-0.79-0.354-0.79-0.79v-1.421H4.369c-0.436,0-0.791-0.354-0.791-0.79V10.09  c0-0.436,0.355-0.79,0.791-0.79H5.79V7.931c0-0.435,0.354-0.79,0.79-0.79h0.683c0.437,0,0.791,0.355,0.791,0.79V9.3h1.419  c0.438,0,0.737,0.354,0.737,0.79v0.683c0,0.436-0.3,0.79-0.737,0.79H8.054v1.421c0,0.436-0.354,0.79-0.791,0.79H6.58z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="-2187.1055" x2="-2187.1055" y1="3221.9668" y2="3215.8157">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.3879" style="stop-color:#7B7E80"/>
-<stop offset="0.7152" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#63686A"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.3879" style="stop-color:#7D7E7F"/>
+<stop offset="0.7152" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#656768"/>
 </linearGradient>
 <path d="M9.473,9.668H7.685V7.931c0-0.232-0.187-0.421-0.421-0.421H6.58c-0.233,0-0.422,0.188-0.422,0.421  v1.737H4.369c-0.234,0-0.422,0.188-0.422,0.422v0.683c0,0.233,0.188,0.422,0.422,0.422h1.789v1.789c0,0.232,0.188,0.422,0.422,0.422  h0.684c0.234,0,0.421-0.189,0.421-0.422v-1.789h1.788c0.234,0,0.369-0.189,0.369-0.422V10.09C9.842,9.856,9.707,9.668,9.473,9.668z" fill="url(#SVGID_20_)"/>
 <path d="M4.369,10.036h1.789V9.668H4.369c-0.234,0-0.422,0.188-0.422,0.422v0.368  C3.947,10.225,4.135,10.036,4.369,10.036z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
 <path d="M6.58,7.878h0.683c0.235,0,0.422,0.189,0.422,0.421V7.931c0-0.232-0.187-0.421-0.422-0.421  H6.58c-0.234,0-0.422,0.188-0.422,0.421v0.368C6.158,8.067,6.347,7.878,6.58,7.878z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
 <path d="M9.473,9.668H7.685v0.368h1.788c0.234,0,0.369,0.189,0.369,0.422V10.09  C9.842,9.856,9.707,9.668,9.473,9.668z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="-2168.3159" x2="-2168.3159" y1="3219.7852" y2="3217.5706">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#303030"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M25.682,11.932c-0.607,0-1.104-0.497-1.104-1.106  c0-0.608,0.496-1.104,1.104-1.104c0.611,0,1.107,0.496,1.107,1.104C26.79,11.435,26.293,11.932,25.682,11.932L25.682,11.932z" fill="url(#SVGID_21_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="-2168.3159" x2="-2168.3159" y1="3220.0801" y2="3217.8655">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#666666"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M25.682,11.637c-0.607,0-1.104-0.498-1.104-1.106c0-0.61,0.496-1.104,1.104-1.104  c0.611,0,1.107,0.495,1.107,1.104C26.79,11.141,26.293,11.637,25.682,11.637L25.682,11.637z" fill="url(#SVGID_22_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="-2168.3159" x2="-2168.3159" y1="3219.6377" y2="3218.1604">
-<stop offset="0" style="stop-color:#F0653D"/>
-<stop offset="0.103" style="stop-color:#C94832"/>
-<stop offset="0.7515" style="stop-color:#89181F"/>
-<stop offset="1" style="stop-color:#961A22"/>
+<stop offset="0" style="stop-color:#BA8873"/>
+<stop offset="0.103" style="stop-color:#9C685F"/>
+<stop offset="0.7515" style="stop-color:#673A45"/>
+<stop offset="1" style="stop-color:#713F4A"/>
 </linearGradient>
 <circle cx="25.682" cy="10.531" fill="url(#SVGID_23_)" r="0.737"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="-2173.4736" x2="-2173.4736" y1="3219.6211" y2="3217.4065">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#303030"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M20.525,11.932c-0.608,0-1.104-0.497-1.104-1.106  c0-0.608,0.496-1.104,1.104-1.104c0.609,0,1.106,0.496,1.106,1.104C21.631,11.435,21.135,11.932,20.525,11.932L20.525,11.932z" fill="url(#SVGID_24_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="-2173.4736" x2="-2173.4736" y1="3219.916" y2="3217.7014">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#666666"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M20.525,11.637c-0.608,0-1.104-0.498-1.104-1.106c0-0.61,0.496-1.104,1.104-1.104  c0.609,0,1.106,0.495,1.106,1.104C21.631,11.141,21.135,11.637,20.525,11.637L20.525,11.637z" fill="url(#SVGID_25_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="-2173.4741" x2="-2173.4741" y1="3219.5283" y2="3218.051">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.7394" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.7394" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </linearGradient>
 <circle cx="20.525" cy="10.531" fill="url(#SVGID_26_)" r="0.737"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="-2170.895" x2="-2170.895" y1="3222.2549" y2="3220.0405">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#303030"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M23.104,9.352C22.495,9.352,22,8.857,22,8.247  c0-0.61,0.494-1.106,1.104-1.106s1.105,0.496,1.105,1.106C24.209,8.855,23.713,9.352,23.104,9.352L23.104,9.352z" fill="url(#SVGID_27_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="-2170.895" x2="-2170.895" y1="3222.6221" y2="3220.4084">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#666666"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M23.104,8.984C22.495,8.984,22,8.488,22,7.878c0-0.609,0.494-1.104,1.104-1.104  s1.105,0.496,1.105,1.104C24.209,8.488,23.713,8.984,23.104,8.984L23.104,8.984z" fill="url(#SVGID_28_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="-2170.896" x2="-2170.896" y1="3222.2158" y2="3220.7397">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="0.5091" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#F6A800"/>
+<stop offset="0" style="stop-color:#E4E0C1"/>
+<stop offset="0.5091" style="stop-color:#B39C4D"/>
+<stop offset="1" style="stop-color:#AC8A4A"/>
 </linearGradient>
 <circle cx="23.104" cy="7.878" fill="url(#SVGID_29_)" r="0.737"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="-2170.895" x2="-2170.895" y1="3216.9248" y2="3214.7102">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#303030"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M23.104,14.51c-0.609,0-1.104-0.496-1.104-1.104  c0-0.61,0.494-1.106,1.104-1.106s1.105,0.496,1.105,1.106C24.209,14.014,23.713,14.51,23.104,14.51L23.104,14.51z" fill="url(#SVGID_30_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="-2170.895" x2="-2170.895" y1="3217.292" y2="3215.0784">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#666666"/>
 <stop offset="0.7212" style="stop-color:#141414"/>
 <stop offset="1" style="stop-color:#262626"/>
 </linearGradient>
 <path d="M23.104,14.142c-0.609,0-1.104-0.497-1.104-1.106c0-0.61,0.494-1.104,1.104-1.104  s1.105,0.495,1.105,1.104C24.209,13.645,23.713,14.142,23.104,14.142L23.104,14.142z" fill="url(#SVGID_31_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="-2170.896" x2="-2170.896" y1="3216.9424" y2="3215.4653">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.7333" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#B4DCCA"/>
+<stop offset="0.7333" style="stop-color:#3D568F"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </linearGradient>
 <circle cx="23.104" cy="13.036" fill="url(#SVGID_32_)" r="0.737"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_office.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_office.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_office.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,30 +4,30 @@
 <g>
 <rect fill="none" height="59.999" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2163.8232" x2="-2163.8232" y1="4093.1855" y2="4081.4014">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="0.6182" style="stop-color:#8A4117"/>
-<stop offset="1" style="stop-color:#702200"/>
+<stop offset="0" style="stop-color:#AF987C"/>
+<stop offset="0.6182" style="stop-color:#673F3A"/>
+<stop offset="1" style="stop-color:#4E2224"/>
 </linearGradient>
 <path d="M53.646,12.358c0,0-22.377,0-22.842,0c-0.463,0-1.002-0.202-1.332-1.01  c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697c-0.824,0-1.428,0.7-1.428,1.562v14.438h49.814  v-9.968C55.084,12.989,54.473,12.358,53.646,12.358z" fill="url(#SVGID_1_)"/>
-<path d="M53.646,12.358c0,0-22.377,0-22.842,0  c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697  c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236  c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489  v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" fill="#FFF7F5" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M53.646,12.358c0,0-22.377,0-22.842,0  c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697  c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236  c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489  v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" fill="#FCFAF8" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect height="8.728" width="46.906" x="6.73" y="15.817"/>
 <rect fill="#F2F2F2" height="7.271" width="45.451" x="7.457" y="16.545"/>
-<polygon fill="#231F20" fill-opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636   " stroke-opacity="0.4"/>
-<polygon fill="#231F20" fill-opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908   " stroke-opacity="0.15"/>
-<polygon fill="#231F20" fill-opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182   " stroke-opacity="0.05"/>
+<polygon fill="#222021" fill-opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636   " stroke-opacity="0.4"/>
+<polygon fill="#222021" fill-opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908   " stroke-opacity="0.15"/>
+<polygon fill="#222021" fill-opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182   " stroke-opacity="0.05"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="4048.7861" y2="4078.6064">
-<stop offset="0" style="stop-color:#C79101"/>
-<stop offset="0.0303" style="stop-color:#C79101"/>
-<stop offset="0.0364" style="stop-color:#FEEFA7"/>
-<stop offset="0.3273" style="stop-color:#FEE570"/>
-<stop offset="0.6727" style="stop-color:#F0C12B"/>
-<stop offset="1" style="stop-color:#E6A501"/>
+<stop offset="0" style="stop-color:#8C673C"/>
+<stop offset="0.0303" style="stop-color:#8C673C"/>
+<stop offset="0.0364" style="stop-color:#E4E0C1"/>
+<stop offset="0.3273" style="stop-color:#D3CC9B"/>
+<stop offset="0.6727" style="stop-color:#B5A366"/>
+<stop offset="1" style="stop-color:#A18046"/>
 </linearGradient>
 <path d="M56.273,22.362H3.727C2.191,22.362,2,24.065,2,24.065l2.549,25.934  c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184L58,24.065  C58,24.065,57.809,22.362,56.273,22.362z" fill="url(#SVGID_2_)"/>
-<path d="M3.727,23.091h52.547c1.178,0,1.563,0.995,1.68,1.464L58,24.065c0,0-0.191-1.703-1.727-1.703H3.727  C2.191,22.362,2,24.065,2,24.065l0.047,0.489C2.164,24.086,2.549,23.091,3.727,23.091z" fill="#FCF3D0"/>
+<path d="M3.727,23.091h52.547c1.178,0,1.563,0.995,1.68,1.464L58,24.065c0,0-0.191-1.703-1.727-1.703H3.727  C2.191,22.362,2,24.065,2,24.065l0.047,0.489C2.164,24.086,2.549,23.091,3.727,23.091z" fill="#EFEDDD"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0166" x2="-2164.0166" y1="4048.7861" y2="4053.1504">
-<stop offset="0" style="stop-color:#FCDA5E"/>
-<stop offset="1" style="stop-color:#FFB418"/>
+<stop offset="0" style="stop-color:#CDC18D"/>
+<stop offset="1" style="stop-color:#BA9D5D"/>
 </linearGradient>
 <path d="M4.334,47.818l0.215,2.181  c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184l0.184-2.181H4.334z" fill="url(#SVGID_3_)" fill-opacity="0.25" stroke-opacity="0.25"/>
 <rect fill="none" height="59.999" width="60"/>
@@ -41,29 +41,29 @@
 <path d="M24.17,10.71v-6.744c0.011-0.331-0.264-0.601-0.603-0.601h-17.24c-0.338,0-0.613,0.27-0.613,0.601v6.747h18.45z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.94" x2="14.94" y1="4.357" y2="9.705">
 <stop offset="0" stop-color="#E6E6E6"/>
-<stop offset="0.8182" stop-color="#7C7E87"/>
-<stop offset="1" stop-color="#94979D"/>
+<stop offset="0.8182" stop-color="#7F8084"/>
+<stop offset="1" stop-color="#97999A"/>
 </linearGradient>
 <rect fill="url(#SVGID_2__)" height="5.348" width="16.45" x="6.72" y="4.365"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.94" x2="14.94" y1="4.906" y2="9.21">
-<stop offset="0" stop-color="#686C6E"/>
-<stop offset="1" stop-color="#CAD3D6"/>
+<stop offset="0" stop-color="#6A6B6C"/>
+<stop offset="1" stop-color="#CED2D0"/>
 </linearGradient>
 <path d="M7.863,9.182c-0.338,0-0.612-0.28-0.612-0.625v-3.036c0-0.346,0.274-0.625,0.612-0.625h14.16c0.338,0,0.613,0.279,0.613,0.625v3.035c0,0.345-0.275,0.625-0.613,0.625h-14.16z" fill="url(#SVGID_3__)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.94" x2="14.94" y1="-0.0059" y2="10.68">
-<stop offset="0" stop-color="#45E8FF"/>
-<stop offset="0.1455" stop-color="#45E8FF"/>
-<stop offset="0.5576" stop-color="#30A4D5"/>
-<stop offset="0.8727" stop-color="#1347BA"/>
-<stop offset="1" stop-color="#1C65C3"/>
+<stop offset="0" stop-color="#7DC7BB"/>
+<stop offset="0.1455" stop-color="#7DC7BB"/>
+<stop offset="0.5576" stop-color="#6292A3"/>
+<stop offset="0.8727" stop-color="#455188"/>
+<stop offset="1" stop-color="#4E6591"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="3.035" width="14.16" x="7.863" y="5.521"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.94" x2="14.94" y1="1.943" y2="9.68">
-<stop offset="0" stop-color="#45E8FF"/>
-<stop offset="0.1455" stop-color="#45E8FF"/>
-<stop offset="0.5576" stop-color="#4FADD5"/>
-<stop offset="0.8727" stop-color="#1347BA"/>
-<stop offset="1" stop-color="#1C65C3"/>
+<stop offset="0" stop-color="#7DC7BB"/>
+<stop offset="0.1455" stop-color="#7DC7BB"/>
+<stop offset="0.5576" stop-color="#77A6AD"/>
+<stop offset="0.8727" stop-color="#455188"/>
+<stop offset="1" stop-color="#4E6591"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5_)" points="7.863,6.937,22.02,6.413,22.02,5.521,7.863,5.521"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.94" x2="14.94" y1="10.47" y2="25.65">
@@ -75,103 +75,103 @@
 <path d="M5.72,10.67v14.39c0,0.338,0.274,0.613,0.612,0.613h17.22c0.339,0,0.612-0.275,0.612-0.613v-14.39h-18.45z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.94" x2="14.94" y1="11.49" y2="24.65">
 <stop offset="0" stop-color="#E6E6E6"/>
-<stop offset="0.8182" stop-color="#7C7E87"/>
-<stop offset="1" stop-color="#94979D"/>
+<stop offset="0.8182" stop-color="#7F8084"/>
+<stop offset="1" stop-color="#97999A"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="13" width="16.45" x="6.72" y="11.67"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="9.716" x2="9.716" y1="12.96" y2="17.11">
-<stop offset="0" stop-color="#646263"/>
+<stop offset="0" stop-color="#636363"/>
 <stop offset="0.2" stop-color="#4D4D4D"/>
 <stop offset="0.7212" stop-color="#242424"/>
 <stop offset="1" stop-color="#373737"/>
 </linearGradient>
 <path d="M8.644,17.01c-0.512,0-0.928-0.416-0.928-0.928v-2.144c0-0.512,0.416-0.928,0.928-0.928h2.145c0.512,0,0.928,0.416,0.928,0.928v2.144c0,0.512-0.416,0.928-0.928,0.928h-2.146z" fill="url(#SVGID_8_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M10.79,17.01h-2.146c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0,0.51-0.42,0.93-0.93,0.93z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M10.79,17.01h-2.146c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0,0.51-0.42,0.93-0.93,0.93z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="9.716" x2="9.716" y1="13.47" y2="16.59">
-<stop offset="0" stop-color="#E4EBED"/>
-<stop offset="0.2606" stop-color="#D6DCDE"/>
-<stop offset="0.6606" stop-color="#B6C3C7"/>
-<stop offset="0.9758" stop-color="#D2D9DB"/>
-<stop offset="1" stop-color="#D2D9DB"/>
+<stop offset="0" stop-color="#E7EAE8"/>
+<stop offset="0.2606" stop-color="#D8DCDA"/>
+<stop offset="0.6606" stop-color="#BBC2C0"/>
+<stop offset="0.9758" stop-color="#D5D8D6"/>
+<stop offset="1" stop-color="#D5D8D6"/>
 </linearGradient>
 <path d="M11.22,16.08c0,0.234-0.192,0.428-0.428,0.428h-2.146c-0.235,0-0.428-0.193-0.428-0.428v-2.144c0-0.236,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.191,0.428,0.428v2.142z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="14.72" x2="14.72" y1="12.96" y2="17.11">
-<stop offset="0" stop-color="#646263"/>
+<stop offset="0" stop-color="#636363"/>
 <stop offset="0.2" stop-color="#4D4D4D"/>
 <stop offset="0.7212" stop-color="#242424"/>
 <stop offset="1" stop-color="#373737"/>
 </linearGradient>
 <path d="M13.64,17.01c-0.512,0-0.928-0.416-0.928-0.928v-2.144c0-0.512,0.416-0.928,0.928-0.928h2.145c0.512,0,0.928,0.416,0.928,0.928v2.144c0,0.512-0.416,0.928-0.928,0.928h-2.136z" fill="url(#SVGID_10_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M15.79,17.01h-2.145c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0.01,0.51-0.41,0.93-0.92,0.93z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M15.79,17.01h-2.145c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0.01,0.51-0.41,0.93-0.92,0.93z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.72" x2="14.72" y1="13.47" y2="16.59">
-<stop offset="0" stop-color="#E4EBED"/>
-<stop offset="0.2606" stop-color="#D6DCDE"/>
-<stop offset="0.6606" stop-color="#B6C3C7"/>
-<stop offset="0.9758" stop-color="#D2D9DB"/>
-<stop offset="1" stop-color="#D2D9DB"/>
+<stop offset="0" stop-color="#E7EAE8"/>
+<stop offset="0.2606" stop-color="#D8DCDA"/>
+<stop offset="0.6606" stop-color="#BBC2C0"/>
+<stop offset="0.9758" stop-color="#D5D8D6"/>
+<stop offset="1" stop-color="#D5D8D6"/>
 </linearGradient>
 <path d="M16.22,16.08c0,0.234-0.192,0.428-0.428,0.428h-2.145c-0.235,0-0.428-0.193-0.428-0.428v-2.144c0-0.236,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.191,0.428,0.428v2.142z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="19.72" x2="19.72" y1="12.96" y2="17.11">
-<stop offset="0" stop-color="#646263"/>
+<stop offset="0" stop-color="#636363"/>
 <stop offset="0.2" stop-color="#4D4D4D"/>
 <stop offset="0.7212" stop-color="#242424"/>
 <stop offset="1" stop-color="#373737"/>
 </linearGradient>
 <path d="M18.64,17.01c-0.512,0-0.928-0.416-0.928-0.928v-2.144c0-0.512,0.416-0.928,0.928-0.928h2.145c0.512,0,0.928,0.416,0.928,0.928v2.144c0,0.512-0.416,0.928-0.928,0.928h-2.136z" fill="url(#SVGID_12_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M20.79,17.01h-2.145c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0.01,0.51-0.41,0.93-0.92,0.93z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M20.79,17.01h-2.145c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0.01,0.51-0.41,0.93-0.92,0.93z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="19.72" x2="19.72" y1="13.47" y2="16.59">
-<stop offset="0" stop-color="#A0A3A6"/>
-<stop offset="0.1333" stop-color="#838688"/>
-<stop offset="0.2606" stop-color="#7B7E80"/>
-<stop offset="0.6606" stop-color="#474B4D"/>
-<stop offset="1" stop-color="#707577"/>
+<stop offset="0" stop-color="#A2A4A4"/>
+<stop offset="0.1333" stop-color="#848686"/>
+<stop offset="0.2606" stop-color="#7D7E7F"/>
+<stop offset="0.6606" stop-color="#494A4B"/>
+<stop offset="1" stop-color="#727475"/>
 </linearGradient>
 <path d="M21.22,16.08c0,0.234-0.192,0.428-0.428,0.428h-2.145c-0.235,0-0.428-0.193-0.428-0.428v-2.144c0-0.236,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.191,0.428,0.428v2.142z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="9.716" x2="9.716" y1="18.63" y2="22.78">
-<stop offset="0" stop-color="#646263"/>
+<stop offset="0" stop-color="#636363"/>
 <stop offset="0.2" stop-color="#4D4D4D"/>
 <stop offset="0.7212" stop-color="#242424"/>
 <stop offset="1" stop-color="#373737"/>
 </linearGradient>
 <path d="M8.644,22.68c-0.512,0-0.928-0.416-0.928-0.928v-2.145c0-0.512,0.416-0.928,0.928-0.928h2.145c0.512,0,0.928,0.416,0.928,0.928v2.145c0,0.512-0.416,0.928-0.928,0.928h-2.146z" fill="url(#SVGID_14_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M10.79,22.68h-2.146c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0,0.51-0.42,0.93-0.93,0.93z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M10.79,22.68h-2.146c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0,0.51-0.42,0.93-0.93,0.93z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="9.716" x2="9.716" y1="19.14" y2="22.25">
-<stop offset="0" stop-color="#E4EBED"/>
-<stop offset="0.2606" stop-color="#D6DCDE"/>
-<stop offset="0.6606" stop-color="#B6C3C7"/>
-<stop offset="0.9758" stop-color="#D2D9DB"/>
-<stop offset="1" stop-color="#D2D9DB"/>
+<stop offset="0" stop-color="#E7EAE8"/>
+<stop offset="0.2606" stop-color="#D8DCDA"/>
+<stop offset="0.6606" stop-color="#BBC2C0"/>
+<stop offset="0.9758" stop-color="#D5D8D6"/>
+<stop offset="1" stop-color="#D5D8D6"/>
 </linearGradient>
 <path d="M11.22,21.75c0,0.236-0.192,0.428-0.428,0.428h-2.146c-0.235,0-0.428-0.191-0.428-0.428v-2.145c0-0.234,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.193,0.428,0.428v2.148z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="14.72" x2="14.72" y1="18.63" y2="22.78">
-<stop offset="0" stop-color="#646263"/>
+<stop offset="0" stop-color="#636363"/>
 <stop offset="0.2" stop-color="#4D4D4D"/>
 <stop offset="0.7212" stop-color="#242424"/>
 <stop offset="1" stop-color="#373737"/>
 </linearGradient>
 <path d="M13.64,22.68c-0.512,0-0.928-0.416-0.928-0.928v-2.145c0-0.512,0.416-0.928,0.928-0.928h2.145c0.512,0,0.928,0.416,0.928,0.928v2.145c0,0.512-0.416,0.928-0.928,0.928h-2.136z" fill="url(#SVGID_16_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M15.79,22.68h-2.145c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0.01,0.51-0.41,0.93-0.92,0.93z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M15.79,22.68h-2.145c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0.01,0.51-0.41,0.93-0.92,0.93z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="14.72" x2="14.72" y1="19.14" y2="22.25">
-<stop offset="0" stop-color="#E4EBED"/>
-<stop offset="0.2606" stop-color="#D6DCDE"/>
-<stop offset="0.6606" stop-color="#B6C3C7"/>
-<stop offset="0.9758" stop-color="#D2D9DB"/>
-<stop offset="1" stop-color="#D2D9DB"/>
+<stop offset="0" stop-color="#E7EAE8"/>
+<stop offset="0.2606" stop-color="#D8DCDA"/>
+<stop offset="0.6606" stop-color="#BBC2C0"/>
+<stop offset="0.9758" stop-color="#D5D8D6"/>
+<stop offset="1" stop-color="#D5D8D6"/>
 </linearGradient>
 <path d="M16.22,21.75c0,0.236-0.192,0.428-0.428,0.428h-2.145c-0.235,0-0.428-0.191-0.428-0.428v-2.145c0-0.234,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.193,0.428,0.428v2.148z" fill="url(#SVGID_17_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="19.72" x2="19.72" y1="18.63" y2="22.78">
-<stop offset="0" stop-color="#646263"/>
+<stop offset="0" stop-color="#636363"/>
 <stop offset="0.2" stop-color="#4D4D4D"/>
 <stop offset="0.7212" stop-color="#242424"/>
 <stop offset="1" stop-color="#373737"/>
 </linearGradient>
 <path d="M18.64,22.68c-0.512,0-0.928-0.416-0.928-0.928v-2.145c0-0.512,0.416-0.928,0.928-0.928h2.145c0.512,0,0.928,0.416,0.928,0.928v2.145c0,0.512-0.416,0.928-0.928,0.928h-2.136z" fill="url(#SVGID_18_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M20.79,22.68h-2.145c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0.01,0.51-0.41,0.93-0.92,0.93z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M20.79,22.68h-2.145c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0.01,0.51-0.41,0.93-0.92,0.93z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="19.72" x2="19.72" y1="19.14" y2="22.25">
-<stop offset="0" stop-color="#F0653D"/>
-<stop offset="0.103" stop-color="#C94832"/>
-<stop offset="0.7515" stop-color="#89181F"/>
-<stop offset="1" stop-color="#961A22"/>
+<stop offset="0" stop-color="#BA8873"/>
+<stop offset="0.103" stop-color="#9C685F"/>
+<stop offset="0.7515" stop-color="#673A45"/>
+<stop offset="1" stop-color="#713F4A"/>
 </linearGradient>
 <path d="M21.22,21.75c0,0.236-0.192,0.428-0.428,0.428h-2.145c-0.235,0-0.428-0.191-0.428-0.428v-2.145c0-0.234,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.193,0.428,0.428v2.148z" fill="url(#SVGID_19_)"/>
 <polygon fill-opacity="0.35" fill-rule="evenodd" points="24.17,10.71,24.17,10.67,24.17,9.891,15.62,18.44,16,18.81,10.34,24.48,10.47,24.62,9.831,24.63,9.57,25.67,16.5,25.67,19.68,22.5,20.06,22.87,24.17,18.76" stroke-opacity="0.35"/>
@@ -199,10 +199,10 @@
 <rect fill="#020202" fill-opacity="0.2" fill-rule="evenodd" height="0.534" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 19.772 -6.7045)" width="3.204" x="16.38" y="20.25"/>
 <rect fill="#020202" fill-opacity="0.5" fill-rule="evenodd" height="0.534" stroke-opacity="0.5" transform="matrix(0.7068 0.7074 -0.7074 0.7068 19.6277 -7.0812)" width="3.205" x="16.75" y="19.87"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 327.5859 -136.9729)" gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="-109.2" x2="-106" y1="339.6" y2="339.6">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#E7EDF0"/>
-<stop offset="0.7455" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#EAEDEB"/>
+<stop offset="0.7455" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <path d="M13.64,26.37l-0.756-0.756-0.755-0.754c-0.755,0.754-1.51,0.754-1.51,0.754l-0.756,3.021,3.021-0.756c0,0.01,0-0.75,0.76-1.5z" fill="url(#SVGID_23_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 327.5859 -136.9729)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="-109.7" x2="-105.4" y1="329" y2="329">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_user.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_user.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_user.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,30 +4,30 @@
 <g>
 <rect fill="none" height="59.999" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2163.8232" x2="-2163.8232" y1="4093.1855" y2="4081.4014">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="0.6182" style="stop-color:#8A4117"/>
-<stop offset="1" style="stop-color:#702200"/>
+<stop offset="0" style="stop-color:#AF987C"/>
+<stop offset="0.6182" style="stop-color:#673F3A"/>
+<stop offset="1" style="stop-color:#4E2224"/>
 </linearGradient>
 <path d="M53.646,12.358c0,0-22.377,0-22.842,0c-0.463,0-1.002-0.202-1.332-1.01  c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697c-0.824,0-1.428,0.7-1.428,1.562v14.438h49.814  v-9.968C55.084,12.989,54.473,12.358,53.646,12.358z" fill="url(#SVGID_1_)"/>
-<path d="M53.646,12.358c0,0-22.377,0-22.842,0  c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697  c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236  c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489  v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" fill="#FFF7F5" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M53.646,12.358c0,0-22.377,0-22.842,0  c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697  c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236  c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489  v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" fill="#FCFAF8" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect height="8.728" width="46.906" x="6.73" y="15.817"/>
 <rect fill="#F2F2F2" height="7.271" width="45.451" x="7.457" y="16.545"/>
-<polygon fill="#231F20" fill-opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636   " stroke-opacity="0.4"/>
-<polygon fill="#231F20" fill-opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908   " stroke-opacity="0.15"/>
-<polygon fill="#231F20" fill-opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182   " stroke-opacity="0.05"/>
+<polygon fill="#222021" fill-opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636   " stroke-opacity="0.4"/>
+<polygon fill="#222021" fill-opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908   " stroke-opacity="0.15"/>
+<polygon fill="#222021" fill-opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182   " stroke-opacity="0.05"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="4048.7861" y2="4078.6064">
-<stop offset="0" style="stop-color:#C79101"/>
-<stop offset="0.0303" style="stop-color:#C79101"/>
-<stop offset="0.0364" style="stop-color:#FEEFA7"/>
-<stop offset="0.3273" style="stop-color:#FEE570"/>
-<stop offset="0.6727" style="stop-color:#F0C12B"/>
-<stop offset="1" style="stop-color:#E6A501"/>
+<stop offset="0" style="stop-color:#8C673C"/>
+<stop offset="0.0303" style="stop-color:#8C673C"/>
+<stop offset="0.0364" style="stop-color:#E4E0C1"/>
+<stop offset="0.3273" style="stop-color:#D3CC9B"/>
+<stop offset="0.6727" style="stop-color:#B5A366"/>
+<stop offset="1" style="stop-color:#A18046"/>
 </linearGradient>
 <path d="M56.273,22.362H3.727C2.191,22.362,2,24.065,2,24.065l2.549,25.934  c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184L58,24.065  C58,24.065,57.809,22.362,56.273,22.362z" fill="url(#SVGID_2_)"/>
-<path d="M3.727,23.091h52.547c1.178,0,1.563,0.995,1.68,1.464L58,24.065c0,0-0.191-1.703-1.727-1.703H3.727  C2.191,22.362,2,24.065,2,24.065l0.047,0.489C2.164,24.086,2.549,23.091,3.727,23.091z" fill="#FCF3D0"/>
+<path d="M3.727,23.091h52.547c1.178,0,1.563,0.995,1.68,1.464L58,24.065c0,0-0.191-1.703-1.727-1.703H3.727  C2.191,22.362,2,24.065,2,24.065l0.047,0.489C2.164,24.086,2.549,23.091,3.727,23.091z" fill="#EFEDDD"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0166" x2="-2164.0166" y1="4048.7861" y2="4053.1504">
-<stop offset="0" style="stop-color:#FCDA5E"/>
-<stop offset="1" style="stop-color:#FFB418"/>
+<stop offset="0" style="stop-color:#CDC18D"/>
+<stop offset="1" style="stop-color:#BA9D5D"/>
 </linearGradient>
 <path d="M4.334,47.818l0.215,2.181  c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184l0.184-2.181H4.334z" fill="url(#SVGID_3_)" fill-opacity="0.25" stroke-opacity="0.25"/>
 <rect fill="none" height="59.999" width="60"/>
@@ -35,54 +35,54 @@
 <g transform="matrix(1 0 0 1 30 30)">
 <path d="M4.714,29.284C3.218,29.284,2,28.067,2,26.572V6.857  c0-0.395,0.088-0.781,0.263-1.15l-0.001,0C2.327,5.56,2.428,5.352,2.591,5.139l1.37-2.852c0.162-0.437,0.824-1.362,2.067-1.561  l0.079-0.013h17.772l0.079,0.013c1.242,0.201,1.905,1.124,2.101,1.638l1.345,2.795c0.016,0.022,0.03,0.045,0.045,0.069  c0.355,0.465,0.55,1.034,0.55,1.628l0.001,19.715c0,1.495-1.218,2.712-2.714,2.712H4.714z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -303.5 -404.5)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="318.4922" x2="318.4922" y1="406.1846" y2="411.4904">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="1" style="stop-color:#7DC51A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="1" style="stop-color:#66924D"/>
 </linearGradient>
 <path d="M26.543,5.679l-1.418-2.959c0,0-0.321-0.844-1.326-1.005H6.186C5.183,1.875,4.862,2.721,4.862,2.721  L3.441,5.679C3.097,6.067,3.016,6.563,2.999,6.857h23.985C26.97,6.563,26.889,6.067,26.543,5.679z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -303.5 -404.5)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="318.5" x2="318.5" y1="409.5186" y2="433.3899">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.14" style="stop-color:#AFED23"/>
-<stop offset="0.69" style="stop-color:#3E8A0D"/>
-<stop offset="0.95" style="stop-color:#7EF524"/>
-<stop offset="1" style="stop-color:#7EF524"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.14" style="stop-color:#98B060"/>
+<stop offset="0.69" style="stop-color:#336541"/>
+<stop offset="0.95" style="stop-color:#89B663"/>
+<stop offset="1" style="stop-color:#89B663"/>
 </linearGradient>
 <path d="M26.999,26.572c0,0.943-0.768,1.712-1.714,1.712H4.714C3.766,28.284,3,27.516,3,26.572V6.857  C3,5.91,3.768,5.143,4.714,5.143h20.57c0.947,0,1.714,0.767,1.714,1.714L26.999,26.572L26.999,26.572z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -303.5 -404.5)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="318.5" x2="318.5" y1="409.5498" y2="427.2303">
-<stop offset="0" style="stop-color:#67AD1A"/>
-<stop offset="1" style="stop-color:#358C0C"/>
+<stop offset="0" style="stop-color:#4E8146"/>
+<stop offset="1" style="stop-color:#326644"/>
 </linearGradient>
 <path d="M6.429,22.284h17.142c0.947,0,1.714-0.767,1.714-1.713V5.142H4.714V20.57  C4.714,21.518,5.481,22.284,6.429,22.284z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -303.5 -404.5)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="318.5" x2="318.5" y1="425.2158" y2="433.1063">
-<stop offset="0" style="stop-color:#358C0C"/>
-<stop offset="0.78" style="stop-color:#67AD1A"/>
-<stop offset="1" style="stop-color:#AFED23"/>
+<stop offset="0" style="stop-color:#326644"/>
+<stop offset="0.78" style="stop-color:#4E8146"/>
+<stop offset="1" style="stop-color:#98B060"/>
 </linearGradient>
 <path d="M24.455,22.034c-0.201,0.12-0.429,0.199-0.673,0.23c-0.058,0.014-0.122,0.021-0.211,0.021H6.429  c-0.09,0-0.157-0.008-0.213-0.021c-0.244-0.031-0.471-0.108-0.673-0.23l-2.302,5.4c0.298,0.506,0.844,0.849,1.473,0.849h20.57  c0.629,0,1.174-0.343,1.475-0.849L24.455,22.034z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -303.5 -404.5)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="318.5" x2="318.5" y1="425.333" y2="432.5319">
-<stop offset="0" style="stop-color:#0C4A06"/>
-<stop offset="0.32" style="stop-color:#0A5E1C"/>
-<stop offset="0.74" style="stop-color:#41AD1A"/>
-<stop offset="1" style="stop-color:#89D920"/>
+<stop offset="0" style="stop-color:#1A3635"/>
+<stop offset="0.32" style="stop-color:#234345"/>
+<stop offset="0.74" style="stop-color:#46814C"/>
+<stop offset="1" style="stop-color:#7EA257"/>
 </linearGradient>
 <path d="M5.543,22.89c0.202,0.122,0.429,0.201,0.673,0.233  c0.056,0.013,0.124,0.021,0.213,0.021h17.142c0.089,0,0.153-0.011,0.209-0.021c0.246-0.031,0.472-0.111,0.675-0.233l2.066,4.85  c0.089-0.093,0.17-0.193,0.237-0.305l-2.301-5.4c-0.204,0.122-0.432,0.201-0.678,0.23c-0.056,0.014-0.12,0.022-0.209,0.022H6.429  c-0.09,0-0.157-0.009-0.213-0.022c-0.244-0.029-0.471-0.108-0.673-0.23l-2.302,5.4c0.065,0.111,0.148,0.211,0.236,0.305L5.543,22.89  z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -303.5 -404.5)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="318.5" x2="318.5" y1="409.5498" y2="427.229">
-<stop offset="0" style="stop-color:#87CC1F"/>
-<stop offset="0.62" style="stop-color:#086311"/>
-<stop offset="1" style="stop-color:#06421E"/>
+<stop offset="0" style="stop-color:#739853"/>
+<stop offset="0.62" style="stop-color:#234846"/>
+<stop offset="1" style="stop-color:#182830"/>
 </linearGradient>
 <path d="M4.714,5.143v15.428c0,0.946,0.767,1.713,1.715,1.713  h17.142c0.947,0,1.714-0.767,1.714-1.713V5.143H4.714z M24.427,20.57c0,0.473-0.386,0.858-0.856,0.858H6.429  c-0.473,0-0.86-0.385-0.86-0.858V6h18.857V20.57L24.427,20.57z" fill="url(#SVGID_6_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -303.5 -404.5)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="318.499" x2="318.499" y1="406.1982" y2="409.7297">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="1" style="stop-color:#358C0C"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="1" style="stop-color:#326644"/>
 </linearGradient>
 <path d="M25.284,3.428c0-0.947-0.766-1.714-1.714-1.714H6.429c-0.948,0-1.715,0.767-1.715,1.714v1.713h20.57  V3.428z" fill="url(#SVGID_7_)"/>
-<path d="M4.714,5.143h20.57c0.556,0,1.045,0.268,1.358,0.68  c-0.035-0.049-0.061-0.099-0.1-0.144l-1.419-2.958c0,0-0.321-0.844-1.325-1.006H6.186C5.183,1.875,4.862,2.721,4.862,2.721  L3.441,5.679C3.32,5.815,3.242,5.963,3.177,6.111C3.454,5.54,4.035,5.143,4.714,5.143z" fill="#C7FF5A" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M26.743,5.967c0.008,0.013,0.013,0.027,0.022,0.04C26.759,5.991,26.751,5.982,26.743,5.967z" fill="#C7FF5A"/>
-<path d="M3.051,5.824C3.047,5.836,3.043,5.847,3.04,5.86C3.043,5.849,3.047,5.836,3.051,5.824z" fill="#C7FF5A"/>
+<path d="M4.714,5.143h20.57c0.556,0,1.045,0.268,1.358,0.68  c-0.035-0.049-0.061-0.099-0.1-0.144l-1.419-2.958c0,0-0.321-0.844-1.325-1.006H6.186C5.183,1.875,4.862,2.721,4.862,2.721  L3.441,5.679C3.32,5.815,3.242,5.963,3.177,6.111C3.454,5.54,4.035,5.143,4.714,5.143z" fill="#BBCE8B" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M26.743,5.967c0.008,0.013,0.013,0.027,0.022,0.04C26.759,5.991,26.751,5.982,26.743,5.967z" fill="#BBCE8B"/>
+<path d="M3.051,5.824C3.047,5.836,3.043,5.847,3.04,5.86C3.043,5.849,3.047,5.836,3.051,5.824z" fill="#BBCE8B"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -303.5 -404.5)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="318.5" x2="318.5" y1="409.5186" y2="433.3899">
-<stop offset="0" style="stop-color:#D4FFA8"/>
-<stop offset="0.68" style="stop-color:#75D911"/>
-<stop offset="1" style="stop-color:#7EF524"/>
+<stop offset="0" style="stop-color:#D9E5C2"/>
+<stop offset="0.68" style="stop-color:#699D4D"/>
+<stop offset="1" style="stop-color:#89B663"/>
 </linearGradient>
 <path d="M25.284,5.143H4.714C3.766,5.143,3,5.91,3,6.857V26.57c0,0.945,0.767,1.714,1.713,1.714h20.57  c0.947,0,1.714-0.769,1.714-1.714V6.857C26.999,5.91,26.231,5.143,25.284,5.143z M26.143,26.572c0,0.472-0.388,0.856-0.858,0.856  H4.714c-0.471,0-0.858-0.385-0.858-0.856V6.857C3.856,6.384,4.241,6,4.714,6h20.57c0.471,0,0.858,0.384,0.858,0.857V26.572z" fill="url(#SVGID_8_)"/>
 <rect fill="none" height="29.998" width="29.998"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar_mycard.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar_mycard.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar_mycard.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -35,13 +35,13 @@
 <rect fill="#020202" fill-opacity="0.2" height="11.847" stroke-opacity="0.2" width="10.769" x="3.872" y="9.52"/>
 <rect fill="#FFFFFF" height="11.845" width="10.769" x="3.872" y="8.803"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.2568" x2="9.2568" y1="20.3306" y2="9.2026">
-<stop offset="0" style="stop-color:#3FA8F4"/>
-<stop offset="1" style="stop-color:#8DC8E1"/>
+<stop offset="0" style="stop-color:#75B1BE"/>
+<stop offset="1" style="stop-color:#A6C8C1"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="11.128" width="10.052" x="4.231" y="9.16"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="4.9492" x2="12.8466" y1="14.8813" y2="14.8813">
-<stop offset="0" style="stop-color:#146BAF"/>
-<stop offset="1" style="stop-color:#013B77"/>
+<stop offset="0" style="stop-color:#425A81"/>
+<stop offset="1" style="stop-color:#242954"/>
 </linearGradient>
 <path d="M12.469,17.257c-0.234-0.121-1.141-0.449-1.627-0.633l-0.021-0.008h0  c-0.005-0.002-0.009-0.004-0.014-0.006l-0.275-0.109c-0.194-0.221-0.172-0.729-0.064-0.898c0.022-0.033,0.042-0.066,0.063-0.102  h-0.004c0.157-0.256,0.291-0.51,0.398-0.75c0.194,0.068,0.444-0.113,0.568-0.418c0.129-0.318,0.073-0.646-0.125-0.736  c-0.011-0.004-0.022-0.005-0.034-0.008c0-0.002,0-0.002,0-0.002c0.025-0.1,0.037-0.158,0.037-0.158  c0.341-1.527-0.4-2.738-2.195-2.798c-0.737,0-1.091,0.336-1.365,0.687c-0.446,0.068-1.151,0.477-0.653,2.264  c-0.019,0.003-0.038,0.006-0.056,0.014c-0.2,0.084-0.262,0.41-0.14,0.728c0.122,0.318,0.382,0.51,0.581,0.426  c0.011-0.006,0.022-0.016,0.033-0.021c0.109,0.246,0.245,0.508,0.406,0.773H7.982c0.007,0.012,0.015,0.025,0.022,0.037  c0.001,0.002,0.002,0.004,0.004,0.006l0,0.002c0.013,0.018,0.024,0.037,0.036,0.057c0.104,0.162,0.125,0.629-0.041,0.861  l-0.286,0.125c-0.48,0.188-1.407,0.525-1.675,0.668c-0.417,0.223-1.095,0.729-1.095,1.873h8.615  C13.564,17.986,12.789,17.425,12.469,17.257z M11.31,13.584c-0.011-0.003-0.021-0.006-0.031-0.006  c-0.015-0.003-0.027-0.006-0.042-0.009c-0.002-0.001-0.003-0.001-0.005-0.001C11.256,13.573,11.283,13.578,11.31,13.584z   M7.161,13.581c0.003-0.003,0.009-0.008,0.012-0.011c0,0.002,0.001,0.004,0.002,0.008C7.17,13.578,7.166,13.58,7.161,13.581z" fill="url(#SVGID_5_)"/>
 <rect fill="#020202" fill-opacity="0.5" height="1" stroke-opacity="0.5" width="9.333" x="16.795" y="17.265"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bell.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bell.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bell.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,58 +4,58 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -785.9789 1292.5154)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-326.7236" x2="-304.7813" y1="-1454.5332" y2="-1454.5332">
-<stop offset="0" style="stop-color:#676B6D"/>
-<stop offset="0.297" style="stop-color:#A0A3A6"/>
-<stop offset="0.7091" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#696A6B"/>
+<stop offset="0.297" style="stop-color:#A2A4A4"/>
+<stop offset="0.7091" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M15.172,29.313L15.172,29.313c-4.057,4.059-3.887,10.822,0.402,15.109  c4.285,4.285,11.057,4.465,15.113,0.406l0,0L15.172,29.313z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 0 9.765625e-004)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5.5908" x2="42.1352" y1="17.8457" y2="54.3901">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.2" style="stop-color:#FFE692"/>
-<stop offset="0.3879" style="stop-color:#FBD072"/>
-<stop offset="0.4182" style="stop-color:#F7BC54"/>
-<stop offset="0.6667" style="stop-color:#ED8C0D"/>
-<stop offset="0.8545" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+<stop offset="0" style="stop-color:#C2A770"/>
+<stop offset="0.2" style="stop-color:#DED7B3"/>
+<stop offset="0.3879" style="stop-color:#D2C49B"/>
+<stop offset="0.4182" style="stop-color:#C6B285"/>
+<stop offset="0.6667" style="stop-color:#AA8250"/>
+<stop offset="0.8545" style="stop-color:#CDBE93"/>
+<stop offset="1" style="stop-color:#BCA162"/>
 </linearGradient>
 <path d="M42.727,47.441L12.559,17.273c-4.08-1.461-5.623-0.41-7.496,1.463L2,21.799L38.201,58l3.064-3.063  C43.137,53.064,44.188,51.521,42.727,47.441z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -785.9789 1292.5154)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-320.21" x2="-311.6052" y1="-1501.5957" y2="-1501.5957">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.1939" style="stop-color:#FFE692"/>
-<stop offset="0.703" style="stop-color:#ED8C0D"/>
-<stop offset="0.8848" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+<stop offset="0" style="stop-color:#C2A770"/>
+<stop offset="0.1939" style="stop-color:#DED7B3"/>
+<stop offset="0.703" style="stop-color:#AA8250"/>
+<stop offset="0.8848" style="stop-color:#CDBE93"/>
+<stop offset="1" style="stop-color:#BCA162"/>
 </linearGradient>
 <path d="M53.285,12.75l1.51-1.51c1.658-1.658,1.658-4.375,0-6.033c-1.66-1.66-4.375-1.66-6.035,0  l-1.508,1.508L53.285,12.75z" fill="url(#SVGID_3_)"/>
-<path d="M53.285,12.75l1.51-1.51c0.09-0.09,0.158-0.195,0.238-0.293  c-0.771-1.162-1.666-2.268-2.689-3.289c-1.023-1.023-2.127-1.92-3.291-2.691c-0.096,0.082-0.201,0.148-0.293,0.24l-1.508,1.508  L53.285,12.75z" fill="#873900" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M52.91,7.092c-0.984-0.984-2.045-1.848-3.16-2.598c-0.354,0.189-0.691,0.414-0.988,0.711  L47.818,6.15l6.033,6.033l0.943-0.943c0.297-0.297,0.521-0.637,0.713-0.99C54.756,9.137,53.893,8.076,52.91,7.092z" fill="#873900" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M53.285,12.75l1.51-1.51c0.09-0.09,0.158-0.195,0.238-0.293  c-0.771-1.162-1.666-2.268-2.689-3.289c-1.023-1.023-2.127-1.92-3.291-2.691c-0.096,0.082-0.201,0.148-0.293,0.24l-1.508,1.508  L53.285,12.75z" fill="#5E2D29" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M52.91,7.092c-0.984-0.984-2.045-1.848-3.16-2.598c-0.354,0.189-0.691,0.414-0.988,0.711  L47.818,6.15l6.033,6.033l0.943-0.943c0.297-0.297,0.521-0.637,0.713-0.99C54.756,9.137,53.893,8.076,52.91,7.092z" fill="#5E2D29" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="51.8164" x2="27.3908" y1="8.1841" y2="32.6097">
-<stop offset="0" style="stop-color:#FDE6B1"/>
-<stop offset="1" style="stop-color:#EF951A"/>
+<stop offset="0" style="stop-color:#E6E0C8"/>
+<stop offset="1" style="stop-color:#AF8C5A"/>
 </linearGradient>
 <path d="M42.727,47.441l9.051-9.051c8.297-8.295,8.297-21.871,0-30.168c-8.295-8.297-21.871-8.297-30.168,0  l-9.051,9.051L42.727,47.441z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="25.4072" x2="54.0366" y1="5.9873" y2="34.6167">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.2545" style="stop-color:#FFE692"/>
-<stop offset="0.503" style="stop-color:#F8C15B"/>
-<stop offset="0.5152" style="stop-color:#F6B84E"/>
-<stop offset="0.6667" style="stop-color:#ED8C0D"/>
-<stop offset="0.8545" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+<stop offset="0" style="stop-color:#C2A770"/>
+<stop offset="0.2545" style="stop-color:#DED7B3"/>
+<stop offset="0.503" style="stop-color:#C9B78A"/>
+<stop offset="0.5152" style="stop-color:#C4AE80"/>
+<stop offset="0.6667" style="stop-color:#AA8250"/>
+<stop offset="0.8545" style="stop-color:#CDBE93"/>
+<stop offset="1" style="stop-color:#BCA162"/>
 </linearGradient>
 <path d="M13.689,17.273l8.486-8.484c3.861-3.861,9.018-5.988,14.518-5.988c5.502,0,10.658,2.127,14.52,5.988  s5.988,9.018,5.988,14.518c0,5.502-2.127,10.658-5.988,14.52l-8.486,8.484L13.689,17.273z" fill="url(#SVGID_5_)"/>
-<rect fill="#873900" fill-opacity="0.2" height="0.801" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 30.8495 -10.3756)" width="42.664" x="6.617" y="31.65"/>
+<rect fill="#5E2D29" fill-opacity="0.2" height="0.801" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 30.8495 -10.3756)" width="42.664" x="6.617" y="31.65"/>
 <path d="M26.412,47.342c0.285-0.082,0.57-0.174,0.85-0.281L12.939,32.738c-0.107,0.279-0.199,0.563-0.281,0.85  L26.412,47.342z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<rect fill="#873900" fill-opacity="0.1" height="0.8" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 30.6155 -10.9417)" width="42.664" x="7.184" y="31.086"/>
+<rect fill="#5E2D29" fill-opacity="0.1" height="0.8" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 30.6155 -10.9417)" width="42.664" x="7.184" y="31.086"/>
 <path d="M25.439,47.572c0.311-0.059,0.617-0.127,0.92-0.213L12.641,33.641c-0.086,0.303-0.156,0.609-0.215,0.918  L25.439,47.572z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M8.873,16.604l34.523,34.525c0.072-0.971-0.119-2.148-0.67-3.688L12.559,17.273  C11.021,16.721,9.844,16.531,8.873,16.604z" fill="#FFF6C9" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M12.559,17.273c-0.391-0.141-0.758-0.256-1.105-0.352l31.625,31.625  c-0.094-0.346-0.211-0.715-0.352-1.105L12.559,17.273z" fill="#FFF6C9" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect fill="#753200" fill-opacity="0.2" height="0.801" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 33.985 -2.8095)" width="51.198" x="-5.215" y="39.217"/>
-<rect fill="#753200" fill-opacity="0.1" height="0.798" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 33.7481 -3.3767)" width="51.198" x="-4.649" y="38.652"/>
+<path d="M8.873,16.604l34.523,34.525c0.072-0.971-0.119-2.148-0.67-3.688L12.559,17.273  C11.021,16.721,9.844,16.531,8.873,16.604z" fill="#EFEDD9" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M12.559,17.273c-0.391-0.141-0.758-0.256-1.105-0.352l31.625,31.625  c-0.094-0.346-0.211-0.715-0.352-1.105L12.559,17.273z" fill="#EFEDD9" fill-opacity="0.5" stroke-opacity="0.5"/>
+<rect fill="#522523" fill-opacity="0.2" height="0.801" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 33.985 -2.8095)" width="51.198" x="-5.215" y="39.217"/>
+<rect fill="#522523" fill-opacity="0.1" height="0.798" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 33.7481 -3.3767)" width="51.198" x="-4.649" y="38.652"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="42.4766" x2="42.4766" y1="3.564" y2="32.0729">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#F9C966"/>
+<stop offset="1" style="stop-color:#CDBD92"/>
 </linearGradient>
 <path d="M53.869,30.98c-4.629-2.719-9.43-6.51-13.885-10.965S31.738,10.76,29.021,6.131  l-0.475-0.807l0.871-0.344c2.313-0.91,4.752-1.371,7.254-1.371c5.23,0,10.324,2.094,13.975,5.746  c5.551,5.549,7.268,13.883,4.373,21.229l-0.344,0.869L53.869,30.98z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,21 +5,21 @@
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2" y2="58.0739">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.2545" style="stop-color:#4F88BD"/>
-<stop offset="0.7333" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+<stop offset="0.2545" style="stop-color:#708A9C"/>
+<stop offset="0.7333" style="stop-color:#314172"/>
+<stop offset="1" style="stop-color:#91CBCE"/>
 </linearGradient>
 <path d="M30,2C18.142,2,9.945,7.973,9.945,30.001C9.945,52.03,18.145,58,30,58  c11.857,0,20.054-5.97,20.054-27.999C50.054,7.973,41.857,2,30,2z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="3.2363" y2="56.7637">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="0.1576" style="stop-color:#36B5FF"/>
-<stop offset="0.8242" style="stop-color:#1B66D8"/>
-<stop offset="1" style="stop-color:#2183E0"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="0.1576" style="stop-color:#72B9C3"/>
+<stop offset="0.8242" style="stop-color:#546F9F"/>
+<stop offset="1" style="stop-color:#5A82A7"/>
 </linearGradient>
 <path d="M30,56.764c-9.305,0-18.818-3.179-18.818-26.763C11.182,6.415,20.695,3.236,30,3.236  c9.306,0,18.817,3.179,18.817,26.765C48.817,53.585,39.306,56.764,30,56.764L30,56.764z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="17.6924" x2="42.3066" y1="30.2065" y2="30.2065">
-<stop offset="0" style="stop-color:#0B81FA"/>
-<stop offset="1" style="stop-color:#47DAFA"/>
+<stop offset="0" style="stop-color:#5385B2"/>
+<stop offset="1" style="stop-color:#7DC4BD"/>
 </linearGradient>
 <path d="M42.307,20.702L28.242,6.305v18.972l-7.728-7.912l-2.822,2.881l9.712,9.961l-9.712,9.96l2.815,2.879  l7.734-7.91v18.974l14.064-14.396l-9.287-9.506L42.307,20.702z M36.689,20.734l-4.49,4.59l-0.006-9.188L36.689,20.734z   M36.689,39.686l-4.496,4.584l0.006-9.185L36.689,39.686z" fill="url(#SVGID_3_)"/>
 <path d="M29.479,32.103l-8.971,9.175l-1.087-1.112l9.71-9.959l-9.71-9.96l1.091-1.113l8.967,9.179V9.339l11.1,11.363  l-9.287,9.504l9.287,9.506l-11.1,11.362V32.103z M30.955,47.297l7.464-7.61l-7.454-7.636L30.955,47.297z M30.965,28.353l7.454-7.618  l-7.464-7.632L30.965,28.353z" fill="#FFFFFF"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_active_connection.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_active_connection.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_active_connection.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,21 +5,21 @@
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2" y2="58.0739">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.2545" style="stop-color:#4F88BD"/>
-<stop offset="0.7333" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+<stop offset="0.2545" style="stop-color:#708A9C"/>
+<stop offset="0.7333" style="stop-color:#314172"/>
+<stop offset="1" style="stop-color:#91CBCE"/>
 </linearGradient>
 <path d="M30,2C18.142,2,9.945,7.973,9.945,30.001C9.945,52.03,18.145,58,30,58  c11.857,0,20.054-5.97,20.054-27.999C50.054,7.973,41.857,2,30,2z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="3.2363" y2="56.7637">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="0.1576" style="stop-color:#36B5FF"/>
-<stop offset="0.8242" style="stop-color:#1B66D8"/>
-<stop offset="1" style="stop-color:#2183E0"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="0.1576" style="stop-color:#72B9C3"/>
+<stop offset="0.8242" style="stop-color:#546F9F"/>
+<stop offset="1" style="stop-color:#5A82A7"/>
 </linearGradient>
 <path d="M30,56.764c-9.305,0-18.818-3.179-18.818-26.763C11.182,6.415,20.695,3.236,30,3.236  c9.306,0,18.817,3.179,18.817,26.765C48.817,53.585,39.306,56.764,30,56.764L30,56.764z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="17.6924" x2="42.3066" y1="30.2065" y2="30.2065">
-<stop offset="0" style="stop-color:#0B81FA"/>
-<stop offset="1" style="stop-color:#47DAFA"/>
+<stop offset="0" style="stop-color:#5385B2"/>
+<stop offset="1" style="stop-color:#7DC4BD"/>
 </linearGradient>
 <path d="M42.307,20.702L28.242,6.305v18.972l-7.728-7.912l-2.822,2.881l9.712,9.961l-9.712,9.96l2.815,2.879  l7.734-7.91v18.974l14.064-14.396l-9.287-9.506L42.307,20.702z M36.689,20.734l-4.49,4.59l-0.006-9.188L36.689,20.734z   M36.689,39.686l-4.496,4.584l0.006-9.185L36.689,39.686z" fill="url(#SVGID_3_)"/>
 <path d="M29.479,32.103l-8.971,9.175l-1.087-1.112l9.71-9.959l-9.71-9.96l1.091-1.113l8.967,9.179V9.339l11.1,11.363  l-9.287,9.504l9.287,9.506l-11.1,11.362V32.103z M30.955,47.297l7.464-7.61l-7.454-7.636L30.955,47.297z M30.965,28.353l7.454-7.618  l-7.464-7.632L30.965,28.353z" fill="#FFFFFF"/>
@@ -30,30 +30,30 @@
 <path d="M20.752,15.001H1.27c-0.555,0-0.998,0.273-1.186,0.73c-0.186,0.459-0.059,0.966,0.34,1.355l10.515,10.314  c0.339,0.335,0.687,0.404,0.918,0.404c0.565,0,1.165-0.448,1.165-1.28v-4.398h7.73c0.842,0,1.527-0.69,1.527-1.538v-4.051  C22.279,15.69,21.594,15.001,20.752,15.001z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <path d="M29.58,12.911L19.063,2.596c-0.339-0.333-0.685-0.402-0.916-0.402c-0.564,0-1.165,0.449-1.165,1.281v4.399  h-7.73c-0.842,0-1.525,0.689-1.525,1.537v4.051c0,0.847,0.684,1.535,1.525,1.535h19.482c0.555,0,0.998-0.273,1.186-0.73  C30.105,13.808,29.979,13.301,29.58,12.911z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="11.1406" x2="11.1406" y1="16.103" y2="27.0009">
-<stop offset="0" style="stop-color:#CDEDBD"/>
-<stop offset="0.9879" style="stop-color:#139900"/>
-<stop offset="1" style="stop-color:#139900"/>
+<stop offset="0" style="stop-color:#D6DFCB"/>
+<stop offset="0.9879" style="stop-color:#2E6B4D"/>
+<stop offset="1" style="stop-color:#2E6B4D"/>
 </linearGradient>
 <path d="M21.279,20.589c0,0.294-0.236,0.538-0.527,0.538h-8.205c-0.287,0-0.525,0.241-0.525,0.537v4.861  c0,0.295-0.172,0.37-0.38,0.165L1.125,16.373c-0.211-0.205-0.144-0.372,0.145-0.372h19.482c0.289,0,0.527,0.241,0.527,0.537V20.589z  " fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="11.7783" x2="11.7783" y1="17.0737" y2="24.8819">
-<stop offset="0" style="stop-color:#82C94C"/>
-<stop offset="0.2545" style="stop-color:#439020"/>
-<stop offset="0.5091" style="stop-color:#0D4D07"/>
-<stop offset="1" style="stop-color:#0D4D07"/>
+<stop offset="0" style="stop-color:#88A372"/>
+<stop offset="0.2545" style="stop-color:#426E4B"/>
+<stop offset="0.5091" style="stop-color:#1C3837"/>
+<stop offset="1" style="stop-color:#1C3837"/>
 </linearGradient>
 <path d="M3.336,17.06h16.885v3.009h-7.674c-0.872,0-1.584,0.715-1.584,1.596v2.878L3.336,17.06z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="18.8643" x2="18.8643" y1="3.2227" y2="14.1618">
-<stop offset="0" style="stop-color:#CDEDBD"/>
-<stop offset="0.4909" style="stop-color:#CDEDBD"/>
-<stop offset="0.9879" style="stop-color:#139900"/>
-<stop offset="1" style="stop-color:#139900"/>
+<stop offset="0" style="stop-color:#D6DFCB"/>
+<stop offset="0.4909" style="stop-color:#D6DFCB"/>
+<stop offset="0.9879" style="stop-color:#2E6B4D"/>
+<stop offset="1" style="stop-color:#2E6B4D"/>
 </linearGradient>
 <path d="M8.727,9.411c0-0.296,0.235-0.537,0.525-0.537h8.206c0.288,0,0.524-0.242,0.524-0.538V3.475  c0-0.297,0.172-0.37,0.381-0.165l10.516,10.315c0.211,0.205,0.144,0.372-0.145,0.372H9.252c-0.289,0-0.525-0.241-0.525-0.535V9.411z  " fill="url(#SVGID_3__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="18.2266" x2="18.2266" y1="5.4292" y2="12.9712">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.703" style="stop-color:#439020"/>
-<stop offset="0.9879" style="stop-color:#0D4D07"/>
-<stop offset="1" style="stop-color:#0D4D07"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.703" style="stop-color:#426E4B"/>
+<stop offset="0.9879" style="stop-color:#1C3837"/>
+<stop offset="1" style="stop-color:#1C3837"/>
 </linearGradient>
 <path d="M9.785,12.938V9.933h7.673c0.872,0,1.583-0.718,1.583-1.597V5.458l7.627,7.48H9.785z" fill="url(#SVGID_4_)"/>
 <rect fill="none" height="30" width="30" x="0.002"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,20 +7,20 @@
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2" y2="58.0739">
 	<stop offset="0" style="stop-color:#F2F2F2"/>
-	<stop offset="0.2545" style="stop-color:#4F88BD"/>
-	<stop offset="0.7333" style="stop-color:#0055A3"/>
-	<stop offset="1" style="stop-color:#64AEFB"/>
+	<stop offset="0.2545" style="stop-color:#708A9C"/>
+	<stop offset="0.7333" style="stop-color:#314172"/>
+	<stop offset="1" style="stop-color:#91CBCE"/>
 </linearGradient>
 <path d="M30,2C18.142,2,9.945,7.973,9.945,30.001C9.945,52.03,18.145,58,30,58  c11.857,0,20.054-5.97,20.054-27.999C50.054,7.973,41.857,2,30,2z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="3.2363" y2="56.7637">
-	<stop offset="0.1576" style="stop-color:#36B5FF"/>
-	<stop offset="0.8242" style="stop-color:#1B66D8"/>
-	<stop offset="1" style="stop-color:#2183E0"/>
+	<stop offset="0.1576" style="stop-color:#72B9C3"/>
+	<stop offset="0.8242" style="stop-color:#546F9F"/>
+	<stop offset="1" style="stop-color:#5A82A7"/>
 </linearGradient>
 <path d="M30,56.764c-9.305,0-18.818-3.179-18.818-26.763C11.182,6.415,20.695,3.236,30,3.236  c9.306,0,18.817,3.179,18.817,26.765C48.817,53.585,39.306,56.764,30,56.764L30,56.764z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="17.6924" x2="42.3066" y1="30.2065" y2="30.2065">
-	<stop offset="0" style="stop-color:#0B81FA"/>
-	<stop offset="1" style="stop-color:#47DAFA"/>
+	<stop offset="0" style="stop-color:#5385B2"/>
+	<stop offset="1" style="stop-color:#7DC4BD"/>
 </linearGradient>
 <path d="M42.307,20.702L28.242,6.305v18.972l-7.728-7.912l-2.822,2.881l9.712,9.961l-9.712,9.96l2.815,2.879  l7.734-7.91v18.974l14.064-14.396l-9.287-9.506L42.307,20.702z M36.689,20.734l-4.49,4.59l-0.006-9.188L36.689,20.734z   M36.689,39.686l-4.496,4.584l0.006-9.185L36.689,39.686z" fill="url(#SVGID_3_)"/>
 <path d="M29.479,32.103l-8.971,9.175l-1.087-1.112l9.71-9.959l-9.71-9.96l1.091-1.113l8.967,9.179V9.339l11.1,11.363  l-9.287,9.504l9.287,9.506l-11.1,11.362V32.103z M30.955,47.297l7.464-7.61l-7.454-7.636L30.955,47.297z M30.965,28.353l7.454-7.618  l-7.464-7.632L30.965,28.353z" fill="#FFFFFF"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide_connection.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide_connection.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide_connection.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,20 +7,20 @@
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2" y2="58.0739">
 	<stop offset="0" style="stop-color:#F2F2F2"/>
-	<stop offset="0.2545" style="stop-color:#4F88BD"/>
-	<stop offset="0.7333" style="stop-color:#0055A3"/>
-	<stop offset="1" style="stop-color:#64AEFB"/>
+	<stop offset="0.2545" style="stop-color:#708A9C"/>
+	<stop offset="0.7333" style="stop-color:#314172"/>
+	<stop offset="1" style="stop-color:#91CBCE"/>
 </linearGradient>
 <path d="M30,2C18.142,2,9.945,7.973,9.945,30.001C9.945,52.03,18.145,58,30,58  c11.857,0,20.054-5.97,20.054-27.999C50.054,7.973,41.857,2,30,2z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="3.2363" y2="56.7637">
-	<stop offset="0.1576" style="stop-color:#36B5FF"/>
-	<stop offset="0.8242" style="stop-color:#1B66D8"/>
-	<stop offset="1" style="stop-color:#2183E0"/>
+	<stop offset="0.1576" style="stop-color:#72B9C3"/>
+	<stop offset="0.8242" style="stop-color:#546F9F"/>
+	<stop offset="1" style="stop-color:#5A82A7"/>
 </linearGradient>
 <path d="M30,56.764c-9.305,0-18.818-3.179-18.818-26.763C11.182,6.415,20.695,3.236,30,3.236  c9.306,0,18.817,3.179,18.817,26.765C48.817,53.585,39.306,56.764,30,56.764L30,56.764z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="17.6924" x2="42.3066" y1="30.2065" y2="30.2065">
-	<stop offset="0" style="stop-color:#0B81FA"/>
-	<stop offset="1" style="stop-color:#47DAFA"/>
+	<stop offset="0" style="stop-color:#5385B2"/>
+	<stop offset="1" style="stop-color:#7DC4BD"/>
 </linearGradient>
 <path d="M42.307,20.702L28.242,6.305v18.972l-7.728-7.912l-2.822,2.881l9.712,9.961l-9.712,9.96l2.815,2.879  l7.734-7.91v18.974l14.064-14.396l-9.287-9.506L42.307,20.702z M36.689,20.734l-4.49,4.59l-0.006-9.188L36.689,20.734z   M36.689,39.686l-4.496,4.584l0.006-9.185L36.689,39.686z" fill="url(#SVGID_3_)"/>
 <path d="M29.479,32.103l-8.971,9.175l-1.087-1.112l9.71-9.959l-9.71-9.96l1.091-1.113l8.967,9.179V9.339l11.1,11.363  l-9.287,9.504l9.287,9.506l-11.1,11.362V32.103z M30.955,47.297l7.464-7.61l-7.454-7.636L30.955,47.297z M30.965,28.353l7.454-7.618  l-7.464-7.632L30.965,28.353z" fill="#FFFFFF"/>
@@ -33,25 +33,25 @@
 <path d="M20.752,15.001H1.27c-0.555,0-0.998,0.273-1.186,0.73c-0.186,0.459-0.059,0.966,0.34,1.355l10.515,10.314  c0.339,0.335,0.687,0.404,0.918,0.404c0.565,0,1.165-0.448,1.165-1.28v-4.398h7.73c0.842,0,1.527-0.69,1.527-1.538v-4.051  C22.279,15.69,21.594,15.001,20.752,15.001z" fill-opacity="0.35"/>
 <path d="M29.58,12.911L19.063,2.596c-0.339-0.333-0.685-0.402-0.916-0.402c-0.564,0-1.165,0.449-1.165,1.281v4.399  h-7.73c-0.842,0-1.525,0.689-1.525,1.537v4.051c0,0.847,0.684,1.535,1.525,1.535h19.482c0.555,0,0.998-0.273,1.186-0.73  C30.105,13.808,29.979,13.301,29.58,12.911z" fill-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="11.1406" x2="11.1406" y1="16.103" y2="27.0009">
-	<stop offset="0" style="stop-color:#CDEDBD"/>
-	<stop offset="0.9879" style="stop-color:#139900"/>
+	<stop offset="0" style="stop-color:#D6DFCB"/>
+	<stop offset="0.9879" style="stop-color:#2E6B4D"/>
 </linearGradient>
 <path d="M21.279,20.589c0,0.294-0.236,0.538-0.527,0.538h-8.205c-0.287,0-0.525,0.241-0.525,0.537v4.861  c0,0.295-0.172,0.37-0.38,0.165L1.125,16.373c-0.211-0.205-0.144-0.372,0.145-0.372h19.482c0.289,0,0.527,0.241,0.527,0.537V20.589z  " fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="11.7783" x2="11.7783" y1="17.0737" y2="24.8819">
-	<stop offset="0" style="stop-color:#82C94C"/>
-	<stop offset="0.2545" style="stop-color:#439020"/>
-	<stop offset="0.5091" style="stop-color:#0D4D07"/>
+	<stop offset="0" style="stop-color:#88A372"/>
+	<stop offset="0.2545" style="stop-color:#426E4B"/>
+	<stop offset="0.5091" style="stop-color:#1C3837"/>
 </linearGradient>
 <path d="M3.336,17.06h16.885v3.009h-7.674c-0.872,0-1.584,0.715-1.584,1.596v2.878L3.336,17.06z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="18.8643" x2="18.8643" y1="3.2227" y2="14.1618">
-	<stop offset="0.4909" style="stop-color:#CDEDBD"/>
-	<stop offset="0.9879" style="stop-color:#139900"/>
+	<stop offset="0.4909" style="stop-color:#D6DFCB"/>
+	<stop offset="0.9879" style="stop-color:#2E6B4D"/>
 </linearGradient>
 <path d="M8.727,9.411c0-0.296,0.235-0.537,0.525-0.537h8.206c0.288,0,0.524-0.242,0.524-0.538V3.475  c0-0.297,0.172-0.37,0.381-0.165l10.516,10.315c0.211,0.205,0.144,0.372-0.145,0.372H9.252c-0.289,0-0.525-0.241-0.525-0.535V9.411z  " fill="url(#SVGID_3__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="18.2266" x2="18.2266" y1="5.4292" y2="12.9712">
-	<stop offset="0" style="stop-color:#B2F56E"/>
-	<stop offset="0.703" style="stop-color:#439020"/>
-	<stop offset="0.9879" style="stop-color:#0D4D07"/>
+	<stop offset="0" style="stop-color:#B7CC97"/>
+	<stop offset="0.703" style="stop-color:#426E4B"/>
+	<stop offset="0.9879" style="stop-color:#1C3837"/>
 </linearGradient>
 <path d="M9.785,12.938V9.933h7.673c0.872,0,1.583-0.718,1.583-1.597V5.458l7.627,7.48H9.785z" fill="url(#SVGID_4_)"/>
 <rect fill="none" height="30" width="30" x="0.002"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,21 +5,21 @@
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2" y2="58.0739">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.2545" style="stop-color:#4F88BD"/>
-<stop offset="0.7333" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+<stop offset="0.2545" style="stop-color:#708A9C"/>
+<stop offset="0.7333" style="stop-color:#314172"/>
+<stop offset="1" style="stop-color:#91CBCE"/>
 </linearGradient>
 <path d="M30,2C18.142,2,9.945,7.973,9.945,30.001C9.945,52.03,18.145,58,30,58  c11.857,0,20.054-5.97,20.054-27.999C50.054,7.973,41.857,2,30,2z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="3.2363" y2="56.7637">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="0.1576" style="stop-color:#36B5FF"/>
-<stop offset="0.8242" style="stop-color:#1B66D8"/>
-<stop offset="1" style="stop-color:#2183E0"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="0.1576" style="stop-color:#72B9C3"/>
+<stop offset="0.8242" style="stop-color:#546F9F"/>
+<stop offset="1" style="stop-color:#5A82A7"/>
 </linearGradient>
 <path d="M30,56.764c-9.305,0-18.818-3.179-18.818-26.763C11.182,6.415,20.695,3.236,30,3.236  c9.306,0,18.817,3.179,18.817,26.765C48.817,53.585,39.306,56.764,30,56.764L30,56.764z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="17.6924" x2="42.3066" y1="30.2065" y2="30.2065">
-<stop offset="0" style="stop-color:#0B81FA"/>
-<stop offset="1" style="stop-color:#47DAFA"/>
+<stop offset="0" style="stop-color:#5385B2"/>
+<stop offset="1" style="stop-color:#7DC4BD"/>
 </linearGradient>
 <path d="M42.307,20.702L28.242,6.305v18.972l-7.728-7.912l-2.822,2.881l9.712,9.961l-9.712,9.96l2.815,2.879  l7.734-7.91v18.974l14.064-14.396l-9.287-9.506L42.307,20.702z M36.689,20.734l-4.49,4.59l-0.006-9.188L36.689,20.734z   M36.689,39.686l-4.496,4.584l0.006-9.185L36.689,39.686z" fill="url(#SVGID_3_)"/>
 <path d="M29.479,32.103l-8.971,9.175l-1.087-1.112l9.71-9.959l-9.71-9.96l1.091-1.113l8.967,9.179V9.339l11.1,11.363  l-9.287,9.504l9.287,9.506l-11.1,11.362V32.103z M30.955,47.297l7.464-7.61l-7.454-7.636L30.955,47.297z M30.965,28.353l7.454-7.618  l-7.464-7.632L30.965,28.353z" fill="#FFFFFF"/>
@@ -29,9 +29,9 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill-opacity="0.35" height="33.866" stroke-opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 670.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="260" x2="284" y1="655.9761" y2="655.9761">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="0.8424" style="stop-color:#CC1414"/>
-<stop offset="1" style="stop-color:#FF4D00"/>
+<stop offset="0" style="stop-color:#B36B4D"/>
+<stop offset="0.8424" style="stop-color:#954B50"/>
+<stop offset="1" style="stop-color:#B36B4D"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="25.809,26.431 3,4.177 4.191,2.956 27,25.21 "/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_browser.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_browser.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_browser.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,58 +4,58 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.998" x2="29.998" y1="57.6797" y2="2.0783">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#2A3662"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M57.998,30.001C57.998,45.464,45.461,58,30,58C14.535,58,1.998,45.464,1.998,30.001  C1.998,14.54,14.535,2,30,2C45.461,2,57.998,14.54,57.998,30.001z" fill="url(#SVGID_1_)"/>
 <radialGradient cx="26.9434" cy="12.7056" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="33.8669">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="29.999" cy="30.001" fill="url(#SVGID_2_)" r="27.282"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.999" x2="29.999" y1="2.4785" y2="57.4196">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#A6CDC2"/>
 </linearGradient>
 <path d="M30,2.718c-15.066,0-27.283,12.218-27.283,27.283c0,15.069,12.217,27.28,27.283,27.28  c15.07,0,27.281-12.211,27.281-27.28C57.281,14.937,45.07,2.718,30,2.718z M30,54.894c-14.166,0-25.691-11.524-25.691-25.688  C4.309,15.04,15.834,3.515,30,3.515S55.689,15.04,55.689,29.206C55.689,43.37,44.166,54.894,30,54.894z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="3.1621" x2="7.498" y1="33.7139" y2="33.7139">
-<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="0" style="stop-color:#59595A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M5.277,29.556C4.988,29.17,4.332,29.17,4.041,29.17c-0.57,0-0.873,0.406-0.879,0.804  v0.028v0.041c0,0.702,0.039,1.489,0.123,2.446c0.018,0.179,0.039,0.36,0.061,0.54l0.033,0.263c0.072,0.566,0.158,1.125,0.256,1.665  l0.043,0.237c0.043,0.213,0.084,0.424,0.129,0.633c0.117,0.53,0.26,1.08,0.434,1.687c0.025,0.087,0.049,0.175,0.07,0.26  c0.039,0.142,0.076,0.283,0.121,0.419l0.004,0.02l0.016,0.043c-0.002-0.011-0.01-0.03-0.012-0.048l1.564-0.106  c0.025-0.243,0.033-0.497,0.025-0.751C6.016,36.956,6,36.467,5.889,36.056l1.455-1.951l0.154-0.213v-0.264v-1.52v-0.331  l-0.232-0.232L5.277,29.556z" fill="url(#SVGID_4_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11.5254" x2="56.9043" y1="25.7695" y2="25.7695">
-<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="0" style="stop-color:#59595A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M56.896,24.654c-0.02-0.103-0.039-0.176-0.057-0.25  c-0.016-0.055-0.027-0.109-0.037-0.162c-0.141-0.646-0.313-1.314-0.514-1.994l-0.023-0.074c-0.041-0.153-0.086-0.306-0.135-0.457  c-0.248-0.767-0.514-1.5-0.797-2.177c-0.035-0.085-0.074-0.163-0.109-0.245l-0.059-0.131c-0.268-0.619-0.568-1.238-0.883-1.833  l-0.041-0.077c-0.061-0.117-0.119-0.236-0.184-0.353c-0.385-0.695-0.789-1.358-1.199-1.974c-0.043-0.065-0.092-0.134-0.141-0.202  c-0.031-0.041-0.059-0.081-0.086-0.121c-0.395-0.571-0.807-1.126-1.236-1.656l-0.084-0.106c-0.059-0.071-0.115-0.146-0.176-0.218  c-0.498-0.596-1.023-1.174-1.566-1.72c-0.072-0.074-0.152-0.15-0.23-0.226l-0.064-0.062c-0.49-0.481-1.01-0.956-1.547-1.402  l-0.104-0.091c-0.055-0.048-0.107-0.096-0.164-0.139c-0.582-0.48-1.215-0.952-1.875-1.405c-0.08-0.055-0.164-0.109-0.248-0.162  l-0.1-0.066c-0.594-0.393-1.213-0.77-1.834-1.114l-0.098-0.055c-0.051-0.029-0.102-0.059-0.152-0.088  c-0.693-0.371-1.414-0.72-2.146-1.035L40.82,4.985l-0.199-0.083c-0.193-0.079-0.387-0.147-0.578-0.215  c-0.102-0.035-0.199-0.069-0.299-0.104l-0.371-0.138l-0.33,0.212c-0.223,0.14-1.098,0.64-1.613,0.934  c-0.574-0.077-1.961-0.251-3.359-0.386c0.432-0.042,1.025-0.09,1.869-0.146l0.117-1.573L35.994,3.47  c-0.051-0.014-0.102-0.025-0.152-0.037L35.723,3.41l-0.098-0.02c-0.857-0.172-1.662-0.297-2.461-0.38L33.16,3.009l-0.109-0.01  c-0.914-0.093-1.844-0.139-2.762-0.139c-0.809,0-1.648,0.042-2.564,0.13c-0.145,0.013-0.281,0.029-0.422,0.043  c-0.906,0.101-1.697,0.221-2.447,0.373L24.83,3.411l-0.018,0.003c-0.789,0.163-1.582,0.367-2.428,0.624  c-0.074,0.022-0.15,0.048-0.227,0.071l-0.17,0.056c-0.713,0.23-1.412,0.485-2.084,0.762c-0.057,0.023-0.094,0.037-0.131,0.051  l-0.102,0.041c-0.738,0.314-1.475,0.668-2.205,1.06c-0.078,0.041-0.156,0.087-0.232,0.13l-0.094,0.055  c-0.205,0.113-0.412,0.242-0.617,0.37L16.258,6.8l-1.461,0.893l1.623,0.542c0.242,0.082,0.504,0.123,0.773,0.123  c0.875,0,1.721-0.43,2.402-0.776c0.273-0.138,0.678-0.344,0.848-0.376c0.199,0.06,0.396,0.089,0.596,0.089  c0.746,0,1.354-0.401,1.893-0.754l0.145-0.094c0.174-0.057,0.473-0.167,1.07-0.391c0.607-0.229,1.717-0.645,2.01-0.715  c0.578-0.006,1.264-0.088,1.752-0.392c0.459,0.075,1.273,0.204,2.115,0.314C29.961,5.301,29.9,5.341,29.85,5.391  c-0.273,0.251-1.742,0.696-2.195,0.755c-0.848,0.106-1.186,0.532-1.322,0.871c-0.176,0.439-0.068,0.878,0.104,1.235  c-0.32,0.212-0.713,0.448-1.049,0.625c0-0.007,0.002-0.015,0.004-0.024c0.121-0.675,0.209-1.163-0.119-1.556  c-0.166-0.2-0.414-0.314-0.676-0.314c-0.387,0-0.688,0.239-0.93,0.473c-0.68,0.656-1.09,1.476-1.246,1.783l-0.027,0.059  l-0.025,0.044c-0.293,0.563-0.414,0.962-0.25,2.207c-0.074,0.051-0.287,0.132-0.582,0.132c-0.041,0-0.076-0.002-0.105-0.005  c-0.191-0.205-0.453-0.322-0.752-0.322l0,0c-0.684,0-1.619,0.771-2.773,2.292l-0.371,0.49l0.377,0.484l0.354,0.449  c-5.51,4.257-5.551,4.5-5.609,4.855c-0.01,0.032-0.057,0.18-0.123,0.383c-0.822,2.552-1.275,4.46-0.834,5.482  c1.025,2.368,2.182,4.579,3.68,4.701c0.133,0.011,0.277,0.017,0.434,0.017c1.373,0,3.6-0.416,4.668-0.635  c0.197,0.371,0.436,0.804,0.568,1.04l0.238,0.421l0.484-0.016c0,0,0.26-0.008,0.584-0.008c0.375,0,0.625,0.011,0.787,0.022  c0.584,1.708,1.699,5.643,1.492,6.459l-0.004,0.004c-1.885,2.821,0.4,6.499,1.494,8.269c0.088,0.14,0.168,0.266,0.232,0.374  c0.424,1.204,0.934,2.002,2.02,2.002c0.078,0,0.16-0.005,0.244-0.009c0.063-0.004,0.125-0.007,0.191-0.007  c0.121,0,0.207,0.014,0.293,0.045l0.1,0.036l0.105,0.01c0.205,0.017,0.4,0.045,0.592,0.071c0.334,0.047,0.68,0.095,1.031,0.095  c0.941,0,1.689-0.357,2.336-1.119c0.021-0.004,0.045-0.005,0.068-0.008c0.678-0.095,0.932-0.433,1.018-0.737  c0.051-0.05,0.117-0.112,0.172-0.164c0.268-0.244,0.584-0.537,0.803-0.88c0.1-0.059,0.213-0.125,0.338-0.2  c0.219-0.134,0.465-0.283,0.658-0.382c0.172-0.052,0.322-0.153,0.436-0.293c0.273-0.335,0.217-0.717,0.172-1.023  c-0.047-0.318-0.092-0.642,0.078-0.99c0.965-0.465,2.68-1.608,2.957-1.796v0.022c-0.02,0.153-0.064,0.563-0.133,0.822  c-0.363,0.366-0.67,0.919-0.766,1.105l-0.063,0.121l-0.02,0.137c-0.023,0.18-0.123,1.11,0.4,1.712  c0.264,0.301,0.641,0.468,1.063,0.468c0.131,0,0.271-0.017,0.416-0.05c1.342-0.304,3.723-3.531,3.916-5.312  c0.096-0.859-0.24-1.534-0.918-1.852l-0.506-0.24l-0.398,0.396l-1.469,1.471c-0.498,0.046-0.887,0.193-1.148,0.425  c0.016-0.627-0.047-1.27-0.113-1.896c-0.201-1.891-0.24-3.097,0.92-3.915l0.059-0.043l0.051-0.051  c0.418-0.426,0.883-0.799,1.373-1.193c1.15-0.924,2.34-1.878,3.047-3.604l0.031-0.074c0.227-0.59,0.568-1.478,0.104-2.158  c-0.115-0.167-0.359-0.426-0.814-0.518c0.604-0.242,1.066-0.435,1.111-0.452l0.141-0.059l0.109-0.104l2.48-2.381l0.363-0.35  l-0.16-0.479c-0.021-0.062-0.158-0.438-0.537-0.977c0.725,0.099,1.344,0.272,1.549,0.427c0.074,0.163,0.221,0.519,0.379,0.892  c2.732,6.435,3.115,6.766,3.824,6.777c0.027,0,0.049,0.002,0.066,0.005c0.057,0.002,0.109,0.006,0.156,0.006  c0.404,0,0.635-0.207,0.736-0.331c0.297-0.357,0.215-0.795,0.184-0.959l-0.012-0.056c-0.033-0.384-0.012-2.113,0.045-3.536  c0.004,0.004,0.006,0.008,0.008,0.013l1.463-0.58L56.896,24.654z M35.391,16.784c-0.113,0.005-0.238,0.012-0.367,0.017  c-0.422,0.018-0.902,0.04-1.377,0.04c-1.25,0-1.533-0.155-1.564-0.171c-0.146-0.107-0.297-0.188-0.457-0.246  c0.285-0.063,0.607-0.279,0.939-0.924c0.33,0.636,0.773,1.198,1.457,1.198c0.184,0,0.363-0.045,0.531-0.131  C34.783,16.568,35.162,16.7,35.391,16.784z M34.9,13.303c-0.094,0-0.172-0.005-0.23-0.009c0.064-0.167,0.141-0.264,0.201-0.319  c0.08,0.122,0.186,0.229,0.305,0.32C35.078,13.301,34.986,13.303,34.9,13.303z M29.932,14.974c0.428,0.837,0.744,1.198,0.994,1.355  c-0.619,0.049-1.086,0.443-1.469,0.817c-0.271-0.09-0.74-0.374-0.879-0.572c-0.084-0.117-0.18-0.217-0.287-0.304  C28.969,16.077,29.564,15.447,29.932,14.974z M27.57,14.355l-0.889-0.043l-2.975-0.146c0.361-0.299,0.707-0.579,0.91-0.745  c0.055-0.02,0.27-0.078,0.793-0.078c0.314,0,0.617,0.021,0.809,0.037L27.57,14.355z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="27.8105" cy="3.104" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="30.9363">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M3.957,29.985c0,0,0,0,0,0.002c0,0.01,0.002,0.014,0.002,0.021c0,0.813,0.051,1.615,0.119,2.41  c0.023,0.259,0.063,0.52,0.092,0.781c0.07,0.544,0.15,1.082,0.248,1.615c0.055,0.283,0.107,0.567,0.166,0.845  c0.123,0.553,0.266,1.097,0.422,1.632c0.063,0.222,0.113,0.447,0.184,0.663C5.197,37.978,5.207,38,5.213,38.023  c0.021-0.212,0.027-0.427,0.021-0.648c-0.053-1.568-0.303-1.367-0.303-1.367l1.771-2.381v-1.52L4.625,30.03  C4.625,30.03,3.959,29.926,3.957,29.985z" fill="url(#SVGID_6_)"/>
 <radialGradient cx="27.8096" cy="3.1069" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="30.9388">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M20.631,6.433c0.766,0.252,1.395-0.26,2.109-0.717c0.252-0.051,3.055-1.17,3.357-1.17  c0.301,0,1.32-0.04,1.572-0.444c0,0,4.387,0.763,5.049,0.508c0.359-0.141,1.869-0.26,3.17-0.346  c-0.074-0.016-0.141-0.037-0.213-0.052c-0.07-0.014-0.141-0.026-0.211-0.04c-0.814-0.163-1.637-0.295-2.475-0.378  c-0.006,0-0.012,0-0.02-0.004c-0.881-0.088-1.775-0.135-2.682-0.135c-0.84,0-1.67,0.05-2.492,0.127  c-0.143,0.015-0.287,0.031-0.434,0.046c-0.793,0.086-1.578,0.203-2.35,0.357C25,4.191,24.986,4.192,24.973,4.193  c-0.801,0.166-1.584,0.371-2.355,0.606c-0.133,0.039-0.26,0.085-0.393,0.125c-0.684,0.221-1.357,0.466-2.02,0.737  c-0.076,0.034-0.156,0.063-0.234,0.095c-0.727,0.31-1.438,0.654-2.129,1.024c-0.104,0.056-0.203,0.116-0.307,0.175  c-0.299,0.165-0.576,0.349-0.861,0.525C18.098,7.957,19.877,6.178,20.631,6.433z" fill="url(#SVGID_7_)"/>
 <radialGradient cx="27.8066" cy="3.105" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="30.9346">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.3152" style="stop-color:#B7CC97"/>
+<stop offset="0.7273" style="stop-color:#568E4C"/>
+<stop offset="1" style="stop-color:#255541"/>
 </radialGradient>
 <path d="M56.111,24.787c-0.027-0.133-0.064-0.258-0.09-0.388c-0.141-0.65-0.307-1.292-0.494-1.924  c-0.051-0.171-0.102-0.346-0.154-0.515c-0.23-0.718-0.484-1.426-0.773-2.113c-0.051-0.121-0.109-0.24-0.16-0.358  c-0.266-0.606-0.553-1.201-0.861-1.782c-0.07-0.139-0.143-0.282-0.217-0.417c-0.365-0.657-0.75-1.297-1.166-1.919  c-0.068-0.107-0.15-0.21-0.223-0.316c-0.379-0.553-0.777-1.086-1.195-1.605c-0.086-0.103-0.166-0.209-0.254-0.313  c-0.482-0.578-0.986-1.135-1.518-1.669c-0.09-0.092-0.188-0.183-0.281-0.272c-0.482-0.475-0.984-0.933-1.506-1.369  c-0.09-0.073-0.17-0.151-0.26-0.223c-0.584-0.478-1.195-0.933-1.822-1.362c-0.109-0.075-0.223-0.148-0.334-0.219  c-0.578-0.384-1.174-0.747-1.785-1.085c-0.084-0.045-0.16-0.094-0.244-0.141c-0.68-0.363-1.371-0.696-2.082-1.003  c-0.125-0.053-0.256-0.103-0.379-0.155c-0.277-0.115-0.563-0.206-0.844-0.309c-0.334,0.213-1.881,1.088-1.881,1.088  s-6.717-0.917-7.174-0.462c-0.459,0.462-2.248,0.929-2.656,0.981c-0.406,0.053-1.25,0.27-0.238,1.518  c-0.152,0.155-3.039,2.165-3.039,1.25c0-0.916,0.645-2.552-0.26-1.676c-0.652,0.631-1.039,1.483-1.127,1.643  c-0.211,0.409-0.342,0.604-0.188,1.773c0.154,1.171-1.869,1.164-2.004,0.862c-0.363-0.813-2.363,1.821-2.363,1.821l0.844,1.082  c0,0-5.893,4.539-5.941,4.844c-0.053,0.307-1.523,4.247-1.016,5.418c0.512,1.174,1.797,4.127,3.016,4.226  c1.598,0.131,5.469-0.73,5.469-0.73c0.104,0.257,0.834,1.556,0.834,1.556s1.896-0.063,2.004,0.143  c0.035,0.069,2.287,6.693,1.543,7.571c-1.773,2.656,1.014,6.548,1.789,7.864c0.775,2.262,1.277,1.25,2.297,1.62  c1.258,0.108,2.318,0.573,3.385-0.8c0.309-0.255,0.836-0.054,0.836-0.408c0-0.198,0.912-0.781,1.146-1.33  c0.248-0.114,0.881-0.542,1.313-0.748c0.391-0.025-0.371-1.071,0.402-2.177c0.836-0.33,3.088-1.849,3.088-1.849  c0.104-2.227-1.094-4.979,1.141-6.559c1.445-1.47,3.336-2.306,4.256-4.544c0.252-0.661,0.818-2.014-0.813-1.609  c-1.531,0.386-3.238,0.474-2.432-0.201c-0.092-0.828-1.111-1.218-2.023-2.026c-0.473-1.117-1.215-3.108-1.215-3.108l-1.621-2.463  l0.203-0.508l1.926,2.836l1.926,2.328c0.707,2.33,1.314,2.535,1.314,2.535c1.068-0.377,3.596-1.419,3.596-1.419l2.484-2.381  c0,0-0.256-0.761-1.264-1.722l-0.764-0.455c-0.166,0.467-1.049,0.642-1.049,0.642l-2.145-2.564l0.801-0.162l0.613,1.171l1.473,0.509  c0,0,0.408-0.298,1.166,0.484c0.619-0.051,3.029,0.117,3.594,0.832c0.109,0.142,2.986,7.325,3.555,7.336  c0.248,0.001,0.43,0.099,0.348-0.335c-0.102-0.205,0-4.717,0.154-5.683c0.385-0.821,0.445-0.002,1.357,1.553  C56.121,24.862,56.119,24.824,56.111,24.787z M30.797,7.378c0.201-0.6,1.367-0.804,1.367-0.804s-0.334,0.618-0.258,0.937  c0.08,0.322-0.533,0.524-0.6,1.282c-0.066,0.755-1.459,0.313-1.574,0.047C29.617,8.577,30.592,7.977,30.797,7.378z M35.793,17.571  c-0.865,0-3.455,0.257-4.17-0.253c-0.711-0.508-1.266,0.052-1.781,0.562c-0.334,0.331-1.559-0.339-1.916-0.848  c-0.355-0.509-1.553-0.472-1.553-0.472l0.271-1.452l-3.445-0.167l-1.957,0.574l-1.844,0.052l1.031-0.491l1.287-0.304  c0,0,1.867-1.536,2.43-1.993c0.475-0.388,2.365-0.169,2.365-0.169l2.074,1.497c0,0-0.459,1.174-0.662,1.426  c0.76-0.05,1.658-1.436,1.658-1.436c-1.621-1.488-1.555-1.992-1.555-1.992l2.133,1.498l0.021,0.013c0,0,0.865,2.035,1.225,2.035  c0.352,0,0.809-1.401,0.809-1.401l0.609-0.153c0.27,0.642,0.773,2.094,1.381,1.754c0.35-0.193,0.928-0.017,1.588,0.236  c0.664,0.255,1.115-0.137,1.654,0.337C37.381,18.519,36.15,17.674,35.793,17.571z M37.148,14.068c-0.891-0.339-3.9,0.766-3.229-1.04  c0.359-0.975,1.281-1.179,1.598-0.531c0.082,0.267,1.084,0.679,1.076,0.117c-0.006-0.562,1.01-0.86,1.154-0.441  C37.207,12.563,39.863,14.589,37.148,14.068z M42.816,15.78c-0.492-0.397,0.223-0.738-0.506-1.359  c-1.041-0.895-1.855-1.278-0.436-2.002c1.754-0.221,0.283,0.559,0.576,1.027c0.156,0.247,1.039,1.08,1.73,2.103  C44.756,16.397,43.307,16.175,42.816,15.78z" fill="url(#SVGID_8_)"/>
 <radialGradient cx="27.8125" cy="3.1055" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="30.9328">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M43.523,38.979l-1.689,1.688c0,0-1.016,0-1.064,0.406c-0.023,0.174-0.082,0.927-0.252,1.315  c-0.338,0.235-0.742,1.012-0.742,1.012s-0.211,1.504,0.912,1.249C41.809,44.395,45.256,39.795,43.523,38.979z" fill="url(#SVGID_9_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calculator.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calculator.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calculator.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,9 +5,9 @@
 <rect fill="none" height="60" width="60"/>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="20.2573" y2="56.9514">
-<stop offset="0" style="stop-color:#B5B9BC"/>
-<stop offset="0.8182" style="stop-color:#7C7E87"/>
-<stop offset="1" style="stop-color:#94979D"/>
+<stop offset="0" style="stop-color:#B7BABA"/>
+<stop offset="0.8182" style="stop-color:#7F8084"/>
+<stop offset="1" style="stop-color:#97999A"/>
 </linearGradient>
 <path d="M8.918,20.754v34.767C8.918,56.336,9.58,57,10.396,57h39.207c0.816,0,1.479-0.664,1.479-1.479V20.754  H8.918z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="20.2573" y2="56.9514">
@@ -18,25 +18,25 @@
 </linearGradient>
 <path d="M50.344,20.754v0.739V54.78v0.74c0,0.408-0.332,0.74-0.74,0.74H10.396  c-0.404,0-0.738-0.332-0.738-0.74v-0.74V21.493v-0.739h-0.74v34.767C8.918,56.336,9.58,57,10.396,57h39.207  c0.816,0,1.479-0.664,1.479-1.479V20.754H50.344z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="20.2671" y2="56.2123">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#CED3D6"/>
-<stop offset="0.6606" style="stop-color:#CEDBE0"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#D0D4D2"/>
+<stop offset="0.6606" style="stop-color:#D3DBD7"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M49.604,21.119v34.402H10.447l0.021-34.767H9.658v34.767  c0,0.409,0.381,0.74,0.789,0.74h39.156c0.408,0,0.738-0.331,0.738-0.74V21.119H49.604z" fill="url(#SVGID_3_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="2.9741" y2="20.728">
-<stop offset="0" style="stop-color:#B5B9BC"/>
-<stop offset="0.8182" style="stop-color:#7C7E87"/>
-<stop offset="1" style="stop-color:#94979D"/>
+<stop offset="0" style="stop-color:#B7BABA"/>
+<stop offset="0.8182" style="stop-color:#7F8084"/>
+<stop offset="1" style="stop-color:#97999A"/>
 </linearGradient>
 <path d="M51.082,20.754V4.451C51.107,3.649,50.443,3,49.627,3H10.4C9.584,3,8.918,3.649,8.918,4.451v16.303  H51.082z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30.001" x2="30.001" y1="3.7144" y2="20.729">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#CED3D6"/>
-<stop offset="0.6606" style="stop-color:#CEDBE0"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#D0D4D2"/>
+<stop offset="0.6606" style="stop-color:#D3DBD7"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M50.16,3.96c-0.139-0.142-0.328-0.221-0.533-0.221H10.4  c-0.408,0-0.742,0.319-0.742,0.711v0.74v14.824v0.74h40.684l0.002-15.586v-0.74C50.348,4.254,50.281,4.088,50.16,3.96z   M49.604,5.167v14.847H10.396V4.451l39.23,0.029L49.604,5.167z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="2.9741" y2="20.728">
@@ -47,8 +47,8 @@
 </linearGradient>
 <path d="M49.627,3H10.4C9.584,3,8.918,3.649,8.918,4.451v16.303h0.74v-0.74V5.19v-0.74  c0-0.392,0.334-0.711,0.742-0.711h39.227c0.205,0,0.395,0.079,0.533,0.221c0.121,0.127,0.188,0.294,0.184,0.467v0.74l0,0  l-0.002,15.586h0.74V4.451C51.107,3.649,50.443,3,49.627,3z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.001" x2="30.001" y1="6.7217" y2="17.1228">
-<stop offset="0" style="stop-color:#686C6E"/>
-<stop offset="1" style="stop-color:#CAD3D6"/>
+<stop offset="0" style="stop-color:#6A6B6C"/>
+<stop offset="1" style="stop-color:#CED2D0"/>
 </linearGradient>
 <path d="M14.098,17.055c-0.816,0-1.48-0.678-1.48-1.509V8.208c0-0.833,0.664-1.509,1.48-1.509  h31.805c0.816,0,1.482,0.676,1.482,1.509v7.337c0,0.831-0.666,1.509-1.482,1.509H14.098z" fill="url(#SVGID_7_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="29.998" x2="29.998" y1="7.4897" y2="16.4665">
@@ -57,19 +57,19 @@
 </linearGradient>
 <path d="M46.637,15.545c0,0.417-0.334,0.754-0.742,0.754H14.098c-0.408,0-0.738-0.337-0.738-0.754V8.208  c0-0.417,0.33-0.755,0.738-0.755h31.797c0.408,0,0.742,0.338,0.742,0.755V15.545z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.9961" x2="29.9961" y1="-5.1528" y2="20.6866">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#30A4D5"/>
-<stop offset="0.8727" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1C65C3"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#6292A3"/>
+<stop offset="0.8727" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#4E6591"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="7.337" width="31.797" x="14.098" y="8.208"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.9961" x2="29.9961" y1="-0.4434" y2="18.2631">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#4FADD5"/>
-<stop offset="0.8727" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1C65C3"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#77A6AD"/>
+<stop offset="0.8727" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#4E6591"/>
 </linearGradient>
 <polygon fill="url(#SVGID_10_)" points="14.098,11.63 45.895,10.364 45.895,8.208 14.098,8.208 "/>
 <path d="M25.531,14.36H22.34v-0.551h1.158v-3.681l-1.158,0.215V9.792l1.596-0.525h0.436v4.542h1.16V14.36z" fill="#FFFFFF"/>
@@ -79,198 +79,198 @@
 <path d="M42.4,11.122h0.172c0.549,0,0.969,0.137,1.266,0.405c0.293,0.271,0.441,0.654,0.441,1.152  c0,0.57-0.152,1-0.451,1.284c-0.301,0.284-0.75,0.426-1.35,0.426c-0.438,0-0.828-0.049-1.17-0.147v-0.595  c0.395,0.103,0.77,0.155,1.123,0.155c0.299,0,0.535-0.083,0.699-0.246c0.166-0.163,0.25-0.446,0.25-0.848  c0-0.332-0.094-0.583-0.279-0.749c-0.188-0.169-0.467-0.251-0.84-0.251c-0.246,0-0.494,0.011-0.738,0.038V9.27h2.625v0.547H42.4  V11.122z" fill="#FFFFFF"/>
 <circle cx="30.79" cy="13.831" fill="#FFFFFF" r="0.595"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="43.3145" x2="43.3145" y1="45.8735" y2="52.5934">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M41.467,52.562c-0.816,0-1.48-0.664-1.48-1.48v-3.698c0-0.815,0.664-1.479,1.48-1.479  h3.697c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H41.467z" fill="url(#SVGID_11_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M45.164,52.562h-3.697c-0.816,0-1.48-0.664-1.48-1.48v0.74c0,0.816,0.664,1.48,1.48,1.48  h3.697c0.816,0,1.479-0.664,1.479-1.48v-0.74C46.643,51.897,45.98,52.562,45.164,52.562z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M45.164,52.562h-3.697c-0.816,0-1.48-0.664-1.48-1.48v0.74c0,0.816,0.664,1.48,1.48,1.48  h3.697c0.816,0,1.479-0.664,1.479-1.48v-0.74C46.643,51.897,45.98,52.562,45.164,52.562z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="43.3154" x2="43.3154" y1="46.5791" y2="51.9528">
-<stop offset="0" style="stop-color:#F0653D"/>
-<stop offset="0.103" style="stop-color:#C94832"/>
-<stop offset="0.7515" style="stop-color:#89181F"/>
-<stop offset="1" style="stop-color:#961A22"/>
+<stop offset="0" style="stop-color:#BA8873"/>
+<stop offset="0.103" style="stop-color:#9C685F"/>
+<stop offset="0.7515" style="stop-color:#673A45"/>
+<stop offset="1" style="stop-color:#713F4A"/>
 </linearGradient>
 <path d="M45.904,51.082c0,0.41-0.332,0.74-0.74,0.74h-3.697c-0.408,0-0.74-0.33-0.74-0.74v-3.698  c0-0.409,0.332-0.74,0.74-0.74h3.697c0.408,0,0.74,0.331,0.74,0.74V51.082z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="34.4385" x2="34.4385" y1="45.8735" y2="52.5934">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M32.592,52.562c-0.818,0-1.482-0.664-1.482-1.48v-3.698  c0-0.815,0.664-1.479,1.482-1.479h3.697c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H32.592z" fill="url(#SVGID_13_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M36.289,52.562h-3.697c-0.818,0-1.482-0.664-1.482-1.48v0.74c0,0.816,0.664,1.48,1.482,1.48  h3.697c0.816,0,1.479-0.664,1.479-1.48v-0.74C37.768,51.897,37.105,52.562,36.289,52.562z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M36.289,52.562h-3.697c-0.818,0-1.482-0.664-1.482-1.48v0.74c0,0.816,0.664,1.48,1.482,1.48  h3.697c0.816,0,1.479-0.664,1.479-1.48v-0.74C37.768,51.897,37.105,52.562,36.289,52.562z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="34.4385" x2="34.4385" y1="46.5791" y2="51.9528">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#BBC2C0"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M37.027,51.082c0,0.41-0.33,0.74-0.738,0.74h-3.697c-0.412,0-0.742-0.33-0.742-0.74v-3.698  c0-0.409,0.33-0.74,0.742-0.74h3.697c0.408,0,0.738,0.331,0.738,0.74V51.082z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="25.5625" x2="25.5625" y1="45.8735" y2="52.5934">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M23.713,52.562c-0.816,0-1.479-0.664-1.479-1.48v-3.698  c0-0.815,0.662-1.479,1.479-1.479h3.699c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H23.713z" fill="url(#SVGID_15_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M27.412,52.562h-3.699c-0.816,0-1.479-0.664-1.479-1.48v0.74c0,0.816,0.662,1.48,1.479,1.48  h3.699c0.816,0,1.479-0.664,1.479-1.48v-0.74C28.891,51.897,28.229,52.562,27.412,52.562z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M27.412,52.562h-3.699c-0.816,0-1.479-0.664-1.479-1.48v0.74c0,0.816,0.662,1.48,1.479,1.48  h3.699c0.816,0,1.479-0.664,1.479-1.48v-0.74C28.891,51.897,28.229,52.562,27.412,52.562z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="25.5615" x2="25.5615" y1="46.5791" y2="51.9528">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#BBC2C0"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M28.15,51.082c0,0.41-0.33,0.74-0.738,0.74h-3.699c-0.408,0-0.74-0.33-0.74-0.74v-3.698  c0-0.409,0.332-0.74,0.74-0.74h3.699c0.408,0,0.738,0.331,0.738,0.74V51.082z" fill="url(#SVGID_16_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="16.6846" x2="16.6846" y1="45.8735" y2="52.5934">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M14.836,52.562c-0.816,0-1.48-0.664-1.48-1.48v-3.698c0-0.815,0.664-1.479,1.48-1.479h3.699  c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H14.836z" fill="url(#SVGID_17_)"/>
-<path d="M18.535,52.562h-3.699c-0.816,0-1.48-0.664-1.48-1.48v0.74c0,0.816,0.664,1.48,1.48,1.48  h3.699c0.816,0,1.479-0.664,1.479-1.48v-0.74C20.014,51.897,19.352,52.562,18.535,52.562z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M18.535,52.562h-3.699c-0.816,0-1.48-0.664-1.48-1.48v0.74c0,0.816,0.664,1.48,1.48,1.48  h3.699c0.816,0,1.479-0.664,1.479-1.48v-0.74C20.014,51.897,19.352,52.562,18.535,52.562z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="16.6865" x2="16.6865" y1="46.5791" y2="51.9528">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#BBC2C0"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M19.275,51.082c0,0.41-0.332,0.74-0.74,0.74h-3.699c-0.408,0-0.738-0.33-0.738-0.74v-3.698  c0-0.409,0.33-0.74,0.738-0.74h3.699c0.408,0,0.74,0.331,0.74,0.74V51.082z" fill="url(#SVGID_18_)"/>
-<path d="M45.164,42.206h-3.697c-0.816,0-1.48-0.664-1.48-1.48v0.74c0,0.814,0.664,1.479,1.48,1.479  h3.697c0.816,0,1.479-0.665,1.479-1.479v-0.74C46.643,41.542,45.98,42.206,45.164,42.206z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M45.164,42.206h-3.697c-0.816,0-1.48-0.664-1.48-1.48v0.74c0,0.814,0.664,1.479,1.48,1.479  h3.697c0.816,0,1.479-0.665,1.479-1.479v-0.74C46.643,41.542,45.98,42.206,45.164,42.206z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="43.3145" x2="43.3145" y1="35.5479" y2="42.1745">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M41.467,42.206c-0.816,0-1.48-0.664-1.48-1.48v-3.698c0-0.816,0.664-1.479,1.48-1.479  h3.697c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H41.467z" fill="url(#SVGID_19_)" fill-opacity="0.9" stroke-opacity="0.9"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="43.3154" x2="43.3154" y1="36.2231" y2="41.5973">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M45.904,40.726c0,0.409-0.332,0.74-0.74,0.74h-3.697c-0.408,0-0.74-0.331-0.74-0.74v-3.698  c0-0.409,0.332-0.74,0.74-0.74h3.697c0.408,0,0.74,0.331,0.74,0.74V40.726z" fill="url(#SVGID_20_)"/>
-<rect fill="#231F20" fill-opacity="0.5" height="0.739" stroke-opacity="0.5" width="40.686" x="9.658" y="20.754"/>
-<path d="M36.289,42.206h-3.697c-0.818,0-1.482-0.664-1.482-1.48v0.74c0,0.814,0.664,1.479,1.482,1.479  h3.697c0.816,0,1.479-0.665,1.479-1.479v-0.74C37.768,41.542,37.105,42.206,36.289,42.206z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill="#222021" fill-opacity="0.5" height="0.739" stroke-opacity="0.5" width="40.686" x="9.658" y="20.754"/>
+<path d="M36.289,42.206h-3.697c-0.818,0-1.482-0.664-1.482-1.48v0.74c0,0.814,0.664,1.479,1.482,1.479  h3.697c0.816,0,1.479-0.665,1.479-1.479v-0.74C37.768,41.542,37.105,42.206,36.289,42.206z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="34.4385" x2="34.4385" y1="35.5479" y2="42.1745">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M32.592,42.206c-0.818,0-1.482-0.664-1.482-1.48v-3.698  c0-0.816,0.664-1.479,1.482-1.479h3.697c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H32.592z" fill="url(#SVGID_21_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="34.4385" x2="34.4385" y1="36.2231" y2="41.5973">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#BBC2C0"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M37.027,40.726c0,0.409-0.33,0.74-0.738,0.74h-3.697c-0.412,0-0.742-0.331-0.742-0.74v-3.698  c0-0.409,0.33-0.74,0.742-0.74h3.697c0.408,0,0.738,0.331,0.738,0.74V40.726z" fill="url(#SVGID_22_)"/>
-<path d="M27.412,42.206h-3.699c-0.816,0-1.479-0.664-1.479-1.48v0.74c0,0.814,0.662,1.479,1.479,1.479  h3.699c0.816,0,1.479-0.665,1.479-1.479v-0.74C28.891,41.542,28.229,42.206,27.412,42.206z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M27.412,42.206h-3.699c-0.816,0-1.479-0.664-1.479-1.48v0.74c0,0.814,0.662,1.479,1.479,1.479  h3.699c0.816,0,1.479-0.665,1.479-1.479v-0.74C28.891,41.542,28.229,42.206,27.412,42.206z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="25.5625" x2="25.5625" y1="35.5479" y2="42.1745">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M23.713,42.206c-0.816,0-1.479-0.664-1.479-1.48v-3.698  c0-0.816,0.662-1.479,1.479-1.479h3.699c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H23.713z" fill="url(#SVGID_23_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="25.5615" x2="25.5615" y1="36.2231" y2="41.5973">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#BBC2C0"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M28.15,40.726c0,0.409-0.33,0.74-0.738,0.74h-3.699c-0.408,0-0.74-0.331-0.74-0.74v-3.698  c0-0.409,0.332-0.74,0.74-0.74h3.699c0.408,0,0.738,0.331,0.738,0.74V40.726z" fill="url(#SVGID_24_)"/>
-<path d="M18.535,42.206h-3.699c-0.816,0-1.48-0.664-1.48-1.48v0.74c0,0.814,0.664,1.479,1.48,1.479  h3.699c0.816,0,1.479-0.665,1.479-1.479v-0.74C20.014,41.542,19.352,42.206,18.535,42.206z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M18.535,42.206h-3.699c-0.816,0-1.48-0.664-1.48-1.48v0.74c0,0.814,0.664,1.479,1.48,1.479  h3.699c0.816,0,1.479-0.665,1.479-1.479v-0.74C20.014,41.542,19.352,42.206,18.535,42.206z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="16.6846" x2="16.6846" y1="35.5479" y2="42.1745">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M14.836,42.206c-0.816,0-1.48-0.664-1.48-1.48v-3.698c0-0.816,0.664-1.479,1.48-1.479  h3.699c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H14.836z" fill="url(#SVGID_25_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="16.6865" x2="16.6865" y1="36.2231" y2="41.5973">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#BBC2C0"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M19.275,40.726c0,0.409-0.332,0.74-0.74,0.74h-3.699c-0.408,0-0.738-0.331-0.738-0.74v-3.698  c0-0.409,0.33-0.74,0.738-0.74h3.699c0.408,0,0.74,0.331,0.74,0.74V40.726z" fill="url(#SVGID_26_)"/>
-<path d="M45.164,31.849h-3.697c-0.816,0-1.48-0.664-1.48-1.479v0.74c0,0.815,0.664,1.479,1.48,1.479  h3.697c0.816,0,1.479-0.665,1.479-1.479v-0.74C46.643,31.185,45.98,31.849,45.164,31.849z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M45.164,31.849h-3.697c-0.816,0-1.48-0.664-1.48-1.479v0.74c0,0.815,0.664,1.479,1.48,1.479  h3.697c0.816,0,1.479-0.665,1.479-1.479v-0.74C46.643,31.185,45.98,31.849,45.164,31.849z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="43.3145" x2="43.3145" y1="25.208" y2="31.91">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M41.467,31.849c-0.816,0-1.48-0.664-1.48-1.479v-3.699  c0-0.815,0.664-1.479,1.48-1.479h3.697c0.816,0,1.479,0.664,1.479,1.479v3.699c0,0.815-0.662,1.479-1.479,1.479H41.467z" fill="url(#SVGID_27_)" fill-opacity="0.9" stroke-opacity="0.9"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="43.3154" x2="43.3154" y1="25.8672" y2="31.2414">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M45.904,30.37c0,0.409-0.332,0.74-0.74,0.74h-3.697c-0.408,0-0.74-0.331-0.74-0.74v-3.699  c0-0.408,0.332-0.739,0.74-0.739h3.697c0.408,0,0.74,0.331,0.74,0.739V30.37z" fill="url(#SVGID_28_)"/>
-<path d="M36.289,31.849h-3.697c-0.818,0-1.482-0.664-1.482-1.479v0.74  c0,0.815,0.664,1.479,1.482,1.479h3.697c0.816,0,1.479-0.665,1.479-1.479v-0.74C37.768,31.185,37.105,31.849,36.289,31.849z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M36.289,31.849h-3.697c-0.818,0-1.482-0.664-1.482-1.479v0.74  c0,0.815,0.664,1.479,1.482,1.479h3.697c0.816,0,1.479-0.665,1.479-1.479v-0.74C37.768,31.185,37.105,31.849,36.289,31.849z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="34.4385" x2="34.4385" y1="25.208" y2="31.91">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M32.592,31.849c-0.818,0-1.482-0.664-1.482-1.479v-3.699  c0-0.815,0.664-1.479,1.482-1.479h3.697c0.816,0,1.479,0.664,1.479,1.479v3.699c0,0.815-0.662,1.479-1.479,1.479H32.592z" fill="url(#SVGID_29_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="34.4385" x2="34.4385" y1="25.8672" y2="31.2414">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#BBC2C0"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M37.027,30.37c0,0.409-0.33,0.74-0.738,0.74h-3.697c-0.412,0-0.742-0.331-0.742-0.74v-3.699  c0-0.408,0.33-0.739,0.742-0.739h3.697c0.408,0,0.738,0.331,0.738,0.739V30.37z" fill="url(#SVGID_30_)"/>
-<path d="M27.412,31.849h-3.699c-0.816,0-1.479-0.664-1.479-1.479v0.74  c0,0.815,0.662,1.479,1.479,1.479h3.699c0.816,0,1.479-0.665,1.479-1.479v-0.74C28.891,31.185,28.229,31.849,27.412,31.849z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M27.412,31.849h-3.699c-0.816,0-1.479-0.664-1.479-1.479v0.74  c0,0.815,0.662,1.479,1.479,1.479h3.699c0.816,0,1.479-0.665,1.479-1.479v-0.74C28.891,31.185,28.229,31.849,27.412,31.849z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="25.5625" x2="25.5625" y1="25.127" y2="31.9908">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M23.713,31.849c-0.816,0-1.479-0.664-1.479-1.479v-3.699  c0-0.815,0.662-1.479,1.479-1.479h3.699c0.816,0,1.479,0.664,1.479,1.479v3.699c0,0.815-0.662,1.479-1.479,1.479H23.713z" fill="url(#SVGID_31_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="25.5615" x2="25.5615" y1="25.8672" y2="31.2414">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#BBC2C0"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M28.15,30.37c0,0.409-0.33,0.74-0.738,0.74h-3.699c-0.408,0-0.74-0.331-0.74-0.74v-3.699  c0-0.408,0.332-0.739,0.74-0.739h3.699c0.408,0,0.738,0.331,0.738,0.739V30.37z" fill="url(#SVGID_32_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="16.6846" x2="16.6846" y1="25.127" y2="31.9099">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M14.836,31.849c-0.816,0-1.48-0.664-1.48-1.479v-3.699  c0-0.815,0.664-1.479,1.48-1.479h3.699c0.816,0,1.479,0.664,1.479,1.479v3.699c0,0.815-0.662,1.479-1.479,1.479H14.836z" fill="url(#SVGID_33_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M18.535,31.849h-3.699c-0.816,0-1.48-0.664-1.48-1.479v0.74c0,0.815,0.664,1.479,1.48,1.479  h3.699c0.816,0,1.479-0.665,1.479-1.479v-0.74C20.014,31.185,19.352,31.849,18.535,31.849z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M18.535,31.849h-3.699c-0.816,0-1.48-0.664-1.48-1.479v0.74c0,0.815,0.664,1.479,1.48,1.479  h3.699c0.816,0,1.479-0.665,1.479-1.479v-0.74C20.014,31.185,19.352,31.849,18.535,31.849z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="16.6865" x2="16.6865" y1="25.8672" y2="31.2414">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#BBC2C0"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M19.275,30.37c0,0.409-0.332,0.74-0.74,0.74h-3.699c-0.408,0-0.738-0.331-0.738-0.74v-3.699  c0-0.408,0.33-0.739,0.738-0.739h3.699c0.408,0,0.74,0.331,0.74,0.739V30.37z" fill="url(#SVGID_34_)"/>
 <rect fill="#FFFFFF" fill-opacity="0.6" height="0.74" stroke-opacity="0.6" width="40.686" x="9.658" y="22.233"/>
-<rect fill="#231F20" fill-opacity="0.3" height="0.74" stroke-opacity="0.3" width="40.686" x="9.658" y="21.493"/>
+<rect fill="#222021" fill-opacity="0.3" height="0.74" stroke-opacity="0.3" width="40.686" x="9.658" y="21.493"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,21 +4,21 @@
 <g>
 <rect fill="none" height="60" width="60" x="0"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="301.0195" x2="301.0195" y1="-240.6152" y2="-287.0708">
-<stop offset="0" style="stop-color:#ECF3F5"/>
-<stop offset="0.2" style="stop-color:#ECF3F5"/>
-<stop offset="0.8606" style="stop-color:#7E878A"/>
-<stop offset="1" style="stop-color:#B0B8BB"/>
+<stop offset="0" style="stop-color:#EFF2F0"/>
+<stop offset="0.2" style="stop-color:#EFF2F0"/>
+<stop offset="0.8606" style="stop-color:#828586"/>
+<stop offset="1" style="stop-color:#B3B8B7"/>
 </linearGradient>
 <path d="M55.501,8.382H4.5C3.673,8.382,3,9.054,3,9.883v43.162c0,0.826,0.673,1.498,1.5,1.498h51.001  c0.826,0,1.5-0.672,1.5-1.498V9.883C57.001,9.054,56.327,8.382,55.501,8.382L55.501,8.382z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="301.0195" x2="301.0195" y1="-241.6206" y2="-285.9926">
-<stop offset="0" style="stop-color:#DDE3E6"/>
-<stop offset="0.2364" style="stop-color:#C9CED1"/>
-<stop offset="0.9636" style="stop-color:#899396"/>
-<stop offset="1" style="stop-color:#899396"/>
+<stop offset="0" style="stop-color:#E0E3E1"/>
+<stop offset="0.2364" style="stop-color:#CBCFCD"/>
+<stop offset="0.9636" style="stop-color:#8D9292"/>
+<stop offset="1" style="stop-color:#8D9292"/>
 </linearGradient>
 <path d="M4.5,53.785c-0.409,0-0.742-0.334-0.742-0.74V9.883c0-0.411,0.333-0.743,0.742-0.743h51.001  c0.41,0,0.742,0.333,0.742,0.743v43.162c0,0.406-0.332,0.74-0.742,0.74H4.5z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="300.9824" x2="300.9824" y1="-243.6255" y2="-284.2258">
-<stop offset="0" style="stop-color:#707173"/>
+<stop offset="0" style="stop-color:#717172"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" fill-opacity="0.4" height="41.061" stroke-opacity="0.4" width="48.965" x="5.48" y="10.892"/>
@@ -45,51 +45,51 @@
 </linearGradient>
 <path d="M43.173,46.221H31.32v-1.486c0-1.266,0.285-2.49,0.857-3.674c0.57-1.185,2.061-2.677,4.469-4.478  c1.396-1.043,2.289-1.858,2.681-2.451c0.389-0.592,0.584-1.182,0.584-1.769c0-0.94-0.339-1.684-1.011-2.224  c-0.674-0.541-1.545-0.811-2.616-0.811c-0.902,0-2.455,0.207-4.66,0.621V27.75c1.883-0.395,3.53-0.592,4.946-0.592  c2.074,0,3.693,0.458,4.857,1.375c1.162,0.916,1.744,2.162,1.744,3.74c0,0.688-0.141,1.397-0.424,2.133  c-0.283,0.732-0.727,1.404-1.328,2.01c-0.602,0.607-1.471,1.342-2.604,2.201c-1.285,0.961-2.17,1.707-2.656,2.238  c-0.484,0.531-0.854,1.088-1.107,1.67c-0.252,0.582-0.389,1.141-0.41,1.678h8.529L43.173,46.221L43.173,46.221z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="301.0195" x2="301.0195" y1="-244.7197" y2="-255.0341">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C6957B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="10.453" width="46.162" x="6.919" y="12.301"/>
-<rect fill="#231F20" fill-opacity="0.4" height="7.614" stroke-opacity="0.4" width="6.012" x="41.637" y="8.382"/>
-<rect fill="#231F20" fill-opacity="0.4" height="7.614" stroke-opacity="0.4" width="6.012" x="12.63" y="8.382"/>
+<rect fill="#222021" fill-opacity="0.4" height="7.614" stroke-opacity="0.4" width="6.012" x="41.637" y="8.382"/>
+<rect fill="#222021" fill-opacity="0.4" height="7.614" stroke-opacity="0.4" width="6.012" x="12.63" y="8.382"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="312.6953" x2="318.8543" y1="-249.5625" y2="-249.5625">
-<stop offset="0" style="stop-color:#FB6C41"/>
-<stop offset="0.497" style="stop-color:#FFB69E"/>
-<stop offset="1" style="stop-color:#FB6C41"/>
+<stop offset="0" style="stop-color:#C39179"/>
+<stop offset="0.497" style="stop-color:#E2CEBB"/>
+<stop offset="1" style="stop-color:#C39179"/>
 </linearGradient>
 <ellipse cx="44.676" cy="17.082" fill="url(#SVGID_9_)" rx="3.051" ry="2.87"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="283.6484" x2="289.8074" y1="-249.5625" y2="-249.5625">
-<stop offset="0" style="stop-color:#FB6C41"/>
-<stop offset="0.497" style="stop-color:#FFB69E"/>
-<stop offset="1" style="stop-color:#FB6C41"/>
+<stop offset="0" style="stop-color:#C39179"/>
+<stop offset="0.497" style="stop-color:#E2CEBB"/>
+<stop offset="1" style="stop-color:#C39179"/>
 </linearGradient>
 <ellipse cx="15.629" cy="17.082" fill="url(#SVGID_10_)" rx="3.049" ry="2.87"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="315.6953" x2="315.6953" y1="-246.5366" y2="-251.6692">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+<stop offset="0" style="stop-color:#351A25"/>
+<stop offset="1" style="stop-color:#803F4F"/>
 </linearGradient>
 <path d="M47.727,16.346c0,1.686-1.367,3.05-3.049,3.05c-1.685,0-3.052-1.364-3.052-3.05  c0-1.681,1.367-3.048,3.052-3.048C46.357,13.297,47.727,14.665,47.727,16.346z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="313.5303" x2="317.8512" y1="-244.3633" y2="-244.3633">
-<stop offset="0" style="stop-color:#B6B4B5"/>
-<stop offset="0.1152" style="stop-color:#FFFCFE"/>
+<stop offset="0" style="stop-color:#B5B5B5"/>
+<stop offset="0.1152" style="stop-color:#FEFDFD"/>
 <stop offset="0.6788" style="stop-color:#595959"/>
 <stop offset="0.9455" style="stop-color:#D4D3D3"/>
 <stop offset="1" style="stop-color:#D4D3D3"/>
 </linearGradient>
 <path d="M44.678,5.458c-1.201,0-2.179,0.977-2.179,2.178v8.494c0,1.202,0.978,2.177,2.179,2.177  c1.198,0,2.178-0.975,2.178-2.177V7.636C46.854,6.435,45.876,5.458,44.678,5.458z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="286.6484" x2="286.6484" y1="-246.5366" y2="-251.6692">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+<stop offset="0" style="stop-color:#351A25"/>
+<stop offset="1" style="stop-color:#803F4F"/>
 </linearGradient>
 <path d="M18.678,16.346c0,1.686-1.366,3.05-3.05,3.05s-3.048-1.364-3.048-3.05  c0-1.681,1.365-3.048,3.048-3.048C17.312,13.297,18.678,14.665,18.678,16.346z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="284.4844" x2="288.8053" y1="-244.3633" y2="-244.3633">
-<stop offset="0" style="stop-color:#B6B4B5"/>
-<stop offset="0.1152" style="stop-color:#FFFCFE"/>
+<stop offset="0" style="stop-color:#B5B5B5"/>
+<stop offset="0.1152" style="stop-color:#FEFDFD"/>
 <stop offset="0.6788" style="stop-color:#595959"/>
 <stop offset="0.9455" style="stop-color:#D4D3D3"/>
 <stop offset="1" style="stop-color:#D4D3D3"/>
 </linearGradient>
 <path d="M15.628,5.458c-1.202,0-2.175,0.977-2.175,2.178v8.494c0,1.202,0.973,2.177,2.175,2.177  s2.18-0.975,2.18-2.177V7.636C17.808,6.435,16.83,5.458,15.628,5.458z" fill="url(#SVGID_14_)"/>
-<polygon fill="#701619" points="53.081,23.051 6.919,23.051 6.919,22.455 53.081,22.455 "/>
+<polygon fill="#55313A" points="53.081,23.051 6.919,23.051 6.919,22.455 53.081,22.455 "/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -528.0195 -588.4805)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="546.5391" x2="540.9523" y1="627.8145" y2="633.4014">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.297" style="stop-color:#FFFFFF"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_alarm.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_alarm.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_alarm.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,21 +4,21 @@
 <g>
 <rect fill="none" height="60" width="60" x="0"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="301.0195" x2="301.0195" y1="-240.6152" y2="-287.0708">
-<stop offset="0" style="stop-color:#ECF3F5"/>
-<stop offset="0.2" style="stop-color:#ECF3F5"/>
-<stop offset="0.8606" style="stop-color:#7E878A"/>
-<stop offset="1" style="stop-color:#B0B8BB"/>
+<stop offset="0" style="stop-color:#EFF2F0"/>
+<stop offset="0.2" style="stop-color:#EFF2F0"/>
+<stop offset="0.8606" style="stop-color:#828586"/>
+<stop offset="1" style="stop-color:#B3B8B7"/>
 </linearGradient>
 <path d="M55.501,8.382H4.5C3.673,8.382,3,9.054,3,9.883v43.162c0,0.826,0.673,1.498,1.5,1.498h51.001  c0.826,0,1.5-0.672,1.5-1.498V9.883C57.001,9.054,56.327,8.382,55.501,8.382L55.501,8.382z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="301.0195" x2="301.0195" y1="-241.6206" y2="-285.9926">
-<stop offset="0" style="stop-color:#DDE3E6"/>
-<stop offset="0.2364" style="stop-color:#C9CED1"/>
-<stop offset="0.9636" style="stop-color:#899396"/>
-<stop offset="1" style="stop-color:#899396"/>
+<stop offset="0" style="stop-color:#E0E3E1"/>
+<stop offset="0.2364" style="stop-color:#CBCFCD"/>
+<stop offset="0.9636" style="stop-color:#8D9292"/>
+<stop offset="1" style="stop-color:#8D9292"/>
 </linearGradient>
 <path d="M4.5,53.785c-0.409,0-0.742-0.334-0.742-0.74V9.883c0-0.411,0.333-0.743,0.742-0.743h51.001  c0.41,0,0.742,0.333,0.742,0.743v43.162c0,0.406-0.332,0.74-0.742,0.74H4.5z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="300.9824" x2="300.9824" y1="-243.6255" y2="-284.2258">
-<stop offset="0" style="stop-color:#707173"/>
+<stop offset="0" style="stop-color:#717172"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" fill-opacity="0.4" height="41.061" stroke-opacity="0.4" width="48.965" x="5.48" y="10.892"/>
@@ -45,51 +45,51 @@
 </linearGradient>
 <path d="M43.173,46.221H31.32v-1.486c0-1.266,0.285-2.49,0.857-3.674c0.57-1.185,2.061-2.677,4.469-4.478  c1.396-1.043,2.289-1.858,2.681-2.451c0.389-0.592,0.584-1.182,0.584-1.769c0-0.94-0.339-1.684-1.011-2.224  c-0.674-0.541-1.545-0.811-2.616-0.811c-0.902,0-2.455,0.207-4.66,0.621V27.75c1.883-0.395,3.53-0.592,4.946-0.592  c2.074,0,3.693,0.458,4.857,1.375c1.162,0.916,1.744,2.162,1.744,3.74c0,0.688-0.141,1.397-0.424,2.133  c-0.283,0.732-0.727,1.404-1.328,2.01c-0.602,0.607-1.471,1.342-2.604,2.201c-1.285,0.961-2.17,1.707-2.656,2.238  c-0.484,0.531-0.854,1.088-1.107,1.67c-0.252,0.582-0.389,1.141-0.41,1.678h8.529L43.173,46.221L43.173,46.221z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="301.0195" x2="301.0195" y1="-244.7197" y2="-255.0341">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C6957B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="10.453" width="46.162" x="6.919" y="12.301"/>
-<rect fill="#231F20" fill-opacity="0.4" height="7.614" stroke-opacity="0.4" width="6.012" x="41.637" y="8.382"/>
-<rect fill="#231F20" fill-opacity="0.4" height="7.614" stroke-opacity="0.4" width="6.012" x="12.63" y="8.382"/>
+<rect fill="#222021" fill-opacity="0.4" height="7.614" stroke-opacity="0.4" width="6.012" x="41.637" y="8.382"/>
+<rect fill="#222021" fill-opacity="0.4" height="7.614" stroke-opacity="0.4" width="6.012" x="12.63" y="8.382"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="312.6953" x2="318.8543" y1="-249.5625" y2="-249.5625">
-<stop offset="0" style="stop-color:#FB6C41"/>
-<stop offset="0.497" style="stop-color:#FFB69E"/>
-<stop offset="1" style="stop-color:#FB6C41"/>
+<stop offset="0" style="stop-color:#C39179"/>
+<stop offset="0.497" style="stop-color:#E2CEBB"/>
+<stop offset="1" style="stop-color:#C39179"/>
 </linearGradient>
 <ellipse cx="44.676" cy="17.082" fill="url(#SVGID_9_)" rx="3.051" ry="2.87"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="283.6484" x2="289.8074" y1="-249.5625" y2="-249.5625">
-<stop offset="0" style="stop-color:#FB6C41"/>
-<stop offset="0.497" style="stop-color:#FFB69E"/>
-<stop offset="1" style="stop-color:#FB6C41"/>
+<stop offset="0" style="stop-color:#C39179"/>
+<stop offset="0.497" style="stop-color:#E2CEBB"/>
+<stop offset="1" style="stop-color:#C39179"/>
 </linearGradient>
 <ellipse cx="15.629" cy="17.082" fill="url(#SVGID_10_)" rx="3.049" ry="2.87"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="315.6953" x2="315.6953" y1="-246.5366" y2="-251.6692">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+<stop offset="0" style="stop-color:#351A25"/>
+<stop offset="1" style="stop-color:#803F4F"/>
 </linearGradient>
 <path d="M47.727,16.346c0,1.686-1.367,3.05-3.049,3.05c-1.685,0-3.052-1.364-3.052-3.05  c0-1.681,1.367-3.048,3.052-3.048C46.357,13.297,47.727,14.665,47.727,16.346z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="313.5303" x2="317.8512" y1="-244.3633" y2="-244.3633">
-<stop offset="0" style="stop-color:#B6B4B5"/>
-<stop offset="0.1152" style="stop-color:#FFFCFE"/>
+<stop offset="0" style="stop-color:#B5B5B5"/>
+<stop offset="0.1152" style="stop-color:#FEFDFD"/>
 <stop offset="0.6788" style="stop-color:#595959"/>
 <stop offset="0.9455" style="stop-color:#D4D3D3"/>
 <stop offset="1" style="stop-color:#D4D3D3"/>
 </linearGradient>
 <path d="M44.678,5.458c-1.201,0-2.179,0.977-2.179,2.178v8.494c0,1.202,0.978,2.177,2.179,2.177  c1.198,0,2.178-0.975,2.178-2.177V7.636C46.854,6.435,45.876,5.458,44.678,5.458z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="286.6484" x2="286.6484" y1="-246.5366" y2="-251.6692">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+<stop offset="0" style="stop-color:#351A25"/>
+<stop offset="1" style="stop-color:#803F4F"/>
 </linearGradient>
 <path d="M18.678,16.346c0,1.686-1.366,3.05-3.05,3.05s-3.048-1.364-3.048-3.05  c0-1.681,1.365-3.048,3.048-3.048C17.312,13.297,18.678,14.665,18.678,16.346z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -271.0195 -232.4805)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="284.4844" x2="288.8053" y1="-244.3633" y2="-244.3633">
-<stop offset="0" style="stop-color:#B6B4B5"/>
-<stop offset="0.1152" style="stop-color:#FFFCFE"/>
+<stop offset="0" style="stop-color:#B5B5B5"/>
+<stop offset="0.1152" style="stop-color:#FEFDFD"/>
 <stop offset="0.6788" style="stop-color:#595959"/>
 <stop offset="0.9455" style="stop-color:#D4D3D3"/>
 <stop offset="1" style="stop-color:#D4D3D3"/>
 </linearGradient>
 <path d="M15.628,5.458c-1.202,0-2.175,0.977-2.175,2.178v8.494c0,1.202,0.973,2.177,2.175,2.177  s2.18-0.975,2.18-2.177V7.636C17.808,6.435,16.83,5.458,15.628,5.458z" fill="url(#SVGID_14_)"/>
-<polygon fill="#701619" points="53.081,23.051 6.919,23.051 6.919,22.455 53.081,22.455 "/>
+<polygon fill="#55313A" points="53.081,23.051 6.919,23.051 6.919,22.455 53.081,22.455 "/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -528.0195 -588.4805)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="546.5391" x2="540.9523" y1="627.8145" y2="633.4014">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.297" style="stop-color:#FFFFFF"/>
@@ -105,58 +105,58 @@
 <polygon fill="none" points="0.414,0 0.414,10.485 0,10.899 0.414,11.313 0.414,30 19.1,30 19.514,30.414 19.928,30 30.414,30   30.414,0 "/>
 <path d="M13.769,24.668c-0.003,0.001-0.44,0.125-0.44,0.125l-0.022-0.021L12.8,24.867l-0.025-0.025  c-0.205,0.02-0.411,0.03-0.618,0.03c-1.746,0-3.402-0.694-4.662-1.954c-1.416-1.414-2.113-3.354-1.924-5.279L5.55,17.618l0.09-0.501  L5.634,17.11l0.032-0.128c0.023-0.113,0.049-0.226,0.079-0.338L0,10.899l2.238-2.238c0.623-0.625,1.393-1.296,2.627-1.358  C4.924,7.3,4.988,7.298,5.054,7.298c0.11,0,0.226,0.005,0.346,0.015L5.58,7.334c0.188,0.025,0.352,0.054,0.521,0.092  c0,0,0.277,0.066,0.313,0.076l4.098-4.098C12.707,1.209,15.636,0,18.76,0c2.05,0,4.037,0.526,5.792,1.527  c0.53-0.355,1.14-0.541,1.763-0.541c0.834,0,1.616,0.323,2.203,0.91c1.08,1.08,1.205,2.759,0.375,3.979  c2.574,4.525,1.834,10.311-1.883,14.027l-4.096,4.096c0,0.002,0.068,0.29,0.068,0.29c0.044,0.201,0.072,0.357,0.092,0.505  c0.011,0.083,0.021,0.159,0.026,0.23c0.015,0.178,0.019,0.354,0.011,0.519c-0.062,1.237-0.732,2.009-1.357,2.634l-2.24,2.238  L13.769,24.668z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -924.0166 637.3657)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="218.7148" x2="229.6865" y1="-1096.7686" y2="-1096.7686">
-<stop offset="0" style="stop-color:#676B6D"/>
-<stop offset="0.297" style="stop-color:#A0A3A6"/>
-<stop offset="0.7091" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#696A6B"/>
+<stop offset="0.297" style="stop-color:#A2A4A4"/>
+<stop offset="0.7091" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M8,14.656L8,14.656c-2.029,2.029-1.943,5.411,0.201,7.555c2.143,2.143,5.527,2.232,7.557,0.203l0,0  L8,14.656z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 0 9.765625e-004)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="3.21" x2="21.4822" y1="8.9229" y2="27.1951">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.2" style="stop-color:#FFE692"/>
-<stop offset="0.3879" style="stop-color:#FBD072"/>
-<stop offset="0.4182" style="stop-color:#F7BC54"/>
-<stop offset="0.6667" style="stop-color:#ED8C0D"/>
-<stop offset="0.8545" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+<stop offset="0" style="stop-color:#C2A770"/>
+<stop offset="0.2" style="stop-color:#DED7B3"/>
+<stop offset="0.3879" style="stop-color:#D2C49B"/>
+<stop offset="0.4182" style="stop-color:#C6B285"/>
+<stop offset="0.6667" style="stop-color:#AA8250"/>
+<stop offset="0.8545" style="stop-color:#CDBE93"/>
+<stop offset="1" style="stop-color:#BCA162"/>
 </linearGradient>
 <path d="M21.777,23.721L6.693,8.637c-2.041-0.73-2.813-0.205-3.748,0.731l-1.531,1.531L19.514,29l1.533-1.531  C21.982,26.532,22.508,25.761,21.777,23.721z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -924.0166 637.3657)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="221.9707" x2="226.2741" y1="-1120.2998" y2="-1120.2998">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.1939" style="stop-color:#FFE692"/>
-<stop offset="0.703" style="stop-color:#ED8C0D"/>
-<stop offset="0.8848" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+<stop offset="0" style="stop-color:#C2A770"/>
+<stop offset="0.1939" style="stop-color:#DED7B3"/>
+<stop offset="0.703" style="stop-color:#AA8250"/>
+<stop offset="0.8848" style="stop-color:#CDBE93"/>
+<stop offset="1" style="stop-color:#BCA162"/>
 </linearGradient>
 <path d="M27.057,6.375l0.754-0.755c0.83-0.829,0.83-2.188,0-3.017c-0.83-0.83-2.188-0.83-3.018,0  l-0.754,0.754L27.057,6.375z" fill="url(#SVGID_3__)"/>
-<path d="M27.057,6.375l0.754-0.755c0.045-0.045,0.08-0.098,0.119-0.146  c-0.385-0.581-0.832-1.134-1.344-1.645c-0.512-0.512-1.064-0.96-1.646-1.346c-0.047,0.041-0.1,0.074-0.146,0.12l-0.754,0.754  L27.057,6.375z" fill="#873900" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M26.869,3.546c-0.492-0.492-1.023-0.924-1.58-1.299c-0.178,0.095-0.346,0.207-0.494,0.355  l-0.473,0.473l3.018,3.017l0.471-0.472c0.148-0.148,0.262-0.318,0.357-0.495C27.791,4.568,27.359,4.038,26.869,3.546z" fill="#873900" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M27.057,6.375l0.754-0.755c0.045-0.045,0.08-0.098,0.119-0.146  c-0.385-0.581-0.832-1.134-1.344-1.645c-0.512-0.512-1.064-0.96-1.646-1.346c-0.047,0.041-0.1,0.074-0.146,0.12l-0.754,0.754  L27.057,6.375z" fill="#5E2D29" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M26.869,3.546c-0.492-0.492-1.023-0.924-1.58-1.299c-0.178,0.095-0.346,0.207-0.494,0.355  l-0.473,0.473l3.018,3.017l0.471-0.472c0.148-0.148,0.262-0.318,0.357-0.495C27.791,4.568,27.359,4.038,26.869,3.546z" fill="#5E2D29" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="26.3223" x2="14.1095" y1="4.0923" y2="16.3051">
-<stop offset="0" style="stop-color:#FDE6B1"/>
-<stop offset="1" style="stop-color:#EF951A"/>
+<stop offset="0" style="stop-color:#E6E0C8"/>
+<stop offset="1" style="stop-color:#AF8C5A"/>
 </linearGradient>
 <path d="M21.777,23.721l4.525-4.525c4.148-4.147,4.148-10.936,0-15.084s-10.936-4.148-15.084,0L6.693,8.637  L21.777,23.721z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="13.1172" x2="27.4319" y1="2.9941" y2="17.3088">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.2545" style="stop-color:#FFE692"/>
-<stop offset="0.503" style="stop-color:#F8C15B"/>
-<stop offset="0.5152" style="stop-color:#F6B84E"/>
-<stop offset="0.6667" style="stop-color:#ED8C0D"/>
-<stop offset="0.8545" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+<stop offset="0" style="stop-color:#C2A770"/>
+<stop offset="0.2545" style="stop-color:#DED7B3"/>
+<stop offset="0.503" style="stop-color:#C9B78A"/>
+<stop offset="0.5152" style="stop-color:#C4AE80"/>
+<stop offset="0.6667" style="stop-color:#AA8250"/>
+<stop offset="0.8545" style="stop-color:#CDBE93"/>
+<stop offset="1" style="stop-color:#BCA162"/>
 </linearGradient>
 <path d="M7.258,8.637l4.244-4.242C13.432,2.464,16.01,1.4,18.76,1.4c2.752,0,5.33,1.063,7.26,2.994  c1.932,1.931,2.994,4.509,2.994,7.259c0,2.751-1.063,5.329-2.994,7.26l-4.242,4.242L7.258,8.637z" fill="url(#SVGID_5__)"/>
-<rect fill="#873900" fill-opacity="0.2" height="0.401" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.546 -5.4806)" width="21.332" x="3.723" y="15.825"/>
+<rect fill="#5E2D29" fill-opacity="0.2" height="0.401" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.546 -5.4806)" width="21.332" x="3.723" y="15.825"/>
 <path d="M13.619,23.671c0.143-0.041,0.285-0.087,0.426-0.141l-7.162-7.161c-0.053,0.14-0.1,0.281-0.141,0.425  L13.619,23.671z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<rect fill="#873900" fill-opacity="0.1" height="0.4" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.429 -5.7637)" width="21.332" x="4.006" y="15.543"/>
+<rect fill="#5E2D29" fill-opacity="0.1" height="0.4" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.429 -5.7637)" width="21.332" x="4.006" y="15.543"/>
 <path d="M13.133,23.786c0.156-0.029,0.309-0.063,0.461-0.106L6.734,16.82c-0.043,0.151-0.078,0.305-0.107,0.459  L13.133,23.786z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M4.85,8.302l17.262,17.263c0.037-0.485-0.059-1.074-0.334-1.844L6.693,8.637  C5.924,8.36,5.336,8.266,4.85,8.302z" fill="#FFF6C9" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M6.693,8.637c-0.195-0.07-0.379-0.128-0.553-0.176l15.813,15.813  c-0.047-0.173-0.105-0.357-0.176-0.553L6.693,8.637z" fill="#FFF6C9" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect fill="#753200" fill-opacity="0.2" height="0.401" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 17.1142 -1.697)" width="25.598" x="-2.194" y="19.608"/>
-<rect fill="#753200" fill-opacity="0.1" height="0.398" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 16.9952 -1.9808)" width="25.599" x="-1.911" y="19.326"/>
+<path d="M4.85,8.302l17.262,17.263c0.037-0.485-0.059-1.074-0.334-1.844L6.693,8.637  C5.924,8.36,5.336,8.266,4.85,8.302z" fill="#EFEDD9" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M6.693,8.637c-0.195-0.07-0.379-0.128-0.553-0.176l15.813,15.813  c-0.047-0.173-0.105-0.357-0.176-0.553L6.693,8.637z" fill="#EFEDD9" fill-opacity="0.5" stroke-opacity="0.5"/>
+<rect fill="#522523" fill-opacity="0.2" height="0.401" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 17.1142 -1.697)" width="25.598" x="-2.194" y="19.608"/>
+<rect fill="#522523" fill-opacity="0.1" height="0.398" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 16.9952 -1.9808)" width="25.599" x="-1.911" y="19.326"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="21.6523" x2="21.6523" y1="1.7822" y2="16.0367">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#F9C966"/>
+<stop offset="1" style="stop-color:#CDBD92"/>
 </linearGradient>
 <path d="M27.348,15.49c-2.314-1.359-4.715-3.255-6.941-5.482  c-2.229-2.228-4.123-4.628-5.482-6.942l-0.236-0.403l0.436-0.172c1.156-0.455,2.375-0.686,3.627-0.686  c2.615,0,5.162,1.047,6.986,2.873c2.775,2.774,3.635,6.941,2.188,10.614l-0.172,0.435L27.348,15.49z" fill="url(#SVGID_6__)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="30" width="30" x="0.414"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_dynamic.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_dynamic.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_dynamic.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,21 +4,21 @@
 <g>
 <rect fill="none" fill-rule="evenodd" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="8.1353" y2="54.5904">
-<stop offset="0" style="stop-color:#ECF3F5"/>
-<stop offset="0.2" style="stop-color:#ECF3F5"/>
-<stop offset="0.8606" style="stop-color:#7E878A"/>
-<stop offset="1" style="stop-color:#B0B8BB"/>
+<stop offset="0" style="stop-color:#EFF2F0"/>
+<stop offset="0.2" style="stop-color:#EFF2F0"/>
+<stop offset="0.8606" style="stop-color:#828586"/>
+<stop offset="1" style="stop-color:#B3B8B7"/>
 </linearGradient>
 <path d="M55.5,8.382h-51C3.673,8.382,3,9.054,3,9.883v43.16c0,0.828,0.673,1.499,1.5,1.499h51  c0.828,0,1.5-0.671,1.5-1.499V9.883C57,9.054,56.328,8.382,55.5,8.382L55.5,8.382z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.9995" x2="29.9995" y1="9.1396" y2="53.5111">
-<stop offset="0" style="stop-color:#DDE3E6"/>
-<stop offset="0.2364" style="stop-color:#C9CED1"/>
-<stop offset="0.9636" style="stop-color:#899396"/>
-<stop offset="1" style="stop-color:#899396"/>
+<stop offset="0" style="stop-color:#E0E3E1"/>
+<stop offset="0.2364" style="stop-color:#CBCFCD"/>
+<stop offset="0.9636" style="stop-color:#8D9292"/>
+<stop offset="1" style="stop-color:#8D9292"/>
 </linearGradient>
 <path d="M4.5,53.784c-0.409,0-0.742-0.333-0.742-0.741V9.883  c0-0.411,0.333-0.743,0.742-0.743h51c0.412,0,0.742,0.333,0.742,0.743v43.16c0,0.408-0.33,0.741-0.742,0.741H4.5z" fill="url(#SVGID_2_)" fill-rule="evenodd"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.9624" x2="29.9624" y1="11.1455" y2="51.7444">
-<stop offset="0" style="stop-color:#707173"/>
+<stop offset="0" style="stop-color:#717172"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" fill-opacity="0.4" height="41.06" stroke-opacity="0.4" width="48.965" x="5.48" y="10.892"/>
@@ -35,51 +35,51 @@
 </linearGradient>
 <path d="M53.08,50.625c0,0-30.832,0-32.895,0  c-1.003,0-6.479-6.618-6.479-6.618s-6.788-5.71-6.788-6.063c0-0.688,0-15.19,0-15.19H53.08V50.625z" fill="url(#SVGID_5_)" fill-rule="evenodd"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="29.9995" x2="29.9995" y1="12.2397" y2="22.5541">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C6957B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" fill-rule="evenodd" height="10.453" width="46.161" x="6.919" y="12.301"/>
-<rect fill="#231F20" fill-opacity="0.4" fill-rule="evenodd" height="7.614" stroke-opacity="0.4" width="6.012" x="41.637" y="8.382"/>
-<rect fill="#231F20" fill-opacity="0.4" fill-rule="evenodd" height="7.614" stroke-opacity="0.4" width="6.012" x="12.631" y="8.382"/>
+<rect fill="#222021" fill-opacity="0.4" fill-rule="evenodd" height="7.614" stroke-opacity="0.4" width="6.012" x="41.637" y="8.382"/>
+<rect fill="#222021" fill-opacity="0.4" fill-rule="evenodd" height="7.614" stroke-opacity="0.4" width="6.012" x="12.631" y="8.382"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="41.6758" x2="47.8333" y1="17.0825" y2="17.0825">
-<stop offset="0" style="stop-color:#FB6C41"/>
-<stop offset="0.497" style="stop-color:#FFB69E"/>
-<stop offset="1" style="stop-color:#FB6C41"/>
+<stop offset="0" style="stop-color:#C39179"/>
+<stop offset="0.497" style="stop-color:#E2CEBB"/>
+<stop offset="1" style="stop-color:#C39179"/>
 </linearGradient>
 <ellipse cx="44.676" cy="17.082" fill="url(#SVGID_7_)" fill-rule="evenodd" rx="3.049" ry="2.87"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="12.6294" x2="18.7869" y1="17.0825" y2="17.0825">
-<stop offset="0" style="stop-color:#FB6C41"/>
-<stop offset="0.497" style="stop-color:#FFB69E"/>
-<stop offset="1" style="stop-color:#FB6C41"/>
+<stop offset="0" style="stop-color:#C39179"/>
+<stop offset="0.497" style="stop-color:#E2CEBB"/>
+<stop offset="1" style="stop-color:#C39179"/>
 </linearGradient>
 <ellipse cx="15.629" cy="17.082" fill="url(#SVGID_8_)" fill-rule="evenodd" rx="3.049" ry="2.87"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="44.6758" x2="44.6758" y1="14.0566" y2="19.1892">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+<stop offset="0" style="stop-color:#351A25"/>
+<stop offset="1" style="stop-color:#803F4F"/>
 </linearGradient>
 <path d="M47.725,16.346c0,1.686-1.367,3.05-3.049,3.05  c-1.684,0-3.049-1.364-3.049-3.05c0-1.681,1.365-3.048,3.049-3.048C46.357,13.297,47.725,14.665,47.725,16.346z" fill="url(#SVGID_9_)" fill-rule="evenodd"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="42.5107" x2="46.8302" y1="11.8828" y2="11.8828">
-<stop offset="0" style="stop-color:#B6B4B5"/>
-<stop offset="0.1152" style="stop-color:#FFFCFE"/>
+<stop offset="0" style="stop-color:#B5B5B5"/>
+<stop offset="0.1152" style="stop-color:#FEFDFD"/>
 <stop offset="0.6788" style="stop-color:#595959"/>
 <stop offset="0.9455" style="stop-color:#D4D3D3"/>
 <stop offset="1" style="stop-color:#D4D3D3"/>
 </linearGradient>
 <path d="M44.676,5.458c-1.201,0-2.176,0.977-2.176,2.178v8.494  c0,1.202,0.975,2.177,2.176,2.177s2.178-0.975,2.178-2.177V7.636C46.854,6.435,45.877,5.458,44.676,5.458z" fill="url(#SVGID_10_)" fill-rule="evenodd"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="15.6289" x2="15.6289" y1="14.0566" y2="19.1892">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+<stop offset="0" style="stop-color:#351A25"/>
+<stop offset="1" style="stop-color:#803F4F"/>
 </linearGradient>
 <path d="M18.678,16.346c0,1.686-1.365,3.05-3.05,3.05  c-1.684,0-3.048-1.364-3.048-3.05c0-1.681,1.364-3.048,3.048-3.048C17.313,13.297,18.678,14.665,18.678,16.346z" fill="url(#SVGID_11_)" fill-rule="evenodd"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="13.4644" x2="17.7848" y1="11.8828" y2="11.8828">
-<stop offset="0" style="stop-color:#B6B4B5"/>
-<stop offset="0.1152" style="stop-color:#FFFCFE"/>
+<stop offset="0" style="stop-color:#B5B5B5"/>
+<stop offset="0.1152" style="stop-color:#FEFDFD"/>
 <stop offset="0.6788" style="stop-color:#595959"/>
 <stop offset="0.9455" style="stop-color:#D4D3D3"/>
 <stop offset="1" style="stop-color:#D4D3D3"/>
 </linearGradient>
 <path d="M15.628,5.458c-1.202,0-2.175,0.977-2.175,2.178v8.494  c0,1.202,0.973,2.177,2.175,2.177s2.18-0.975,2.18-2.177V7.636C17.808,6.435,16.83,5.458,15.628,5.458z" fill="url(#SVGID_12_)" fill-rule="evenodd"/>
-<polygon fill="#701619" points="53.08,23.051 6.919,23.051 6.919,22.455 53.08,22.455 53.08,23.051 "/>
+<polygon fill="#55313A" points="53.08,23.051 6.919,23.051 6.919,22.455 53.08,22.455 53.08,23.051 "/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 -286)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="275.5176" x2="269.9313" y1="-325.3354" y2="-330.9218">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.297" style="stop-color:#FFFFFF"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_assistant.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_assistant.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_assistant.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,29 +3,29 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+<stop offset="0" style="stop-color:#93AC5D"/>
+<stop offset="0.297" style="stop-color:#93AC5D"/>
+<stop offset="0.6667" style="stop-color:#356742"/>
+<stop offset="0.7939" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#447B42"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399  c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514  c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737  c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12  c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B1BE95" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B1BE95" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+<stop offset="0" style="stop-color:#315D3E"/>
+<stop offset="0.5" style="stop-color:#1E3A31"/>
+<stop offset="1" style="stop-color:#2E593D"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31  c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535  c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
@@ -35,74 +35,74 @@
 <rect fill="none" height="30" width="30" y="0.001"/>
 <path d="M28.736,18.376c0.006-0.225,0.008-0.446-0.004-0.649c-0.002-0.063-0.008-0.122-0.02-0.228  c-0.018-0.208-0.035-0.415-0.068-0.609c-0.01-0.063-0.023-0.122-0.053-0.255c-0.037-0.18-0.072-0.357-0.121-0.521  c-0.02-0.068-0.043-0.131-0.066-0.192l-0.936,0.352l0.896-0.462c-0.047-0.14-0.098-0.279-0.154-0.406  c-0.035-0.079-0.076-0.149-0.115-0.22l-0.865,0.502l0.805-0.611c-0.057-0.108-0.115-0.215-0.178-0.306  c-0.064-0.094-0.133-0.174-0.205-0.252l-0.066-0.078c-0.061-0.076-0.125-0.149-0.197-0.217c-0.158-0.144-0.311-0.233-0.379-0.271  l0.063-0.398h-0.217c-0.018-0.405-0.047-0.809-0.088-1.203c0.014-0.257,0.016-0.514,0.021-0.819  c0.004-0.072,0.008-0.146,0.008-0.203c0-0.065-0.049-1.029-0.049-1.029c-0.006-0.074-0.018-0.146-0.037-0.245  c-0.043-0.41-0.105-0.811-0.189-1.234c-0.01-0.077-0.02-0.153-0.057-0.299c0,0-0.107-0.409-0.164-0.609  c-0.016-0.063-0.033-0.127-0.078-0.267c-0.016-0.036-0.031-0.072-0.049-0.109c-0.404-1.208-1.006-2.3-1.736-3.177l-0.084-0.135  l-0.057-0.066c-0.045-0.052-0.094-0.101-0.174-0.179c-0.145-0.161-0.297-0.316-0.455-0.472c-0.135-0.131-0.275-0.261-0.422-0.387  c-0.164-0.143-0.332-0.282-0.545-0.447c-0.031-0.027-0.117-0.1-0.117-0.1l-0.068-0.048c-0.076-0.054-0.156-0.104-0.236-0.152  l-0.092-0.058c-0.166-0.109-0.334-0.219-0.531-0.336c-0.043-0.028-0.225-0.134-0.225-0.134c-0.076-0.041-0.156-0.079-0.238-0.117  l-0.15-0.074c-0.186-0.095-0.371-0.188-0.557-0.271l-0.072-0.036l-0.172-0.073c-0.102-0.042-0.209-0.079-0.316-0.116l-0.098-0.035  C18.303,0.378,16.66,0,14.943,0c-3.277,0-6.254,1.365-8.416,3.851c0,0-0.074,0.042-0.088,0.049c-0.102,0.04-0.201,0.082-0.33,0.142  L6.088,4.048L5.908,4.14c0,0-0.043,0.032-0.051,0.038C5.732,4.245,5.611,4.316,5.516,4.38L4.975,4.731v0.058  c-1.043,0.897-2.107,2.544-2.125,5.53c0,0,0.002,0.221,0.008,0.355c0.006,0.26,0.014,0.522,0.039,0.858l0,0l0.006,0.119  c0.018,0.194,0.037,0.393,0.07,0.65l0.084,0.609c-0.025,0.351-0.045,0.689-0.055,1.025c-0.148,0.088-0.277,0.184-0.396,0.293  c-0.055,0.051-0.107,0.11-0.15,0.166c-0.109,0.116-0.217,0.235-0.318,0.385c-0.049,0.072-0.094,0.154-0.139,0.237L1.93,15.142  c-0.049,0.085-0.096,0.17-0.141,0.269c-0.057,0.125-0.105,0.264-0.152,0.402l0.945,0.323l-0.984-0.215  c-0.023,0.061-0.045,0.122-0.066,0.191c-0.057,0.194-0.1,0.402-0.143,0.626l-0.029,0.14c-0.037,0.226-0.061,0.463-0.078,0.709  L1.27,17.703c-0.014,0.241-0.012,0.489-0.004,0.729v0.122l0.041,0.001l-0.039,0.002l0.004,0.159c0.18,2.729,1.537,4.709,3.225,4.709  l0.066-0.003c0.033,0.007,0.068,0.012,0.104,0.017l0.314,0.518h0.018c1.168,1.754,3.143,3.851,6.264,4.856  c0.137,0.088,0.277,0.173,0.42,0.254c0.105,0.06,0.211,0.116,0.322,0.173c0.189,0.096,0.383,0.184,0.566,0.259  c0.115,0.049,0.229,0.096,0.348,0.139c0.217,0.075,0.434,0.135,0.734,0.208c0.076,0.021,0.154,0.041,0.236,0.056  c0.363,0.067,0.697,0.1,1.018,0.1c0.369,0,0.715-0.029,1.049-0.071c0.1-0.012,0.199-0.027,0.301-0.044  c0.256-0.042,0.504-0.096,0.809-0.176l0.174-0.046c0.24-0.073,0.469-0.155,0.691-0.247l0.229-0.095l0.018-0.02  c1.295-0.59,2.434-1.545,3.477-2.911l0.057-0.075l0.09-0.18c0.49-0.765,0.957-1.572,1.398-2.416l0.01,0.018  c0,0,0.344-0.712,0.385-0.799c0.455,0.389,0.947,0.495,1.277,0.518l0.145,0.005c0.139,0,0.281-0.013,0.424-0.038l0.066,0.002  c1.689,0,3.045-1.98,3.227-4.714C28.734,18.665,28.738,18.451,28.736,18.376z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <radialGradient cx="-4272.6958" cy="-2826.3394" gradientTransform="matrix(0.4209 0 0 0.4195 1813.6772 1193.3445)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="50.7847">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+<stop offset="0" style="stop-color:#F4EDE4"/>
+<stop offset="0.5091" style="stop-color:#E8D9CA"/>
+<stop offset="0.7636" style="stop-color:#DDC4B0"/>
+<stop offset="1" style="stop-color:#BF9C89"/>
 </radialGradient>
 <path d="M25.389,15.734c-0.051-0.023-0.109-0.029-0.166-0.046v-0.001c-0.01-0.003-0.02-0.004-0.031-0.006  c-0.084-0.021-0.164-0.041-0.25-0.045C14.48,13.817,9.682,8.021,9.32,9.556c-0.289,1.219-3.221,3.863-4.758,5.179  c0.014,0.062,0.02,0.111,0.035,0.171c0,0,0.053,0.271,0.168,0.729c-0.121,0.014-0.24,0.039-0.355,0.088  c-0.979,0.413-1.285,2.014-0.684,3.58c0.596,1.563,1.873,2.502,2.852,2.089c0.061-0.025,0.113-0.067,0.166-0.104  c0.566,1.277,1.268,2.646,2.119,4.018c1.432,1.7,3.623,3.694,6.043,3.694c2.93,0,4.719-1.601,5.951-3.216  c0.035-0.069,0.064-0.132,0.1-0.188c0.912-1.426,1.652-2.856,2.252-4.188c0.955,0.331,2.182-0.559,2.791-2.063  C26.633,17.789,26.357,16.172,25.389,15.734z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="10.7998" x2="19.8362" y1="30.4028" y2="21.437">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+<stop offset="0" style="stop-color:#E8D9CA"/>
+<stop offset="1" style="stop-color:#DDC4B0"/>
 </linearGradient>
 <path d="M14.477,28.181c-1.781,0-3.578-0.829-4.9-2.08C10.975,27.572,12.857,29,14.906,29  c2.93,0,4.719-1.601,5.951-3.216c0.035-0.069,0.064-0.132,0.1-0.188c0.912-1.426,1.652-2.856,2.252-4.188  C19.879,27.229,17.404,28.181,14.477,28.181z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.8223" x2="14.8223" y1="1.3467" y2="14.6545">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3758" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M14.615,1.151c-3.629,0-5.373,1.65-6.721,3.372c-2.188,0.339-5.66,2.344-3.209,11.141  c1.535-1.317,4.346-4.89,4.635-6.108c0.365-1.549,5.246,4.369,15.902,6.132c0.127-0.492,0.182-0.782,0.182-0.782  C27.078,7.396,23.438,1.444,14.615,1.151z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="19.375" x2="7.3168" y1="14.0776" y2="6.9192">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3636" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M9.332,8.835c0,0,5.217,6.854,15.818,6.842C25.15,15.677,20.156,14.894,9.332,8.835z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="6.2285" x2="6.3344" y1="5.5264" y2="13.1843">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3758" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M8.076,5.032c0,0-5.105,0.307-3.211,8.964C4.865,13.996,4.24,8.067,8.076,5.032z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="16.5127" x2="16.1374" y1="2.4868" y2="5.9564">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+<stop offset="0" style="stop-color:#8D7B6A"/>
+<stop offset="1" style="stop-color:#451F1E"/>
 </linearGradient>
 <path d="M17.088,6.231c-2.377-0.338-6.398-2.445-7.977-1.694c0,0,5.16-5.888,14.27,0.818  C23.381,5.355,21.211,6.819,17.088,6.231z" fill="url(#SVGID_6_)"/>
 <path d="M14.906,29c1.008,0,1.877-0.191,2.641-0.508c0.219-0.284,0.35-0.608,0.35-0.962  c0-1.137-1.271-2.026-2.895-2.026c-0.975,0-1.861,0.333-2.387,0.871c-2.586-0.645-4.225-2.271-5.199-3.676  c0.191,0.386,0.396,0.776,0.613,1.169c0.006,0.01,0.01,0.021,0.016,0.03c0.219,0.396,0.449,0.794,0.693,1.194l0,0  c0.018,0.031,0.035,0.061,0.055,0.094c0.008,0.015,0.018,0.027,0.027,0.043c0.016,0.026,0.029,0.05,0.043,0.076  C10.295,27.006,12.486,29,14.906,29z" fill="#020202" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M4.039,19.958c0.051,0.078,0.098,0.153,0.145,0.229c0.115,0.174,0.242,0.337,0.369,0.481l0,0  c0.623,0.679,1.387,0.993,2.025,0.724c0.061-0.025,0.113-0.067,0.166-0.104c0.031,0.07,0.068,0.145,0.1,0.215  c0.213-0.626,0.311-1.44,0.287-2.506c-0.004-0.219-0.012-0.443-0.029-0.672c-0.094-1.413-0.336-2.495-0.719-3.22l-0.041-0.581  l0.008-0.197C6.436,7.803,9.889,3.421,14.943,3.421c5.088,0,8.543,4.423,8.596,11.01l0.006,0.054l-0.059,0.897  c-0.307,0.713-0.502,1.701-0.586,2.943c-0.018,0.229-0.023,0.453-0.033,0.712c-0.02,1.024,0.08,1.843,0.293,2.477  c0.016-0.035,0.035-0.07,0.049-0.105c0.75,0.259,1.664-0.238,2.318-1.189l0,0c0.088-0.126,0.17-0.264,0.252-0.403  c0.076-0.151,0.152-0.304,0.221-0.471c0.633-1.556,0.357-3.173-0.611-3.61c-0.051-0.023-0.109-0.029-0.166-0.046v-0.001  c0.127-0.492,0.182-0.782,0.182-0.782c0.063-0.284,0.117-0.566,0.164-0.848c0.014-0.076,0.025-0.157,0.039-0.235  c0.035-0.214,0.064-0.429,0.09-0.642c0.008-0.068,0.014-0.139,0.021-0.207c0.061-0.561,0.086-1.11,0.078-1.646  c0-0.048-0.002-0.097-0.004-0.144c-0.004-0.243-0.014-0.48-0.037-0.717c0-0.027-0.002-0.055-0.004-0.082  c-0.047-0.539-0.127-1.063-0.242-1.571c-0.006-0.024-0.014-0.05-0.021-0.074c-0.057-0.244-0.119-0.484-0.193-0.721  c-0.002-0.004-0.004-0.01-0.004-0.01c-0.463-1.186-1.051-2.256-1.75-3.196c-0.002-0.002-0.002-0.002-0.002-0.002  c-0.461-0.538-0.99-1.023-1.584-1.456c-0.006-0.005-0.014-0.01-0.02-0.016c-0.287-0.203-0.588-0.393-0.902-0.572  c-0.029-0.016-0.057-0.029-0.084-0.045c-0.305-0.169-0.629-0.327-0.965-0.471c-0.041-0.017-0.082-0.035-0.125-0.054  c-0.332-0.137-0.68-0.263-1.039-0.376c-0.053-0.017-0.104-0.031-0.154-0.046c-0.363-0.107-0.738-0.206-1.133-0.285  c-0.051-0.011-0.102-0.022-0.154-0.031c-0.402-0.079-0.818-0.146-1.246-0.196c-0.039-0.005-0.078-0.007-0.119-0.013  c-0.451-0.049-0.916-0.084-1.398-0.1c-3.629,0-5.373,1.65-6.721,3.372C7.748,4.545,7.598,4.576,7.441,4.615l-0.02,0.004  C7.27,4.66,7.117,4.707,6.959,4.765C6.953,4.767,6.947,4.767,6.941,4.771C6.783,4.831,6.625,4.898,6.465,4.979  c-0.004,0.003-0.008,0.003-0.01,0.004c-0.162,0.084-0.322,0.18-0.48,0.287v0.003c-0.977,1.45-1.701,3.185-2.127,5.142  c0,0.349,0.014,0.72,0.049,1.107c0,0.006,0,0.011,0,0.011c0.018,0.192,0.035,0.389,0.061,0.587c0.002,0.02,0.006,0.038,0.008,0.057  c0.023,0.187,0.049,0.377,0.08,0.574c0.004,0.037,0.012,0.078,0.016,0.117c0.031,0.179,0.061,0.361,0.1,0.549  c0.01,0.064,0.023,0.131,0.037,0.196c0.031,0.169,0.064,0.333,0.102,0.508c0.023,0.101,0.053,0.207,0.074,0.311  c0.033,0.146,0.066,0.286,0.104,0.435c0.063,0.256,0.131,0.516,0.207,0.783c-0.094,0.015-0.186,0.035-0.273,0.073  c-0.979,0.413-1.285,2.014-0.684,3.58c0.063,0.167,0.137,0.324,0.217,0.477C3.975,19.841,4.006,19.9,4.039,19.958z M4.758,15.599  c0.002,0.013,0.006,0.023,0.008,0.036c-0.02,0.002-0.041,0.007-0.061,0.01C4.721,15.63,4.74,15.614,4.758,15.599z" fill="#020202" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="4.5703" x2="15.5801" y1="24.3438" y2="24.3438">
-<stop offset="0" style="stop-color:#454647"/>
-<stop offset="0.4727" style="stop-color:#BDBEC3"/>
-<stop offset="1" style="stop-color:#E4E6EB"/>
+<stop offset="0" style="stop-color:#464646"/>
+<stop offset="0.4727" style="stop-color:#BFC1C1"/>
+<stop offset="1" style="stop-color:#E6E9E8"/>
 </linearGradient>
 <path d="M15.002,28.398c-7.861,0-10.377-7.274-10.4-7.347c-0.104-0.304,0.061-0.633,0.367-0.732  c0.303-0.102,0.631,0.062,0.732,0.364c0.088,0.268,2.289,6.558,9.301,6.558c0.318,0,0.578,0.261,0.578,0.579  C15.58,28.142,15.32,28.398,15.002,28.398L15.002,28.398z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="4.5801" x2="15.5801" y1="24.6323" y2="24.6323">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.7394" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.7394" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M15.002,27.82c-7.535,0-9.852-6.954-9.852-6.954H4.58c0,0.064,0,0.124,0.021,0.186  c0.023,0.072,2.539,7.347,10.4,7.347c0.318,0,0.578-0.257,0.578-0.578H15.002z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.9443" x2="14.9443" y1="15.605" y2="2.9585">
-<stop offset="0" style="stop-color:#39393B"/>
-<stop offset="0.0424" style="stop-color:#808184"/>
-<stop offset="0.3333" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#A6A8AB"/>
+<stop offset="0" style="stop-color:#3A3A3A"/>
+<stop offset="0.0424" style="stop-color:#818283"/>
+<stop offset="0.3333" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#A8A9AA"/>
 </linearGradient>
 <path d="M25.432,14.492L25.432,14.492L25.432,14.492c-0.01-8.527-4.396-12.747-10.43-12.747  S4.58,5.965,4.572,14.492l0,0l0,0c0,0.006,0-0.005,0-0.005v0.005l-0.193,5.98l1.77-0.114l-0.387-5.834  c0.021-7.47,4.131-11.683,9.182-11.683c5.049,0,9.156,4.212,9.18,11.679l-0.381,5.838l1.768,0.114L25.432,14.492L25.432,14.492  C25.432,14.492,25.432,14.498,25.432,14.492z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="14.9434" x2="14.9434" y1="10.8926" y2="1.3884">
-<stop offset="0" style="stop-color:#9C9DA1"/>
-<stop offset="0.0545" style="stop-color:#9C9DA1"/>
-<stop offset="0.3333" style="stop-color:#88898C"/>
-<stop offset="1" style="stop-color:#E3E6EB"/>
+<stop offset="0" style="stop-color:#9E9FA0"/>
+<stop offset="0.0545" style="stop-color:#9E9FA0"/>
+<stop offset="0.3333" style="stop-color:#898A8B"/>
+<stop offset="1" style="stop-color:#E5E9E7"/>
 </linearGradient>
 <path d="M25.895,14.554h-0.002C25.885,6.026,20.977,1,14.943,1C8.914,1,4.002,6.026,3.992,14.554v0.009  v0.017h0.002l0.578,0.495C4.762,6.837,9.027,1.745,14.943,1.745c5.922,0,10.303,5.084,10.488,13.329l0.461-0.495h0.002l-0.002-0.011  L25.895,14.554z" fill="url(#SVGID_10_)"/>
 <path d="M4.635,13.914c-0.041,0-0.086,0-0.129,0.004c-0.166,0.012-0.332,0.048-0.492,0.101  c-0.008,0.181-0.021,0.351-0.021,0.535v0.009v0.017h0.002l0.086,1.333l0.135-0.009l0.088-0.037c0.092-0.036,0.188-0.062,0.332-0.067  c0.693,0,1.172,1.212,1.311,3.328c0.014,0.191,0.021,0.38,0.023,0.564h0.133l-0.34-5.167c0-0.07,0.01-0.136,0.01-0.205  C5.449,14.052,5.072,13.914,4.635,13.914z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <path d="M5.701,20.684c-0.102-0.303-0.43-0.466-0.732-0.364c-0.307,0.1-0.471,0.429-0.367,0.732  c0.008,0.023,0.289,0.831,0.941,1.904c0.371-0.112,0.682-0.33,0.926-0.663C5.959,21.424,5.727,20.767,5.701,20.684z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(-1.1528 0.0088 -0.0088 1.0194 -260.3646 8.1097)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-229.8506" x2="-229.8506" y1="6.7896" y2="15.8948">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.8303" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.8303" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M2.451,18.632c0.146,2.2,1.32,3.912,2.621,3.826c1.301-0.087,1.596-1.895,1.451-4.094  c-0.143-2.199-0.676-3.955-1.977-3.868S2.307,16.433,2.451,18.632z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -239.0674 0)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="-243.1118" x2="-243.1118" y1="14.311" y2="22.5257">
@@ -112,19 +112,19 @@
 </linearGradient>
 <path d="M2.27,18.649c0.143,2.158,1.172,3.849,2.301,3.772c1.131-0.074,1.371-1.848,1.229-4.004  c-0.143-2.159-0.615-3.885-1.744-3.811C2.928,14.684,2.127,16.491,2.27,18.649z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -239.0674 0)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-242.6147" x2="-242.6147" y1="14.103" y2="22.1363">
-<stop offset="0" style="stop-color:#BDC3C4"/>
-<stop offset="0.3515" style="stop-color:#DDE3E6"/>
-<stop offset="0.6545" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#BFC2C1"/>
+<stop offset="0.3515" style="stop-color:#E0E3E1"/>
+<stop offset="0.6545" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M3.678,14.938c0.625,0.681,0.889,2.033,0.949,3.574c0.053,1.407-0.047,2.636-0.531,3.396  c-0.828-0.358-1.516-1.714-1.625-3.381C2.357,16.833,2.879,15.374,3.678,14.938z" fill="url(#SVGID_13_)"/>
 <path d="M4.055,15.332c0.006,0,0.014,0.002,0.014,0.002c0.158-0.063,0.316-0.101,0.479-0.112  c1.301-0.086,1.834,1.669,1.977,3.867c0.014,0.198,0.021,0.394,0.027,0.586c0.012-0.414,0.002-0.853-0.027-1.311  c-0.143-2.199-0.676-3.955-1.977-3.868c-0.162,0.009-0.32,0.05-0.471,0.113c0,0-0.016-0.002-0.021-0.002  c-1.105,0.072-1.889,1.809-1.789,3.903C2.354,16.754,3.082,15.397,4.055,15.332z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M25.367,13.914c-0.488,0-0.902,0.172-1.25,0.507c0.002,0.033,0.006,0.066,0.006,0.1  l-0.338,5.171h0.246c0.006-0.185,0.014-0.373,0.025-0.564c0.139-2.113,0.615-3.327,1.359-3.327h0.004  c0.092,0.005,0.188,0.03,0.281,0.066l0.086,0.037l0.02,0.002l0.086-1.326h0.002l-0.002-0.011l0.002-0.015h-0.002  c0-0.195-0.016-0.377-0.02-0.569c-0.123-0.034-0.248-0.06-0.379-0.066C25.451,13.914,25.408,13.914,25.367,13.914z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(1.1528 0.0088 0.0088 1.0194 453.5628 8.1097)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-371.4248" x2="-371.4248" y1="8.0117" y2="17.117">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.8303" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.8303" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M27.551,18.632c-0.146,2.2-1.318,3.912-2.619,3.826c-1.303-0.087-1.598-1.895-1.453-4.094  s0.676-3.955,1.979-3.868C26.758,14.583,27.695,16.433,27.551,18.632z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 432.2656 0)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="-406.3081" x2="-406.3081" y1="14.311" y2="22.5257">
@@ -134,11 +134,11 @@
 </linearGradient>
 <path d="M27.732,18.649c-0.143,2.158-1.172,3.849-2.301,3.772c-1.129-0.074-1.373-1.848-1.227-4.004  c0.139-2.159,0.613-3.885,1.742-3.811C27.076,14.684,27.873,16.491,27.732,18.649z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 432.2656 0)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="-405.8105" x2="-405.8105" y1="14.103" y2="22.1363">
-<stop offset="0" style="stop-color:#BDC3C4"/>
-<stop offset="0.3515" style="stop-color:#DDE3E6"/>
-<stop offset="0.6545" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#BFC2C1"/>
+<stop offset="0.3515" style="stop-color:#E0E3E1"/>
+<stop offset="0.6545" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M26.322,14.938c-0.621,0.681-0.889,2.033-0.947,3.574c-0.051,1.407,0.049,2.636,0.531,3.396  c0.83-0.358,1.516-1.714,1.625-3.381C27.643,16.833,27.123,15.374,26.322,14.938z" fill="url(#SVGID_16_)"/>
 <path d="M25.947,15.332l-0.021,0.002c-0.15-0.063-0.307-0.101-0.469-0.112  c-1.303-0.086-1.834,1.669-1.979,3.867c-0.016,0.198-0.021,0.394-0.025,0.586c-0.016-0.414-0.004-0.853,0.025-1.311  c0.145-2.199,0.676-3.955,1.979-3.868c0.162,0.009,0.318,0.05,0.469,0.113l0.021-0.002c1.104,0.072,1.891,1.809,1.789,3.903  C27.648,16.754,26.922,15.397,25.947,15.332z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_car.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_car.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_car.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,29 +3,29 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+<stop offset="0" style="stop-color:#93AC5D"/>
+<stop offset="0.297" style="stop-color:#93AC5D"/>
+<stop offset="0.6667" style="stop-color:#356742"/>
+<stop offset="0.7939" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#447B42"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399  c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514  c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737  c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12  c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B1BE95" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B1BE95" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+<stop offset="0" style="stop-color:#315D3E"/>
+<stop offset="0.5" style="stop-color:#1E3A31"/>
+<stop offset="1" style="stop-color:#2E593D"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31  c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535  c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
@@ -45,8 +45,8 @@
 </linearGradient>
 <path d="M22,22v3c0,0.55,0.563,1,1.25,1h2.5c0.688,0,1.25-0.45,1.25-1v-3h-5z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="4.062" y2="14.94">
-<stop offset="0" stop-color="#F7CC01"/>
-<stop offset="1" stop-color="#FFAB01"/>
+<stop offset="0" stop-color="#AD9A4B"/>
+<stop offset="1" stop-color="#B3914D"/>
 </linearGradient>
 <path d="M27.5,15l-2.5-8c-0.267-1.067-2-3-4-3h-12c-2,0-3.733,1.933-4,3l-2.5,8h25z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="5.545" y2="13.46">
@@ -55,45 +55,45 @@
 </linearGradient>
 <path d="M4.541,13.5l1.891-6.053c0.14-0.549,1.33-1.947,2.568-1.947h12c1.238,0,2.428,1.398,2.545,1.863l1.916,6.137h-20.92z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="2" x2="28" y1="17.5" y2="17.5">
-<stop offset="0" stop-color="#FFC501"/>
-<stop offset="1" stop-color="#FFB701"/>
+<stop offset="0" stop-color="#B39C4D"/>
+<stop offset="1" stop-color="#B3964D"/>
 </linearGradient>
 <path d="M25,12h-20c-1.65,0-3,1.35-3,3v6c0,1.1,0.9,2,2,2h22c1.1,0,2-0.9,2-2v-6c0-1.65-1.35-3-3-3z" fill="url(#SVGID_5_)"/>
 <path d="M7.416,12l1.04,3.383c0.452,1.47,2.004,2.62,3.544,2.62h6c1.535,0,3.092-1.15,3.544-2.617l1.04-3.38h-15.16z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="6" x2="6" y1="18" y2="13">
-<stop offset="0" stop-color="#F0B901"/>
-<stop offset="1" stop-color="#ED7E00"/>
+<stop offset="0" stop-color="#A88E49"/>
+<stop offset="1" stop-color="#A67447"/>
 </linearGradient>
 <path d="M6,18c-1.654,0-3-1.121-3-2.5s1.346-2.5,3-2.5,3,1.121,3,2.5-1.346,2.5-3,2.5z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="6" x2="6" y1="13.83" y2="17.17">
 <stop offset="0" stop-color="#FAFAFA"/>
-<stop offset="1" stop-color="#C8C8D2"/>
+<stop offset="1" stop-color="#CBCFCF"/>
 </linearGradient>
 <ellipse cx="6" cy="15.5" fill="url(#SVGID_7_)" rx="2" ry="1.666"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="24" x2="24" y1="18" y2="13">
-<stop offset="0" stop-color="#F0B901"/>
-<stop offset="1" stop-color="#ED7E00"/>
+<stop offset="0" stop-color="#A88E49"/>
+<stop offset="1" stop-color="#A67447"/>
 </linearGradient>
 <path d="M24,18c-1.654,0-3-1.121-3-2.5s1.346-2.5,3-2.5,3,1.121,3,2.5-1.35,2.5-3,2.5z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="24" x2="24" y1="13.83" y2="17.17">
 <stop offset="0" stop-color="#FAFAFA"/>
-<stop offset="1" stop-color="#C8C8D2"/>
+<stop offset="1" stop-color="#CBCFCF"/>
 </linearGradient>
 <ellipse cx="24" cy="15.5" fill="url(#SVGID_9_)" rx="2" ry="1.666"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="2" x2="28" y1="19.5" y2="19.5">
-<stop offset="0" stop-color="#FF9000"/>
-<stop offset="0.511" stop-color="#FFC501"/>
-<stop offset="1" stop-color="#FF8800"/>
+<stop offset="0" stop-color="#B3864D"/>
+<stop offset="0.511" stop-color="#B39C4D"/>
+<stop offset="1" stop-color="#B3834D"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="1" width="26" x="2" y="19"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="15" x2="15" y1="17" y2="12">
-<stop offset="0" stop-color="#D67900"/>
-<stop offset="1" stop-color="#FFC501"/>
+<stop offset="0" stop-color="#966640"/>
+<stop offset="1" stop-color="#B39C4D"/>
 </linearGradient>
 <path d="M8.461,12l0.951,3.088c0.323,1.05,1.488,1.91,2.588,1.91h6c1.1,0,2.265-0.86,2.588-1.912l0.95-3.09h-13.08z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="15" x2="15" y1="12.06" y2="16.44">
-<stop offset="0" stop-color="#FFE896"/>
-<stop offset="1" stop-color="#FFB701"/>
+<stop offset="0" stop-color="#E0D9B5"/>
+<stop offset="1" stop-color="#B3964D"/>
 </linearGradient>
 <path d="M8.984,12l0.905,2.941c0.261,0.85,1.231,1.56,2.111,1.56h6c0.884,0,1.85-0.714,2.11-1.559l0.91-2.94h-12.04z" fill="url(#SVGID_12_)"/>
 <path d="M23.22,8.01l-0.164-0.523c-0.08-0.288-1.08-1.487-2.06-1.487h-12c-0.965,0-1.99,1.203-2.092,1.596l-0.625,2.003,16.94-1.589z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_duration.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_duration.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_duration.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -43,33 +43,33 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M14.999,30C6.729,30,0,23.271,0,15S6.729,0,14.999,0C23.271,0,30,6.729,30,15S23.271,30,14.999,30L14.999,30  z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="1.1948" y2="28.8709">
-<stop offset="0" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#454B4D"/>
+<stop offset="0" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#47494B"/>
 </linearGradient>
 <path d="M14.999,29C7.281,29,1,22.72,1,15S7.281,1,14.999,1C22.72,1,29,7.28,29,15S22.72,29,14.999,29  L14.999,29z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.5835" y2="28.5506">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.2364" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#697173"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.2364" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#6C6F70"/>
 </linearGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_2__)" r="13.611"/>
-<path d="M15.474,15.476c4.559,0,8.961-0.286,13.127-0.81C28.425,7.305,22.406,1.389,14.999,1.389  c-7.36,0-13.357,5.847-13.6,13.151C5.846,15.143,10.568,15.476,15.474,15.476z" fill="#F1F1F2" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15.474,15.476c4.559,0,8.961-0.286,13.127-0.81C28.425,7.305,22.406,1.389,14.999,1.389  c-7.36,0-13.357,5.847-13.6,13.151C5.846,15.143,10.568,15.476,15.474,15.476z" fill="#F1F2F2" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="1.5186" x2="28.6768" y1="8.2915" y2="8.2915">
-<stop offset="0" style="stop-color:#C0C5C7"/>
-<stop offset="0.2" style="stop-color:#F7FDFF"/>
-<stop offset="0.8" style="stop-color:#F7FDFF"/>
-<stop offset="1" style="stop-color:#CDD3D5"/>
+<stop offset="0" style="stop-color:#C2C5C4"/>
+<stop offset="0.2" style="stop-color:#F9FDFA"/>
+<stop offset="0.8" style="stop-color:#F9FDFA"/>
+<stop offset="1" style="stop-color:#CFD3D1"/>
 </linearGradient>
 <path d="M14.999,1.778c7.453,0,13.503,5.99,13.605,13.416c0.002-0.063,0.007-0.129,0.007-0.194  c0-7.517-6.095-13.611-13.612-13.611C7.482,1.389,1.389,7.483,1.389,15c0,0.065,0.003,0.131,0.005,0.194  C1.498,7.769,7.548,1.778,14.999,1.778z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.999" x2="14.999" y1="27.249" y2="2.9914">
-<stop offset="0" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#454B4D"/>
+<stop offset="0" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#47494B"/>
 </linearGradient>
 <path d="M14.999,27.055C8.352,27.055,2.944,21.648,2.944,15S8.352,2.945,14.999,2.945  c6.648,0,12.056,5.406,12.056,12.055S21.647,27.055,14.999,27.055L14.999,27.055z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15.001" x2="15.001" y1="26.3296" y2="3.0368">
 <stop offset="0" style="stop-color:#FAF9F9"/>
 <stop offset="0.4" style="stop-color:#FAF9F9"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M14.999,26.666C8.566,26.666,3.333,21.432,3.333,15S8.566,3.334,14.999,3.334S26.668,8.568,26.668,15  S21.432,26.666,14.999,26.666L14.999,26.666z" fill="url(#SVGID_5__)"/>
 <path d="M14.999,15.832c3.849,0,7.521-0.322,10.89-0.905C25.848,8.956,20.98,4.111,14.999,4.111  c-5.979,0-10.846,4.845-10.886,10.815C7.479,15.51,11.15,15.832,14.999,15.832z" fill="#FFFFFF" fill-opacity="0.7" stroke-opacity="0.7"/>
@@ -85,23 +85,23 @@
 <rect fill="#404041" height="1.882" transform="matrix(0.8678 -0.497 0.497 0.8678 -9.1555 13.0056)" width="0.627" x="19.548" y="22.766"/>
 <rect fill="#404041" height="1.884" transform="matrix(0.497 -0.8678 0.8678 0.497 -5.7368 10.9541)" width="0.627" x="6.267" y="9.483"/>
 <rect fill="#404041" height="1.882" transform="matrix(0.4991 -0.8665 0.8665 0.4991 -5.7273 30.3844)" width="0.63" x="23.105" y="19.206"/>
-<path d="M15.953,15.552c-0.04-0.188-0.133-0.352-0.261-0.482l1.34-4.418l-1.117-0.34l-1.392,4.587  c-0.24,0.138-0.42,0.372-0.475,0.653h-2.55v0.389h2.55c0.009,0.05,0.024,0.101,0.043,0.148L8.091,22.09l0.505,0.506l5.978-5.979  c0.129,0.063,0.273,0.102,0.427,0.102c0.471,0,0.862-0.333,0.953-0.777h9.158v-0.389H15.953z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M15.953,15.552c-0.04-0.188-0.133-0.352-0.261-0.482l1.34-4.418l-1.117-0.34l-1.392,4.587  c-0.24,0.138-0.42,0.372-0.475,0.653h-2.55v0.389h2.55c0.009,0.05,0.024,0.101,0.043,0.148L8.091,22.09l0.505,0.506l5.978-5.979  c0.129,0.063,0.273,0.102,0.427,0.102c0.471,0,0.862-0.333,0.953-0.777h9.158v-0.389H15.953z" fill="#222021" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(0.9569 0.2903 -0.2903 0.9569 409.6663 189.0642)" gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="-428.2788" x2="-428.2788" y1="-57.4336" y2="-51.435">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<stop offset="0" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#222021"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6__)" points="17.032,10.101 15.915,9.763 14.22,15.344 15.339,15.684 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="8.3799" x2="15.2201" y1="21.7544" y2="14.9142">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<stop offset="0" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#222021"/>
 </linearGradient>
 <polygon fill="url(#SVGID_7_)" points="15.479,15.16 14.974,14.655 8.091,21.539 8.596,22.044 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="18.3057" x2="18.3057" y1="14.9443" y2="15.5124">
-<stop offset="0" style="stop-color:#FF0000"/>
-<stop offset="1" style="stop-color:#A8000B"/>
+<stop offset="0" style="stop-color:#B34D4D"/>
+<stop offset="1" style="stop-color:#763242"/>
 </linearGradient>
 <path d="M25.111,15h-9.158c-0.091-0.442-0.482-0.778-0.953-0.778S14.138,14.558,14.049,15h-2.55v0.389h2.55  c0.089,0.443,0.48,0.778,0.951,0.778s0.862-0.335,0.953-0.778h9.158V15z" fill="url(#SVGID_8_)"/>
-<circle cx="15" cy="15.194" fill="#F99792" r="0.583"/>
+<circle cx="15" cy="15.194" fill="#DABEB1" r="0.583"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,29 +3,29 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+<stop offset="0" style="stop-color:#93AC5D"/>
+<stop offset="0.297" style="stop-color:#93AC5D"/>
+<stop offset="0.6667" style="stop-color:#356742"/>
+<stop offset="0.7939" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#447B42"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399  c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514  c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737  c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12  c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B1BE95" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B1BE95" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+<stop offset="0" style="stop-color:#315D3E"/>
+<stop offset="0.5" style="stop-color:#1E3A31"/>
+<stop offset="1" style="stop-color:#2E593D"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31  c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535  c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
@@ -34,9 +34,9 @@
 <polygon fill="none" points="0,11.605 0,11.61 0,22.205 0,22.21 0,30 30,30 30,0 0,0 "/>
 <path d="M4.541,29.085v-2.15c-0.734-0.043-1.318-0.653-1.318-1.397v-0.819  H2.514C1.128,24.718,0,23.591,0,22.205V11.61c0-1.387,1.128-2.515,2.514-2.515h0.703V8.334h0.006v-1.58  c0-0.744,0.584-1.354,1.318-1.397V0.915H25.46v4.441c0.734,0.043,1.318,0.653,1.318,1.397v1.58l0.005,0.762h0.704  c1.386,0,2.513,1.128,2.513,2.515v10.595c0,1.386-1.127,2.513-2.513,2.513h-0.709v0.819c0,0.744-0.584,1.354-1.318,1.397v2.15H4.541  z" fill-opacity="0.35" fill-rule="evenodd" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.0005" x2="15.0005" y1="6.3018" y2="10.8418">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.3273" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.3273" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M25.778,10.497c0,0.22-0.179,0.397-0.399,0.397H4.622c-0.22,0-0.399-0.178-0.399-0.397V6.754  c0-0.221,0.179-0.399,0.399-0.399h20.756c0.221,0,0.399,0.179,0.399,0.399V10.497z" fill="url(#SVGID_1__)"/>
 <rect fill="#020202" fill-opacity="0.3" height="0.38" stroke-opacity="0.3" width="21.567" x="4.217" y="9.712"/>
@@ -68,32 +68,32 @@
 </linearGradient>
 <path d="M12.572,1.916c0,0,6.867,0.059,9.42,3.56  c0,0,1.83-2.256,2.467-0.229C24.188,3.855,21.738,1.864,12.572,1.916z" fill="url(#SVGID_4__)" fill-rule="evenodd"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="9.9375" y2="23.5596">
-<stop offset="0" style="stop-color:#BDC3C4"/>
-<stop offset="0.3515" style="stop-color:#DDE3E6"/>
-<stop offset="0.6545" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#BFC2C1"/>
+<stop offset="0.3515" style="stop-color:#E0E3E1"/>
+<stop offset="0.6545" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M29,22.205c0,0.835-0.677,1.513-1.513,1.513H2.514C1.678,23.718,1,23.04,1,22.205V11.61  c0-0.835,0.678-1.515,1.514-1.515h24.973c0.836,0,1.513,0.68,1.513,1.515V22.205z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.0005" x2="15.0005" y1="26.0552" y2="23.3401">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.3273" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.3273" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M4.223,23.718v1.819c0,0.221,0.179,0.399,0.399,0.399h20.756c0.221,0,0.399-0.179,0.399-0.399v-1.819  H4.223z" fill="url(#SVGID_6_)"/>
 <rect fill="#020202" fill-opacity="0.3" height="0.377" stroke-opacity="0.3" width="21.551" x="4.226" y="23.729"/>
 <rect fill="#020202" fill-opacity="0.15" height="0.379" stroke-opacity="0.15" width="21.551" x="4.226" y="24.105"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15" x2="15" y1="9.9375" y2="23.5596">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M27.487,10.096H2.514C1.678,10.096,1,10.775,1,11.61v10.595c0,0.835,0.678,1.513,1.514,1.513  c-0.626,0-1.135-0.51-1.135-1.135v-0.378V11.988V11.61c0-0.626,0.509-1.135,1.135-1.135h24.973c0.626,0,1.135,0.509,1.135,1.135  v0.378v10.217v0.378c0,0.625-0.509,1.135-1.135,1.135c0.836,0,1.513-0.678,1.513-1.513V11.61C29,10.775,28.323,10.096,27.487,10.096  z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="10.4932" x2="10.4932" y1="11.9312" y2="15.3514">
-<stop offset="0" style="stop-color:#686C6E"/>
-<stop offset="1" style="stop-color:#E4EEF2"/>
+<stop offset="0" style="stop-color:#6A6B6C"/>
+<stop offset="1" style="stop-color:#E8EEEA"/>
 </linearGradient>
 <path d="M5.005,15.329c-0.417,0-0.758-0.344-0.758-0.766v-1.874  c0-0.423,0.34-0.766,0.758-0.766h10.978c0.417,0,0.757,0.343,0.757,0.766v1.874c0,0.422-0.34,0.766-0.757,0.766H5.005z" fill="url(#SVGID_8_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="10.4912" x2="10.4912" y1="12.3164" y2="14.996">
@@ -102,163 +102,163 @@
 </linearGradient>
 <path d="M16.356,14.563c0,0.21-0.17,0.383-0.379,0.383H5.005c-0.209,0-0.378-0.173-0.378-0.383v-1.874  c0-0.213,0.169-0.384,0.378-0.384h10.972c0.209,0,0.379,0.171,0.379,0.384V14.563z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="10.4912" x2="10.4912" y1="9.2769" y2="15.8769">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#30A4D5"/>
-<stop offset="0.8727" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1C65C3"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#6292A3"/>
+<stop offset="0.8727" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#4E6591"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="1.874" width="10.972" x="5.005" y="12.689"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="10.4912" x2="10.4912" y1="10.1255" y2="15.6464">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#4FADD5"/>
-<stop offset="0.8727" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1C65C3"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#77A6AD"/>
+<stop offset="0.8727" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#4E6591"/>
 </linearGradient>
 <polygon fill="url(#SVGID_11_)" points="5.005,13.688 15.977,13.419 15.977,12.679 5.005,12.679 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="24.9111" x2="24.9111" y1="11.897" y2="14.1399">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M24.553,14.085c-0.398,0-0.723-0.323-0.723-0.722v-0.717  c0-0.397,0.324-0.723,0.723-0.723h0.717c0.399,0,0.722,0.325,0.722,0.723v0.717c0,0.398-0.323,0.722-0.722,0.722H24.553z" fill="url(#SVGID_12_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M25.27,14.085h-0.717c-0.398,0-0.723-0.323-0.723-0.722v0.36c0,0.399,0.324,0.724,0.723,0.724  h0.717c0.399,0,0.722-0.324,0.722-0.724v-0.36C25.992,13.762,25.669,14.085,25.27,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.27,14.085h-0.717c-0.398,0-0.723-0.323-0.723-0.722v0.36c0,0.399,0.324,0.724,0.723,0.724  h0.717c0.399,0,0.722-0.324,0.722-0.724v-0.36C25.992,13.762,25.669,14.085,25.27,14.085z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="24.9111" x2="24.9111" y1="12.2661" y2="13.76">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.631,13.363c0,0.201-0.162,0.36-0.361,0.36h-0.717c-0.2,0-0.362-0.159-0.362-0.36v-0.717  c0-0.201,0.163-0.362,0.362-0.362h0.717c0.199,0,0.361,0.161,0.361,0.362V13.363z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="22.0195" x2="22.0195" y1="11.897" y2="14.1399">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M21.662,14.085c-0.398,0-0.723-0.323-0.723-0.722v-0.717  c0-0.397,0.325-0.723,0.723-0.723h0.716c0.398,0,0.723,0.325,0.723,0.723v0.717c0,0.398-0.325,0.722-0.723,0.722H21.662z" fill="url(#SVGID_14_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M22.378,14.085h-0.716c-0.398,0-0.723-0.323-0.723-0.722v0.36  c0,0.399,0.325,0.724,0.723,0.724h0.716c0.398,0,0.723-0.324,0.723-0.724v-0.36C23.101,13.762,22.776,14.085,22.378,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M22.378,14.085h-0.716c-0.398,0-0.723-0.323-0.723-0.722v0.36  c0,0.399,0.325,0.724,0.723,0.724h0.716c0.398,0,0.723-0.324,0.723-0.724v-0.36C23.101,13.762,22.776,14.085,22.378,14.085z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.02" x2="22.02" y1="12.2661" y2="13.76">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M22.74,13.363c0,0.201-0.163,0.36-0.362,0.36h-0.716c-0.2,0-0.362-0.159-0.362-0.36v-0.717  c0-0.201,0.162-0.362,0.362-0.362h0.716c0.2,0,0.362,0.161,0.362,0.362V13.363z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="19.1279" x2="19.1279" y1="11.897" y2="14.1399">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M18.77,14.085c-0.399,0-0.723-0.323-0.723-0.722v-0.717  c0-0.397,0.324-0.723,0.723-0.723h0.716c0.399,0,0.723,0.325,0.723,0.723v0.717c0,0.398-0.324,0.722-0.723,0.722H18.77z" fill="url(#SVGID_16_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M19.486,14.085H18.77c-0.399,0-0.723-0.323-0.723-0.722v0.36c0,0.399,0.324,0.724,0.723,0.724  h0.716c0.399,0,0.723-0.324,0.723-0.724v-0.36C20.209,13.762,19.885,14.085,19.486,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M19.486,14.085H18.77c-0.399,0-0.723-0.323-0.723-0.722v0.36c0,0.399,0.324,0.724,0.723,0.724  h0.716c0.399,0,0.723-0.324,0.723-0.724v-0.36C20.209,13.762,19.885,14.085,19.486,14.085z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="19.1279" x2="19.1279" y1="12.2661" y2="13.76">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M19.848,13.363c0,0.201-0.162,0.36-0.362,0.36H18.77c-0.199,0-0.361-0.159-0.361-0.36v-0.717  c0-0.201,0.162-0.362,0.361-0.362h0.716c0.2,0,0.362,0.161,0.362,0.362V13.363z" fill="url(#SVGID_17_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="24.9111" x2="24.9111" y1="14.7876" y2="17.0325">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M24.553,16.978c-0.398,0-0.723-0.324-0.723-0.724v-0.717  c0-0.399,0.324-0.723,0.723-0.723h0.717c0.399,0,0.722,0.323,0.722,0.723v0.717c0,0.399-0.323,0.724-0.722,0.724H24.553z" fill="url(#SVGID_18_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M25.27,16.978h-0.717c-0.398,0-0.723-0.324-0.723-0.724v0.36c0,0.4,0.324,0.724,0.723,0.724  h0.717c0.399,0,0.722-0.323,0.722-0.724v-0.36C25.992,16.653,25.669,16.978,25.27,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.27,16.978h-0.717c-0.398,0-0.723-0.324-0.723-0.724v0.36c0,0.4,0.324,0.724,0.723,0.724  h0.717c0.399,0,0.722-0.323,0.722-0.724v-0.36C25.992,16.653,25.669,16.978,25.27,16.978z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="24.9111" x2="24.9111" y1="15.1587" y2="16.6506">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.631,16.254c0,0.201-0.162,0.36-0.361,0.36h-0.717c-0.2,0-0.362-0.159-0.362-0.36v-0.717  c0-0.199,0.163-0.36,0.362-0.36h0.717c0.199,0,0.361,0.161,0.361,0.36V16.254z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="22.0195" x2="22.0195" y1="14.7876" y2="17.0325">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M21.662,16.978c-0.398,0-0.723-0.324-0.723-0.724v-0.717  c0-0.399,0.325-0.723,0.723-0.723h0.716c0.398,0,0.723,0.323,0.723,0.723v0.717c0,0.399-0.325,0.724-0.723,0.724H21.662z" fill="url(#SVGID_20_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M22.378,16.978h-0.716c-0.398,0-0.723-0.324-0.723-0.724v0.36c0,0.4,0.325,0.724,0.723,0.724  h0.716c0.398,0,0.723-0.323,0.723-0.724v-0.36C23.101,16.653,22.776,16.978,22.378,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M22.378,16.978h-0.716c-0.398,0-0.723-0.324-0.723-0.724v0.36c0,0.4,0.325,0.724,0.723,0.724  h0.716c0.398,0,0.723-0.323,0.723-0.724v-0.36C23.101,16.653,22.776,16.978,22.378,16.978z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="22.02" x2="22.02" y1="15.1587" y2="16.6506">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M22.74,16.254c0,0.201-0.163,0.36-0.362,0.36h-0.716c-0.2,0-0.362-0.159-0.362-0.36v-0.717  c0-0.199,0.162-0.36,0.362-0.36h0.716c0.2,0,0.362,0.161,0.362,0.36V16.254z" fill="url(#SVGID_21_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.1279" x2="19.1279" y1="14.7876" y2="17.0325">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M18.77,16.978c-0.399,0-0.723-0.324-0.723-0.724v-0.717  c0-0.399,0.324-0.723,0.723-0.723h0.716c0.399,0,0.723,0.323,0.723,0.723v0.717c0,0.399-0.324,0.724-0.723,0.724H18.77z" fill="url(#SVGID_22_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M19.486,16.978H18.77c-0.399,0-0.723-0.324-0.723-0.724v0.36c0,0.4,0.324,0.724,0.723,0.724  h0.716c0.399,0,0.723-0.323,0.723-0.724v-0.36C20.209,16.653,19.885,16.978,19.486,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M19.486,16.978H18.77c-0.399,0-0.723-0.324-0.723-0.724v0.36c0,0.4,0.324,0.724,0.723,0.724  h0.716c0.399,0,0.723-0.323,0.723-0.724v-0.36C20.209,16.653,19.885,16.978,19.486,16.978z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.1279" x2="19.1279" y1="15.1587" y2="16.6506">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M19.848,16.254c0,0.201-0.162,0.36-0.362,0.36H18.77c-0.199,0-0.361-0.159-0.361-0.36v-0.717  c0-0.199,0.162-0.36,0.361-0.36h0.716c0.2,0,0.362,0.161,0.362,0.36V16.254z" fill="url(#SVGID_23_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="24.9111" x2="24.9111" y1="17.6792" y2="19.9231">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M24.553,19.868c-0.398,0-0.723-0.322-0.723-0.723V18.43  c0-0.398,0.324-0.724,0.723-0.724h0.717c0.399,0,0.722,0.325,0.722,0.724v0.716c0,0.4-0.323,0.723-0.722,0.723H24.553z" fill="url(#SVGID_24_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M25.27,19.868h-0.717c-0.398,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.324,0.725,0.723,0.725  h0.717c0.399,0,0.722-0.324,0.722-0.725v-0.361C25.992,19.546,25.669,19.868,25.27,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.27,19.868h-0.717c-0.398,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.324,0.725,0.723,0.725  h0.717c0.399,0,0.722-0.324,0.722-0.725v-0.361C25.992,19.546,25.669,19.868,25.27,19.868z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="24.9111" x2="24.9111" y1="18.0513" y2="19.5432">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.631,19.146c0,0.199-0.162,0.361-0.361,0.361h-0.717c-0.2,0-0.362-0.162-0.362-0.361V18.43  c0-0.199,0.163-0.36,0.362-0.36h0.717c0.199,0,0.361,0.161,0.361,0.36V19.146z" fill="url(#SVGID_25_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="22.0195" x2="22.0195" y1="17.6792" y2="19.9231">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M21.662,19.868c-0.398,0-0.723-0.322-0.723-0.723V18.43  c0-0.398,0.325-0.724,0.723-0.724h0.716c0.398,0,0.723,0.325,0.723,0.724v0.716c0,0.4-0.325,0.723-0.723,0.723H21.662z" fill="url(#SVGID_26_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M22.378,19.868h-0.716c-0.398,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.325,0.725,0.723,0.725  h0.716c0.398,0,0.723-0.324,0.723-0.725v-0.361C23.101,19.546,22.776,19.868,22.378,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M22.378,19.868h-0.716c-0.398,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.325,0.725,0.723,0.725  h0.716c0.398,0,0.723-0.324,0.723-0.725v-0.361C23.101,19.546,22.776,19.868,22.378,19.868z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="22.02" x2="22.02" y1="18.0513" y2="19.5432">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M22.74,19.146c0,0.199-0.163,0.361-0.362,0.361h-0.716c-0.2,0-0.362-0.162-0.362-0.361V18.43  c0-0.199,0.162-0.36,0.362-0.36h0.716c0.2,0,0.362,0.161,0.362,0.36V19.146z" fill="url(#SVGID_27_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="19.1279" x2="19.1279" y1="17.6792" y2="19.9231">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M18.77,19.868c-0.399,0-0.723-0.322-0.723-0.723V18.43  c0-0.398,0.324-0.724,0.723-0.724h0.716c0.399,0,0.723,0.325,0.723,0.724v0.716c0,0.4-0.324,0.723-0.723,0.723H18.77z" fill="url(#SVGID_28_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M19.486,19.868H18.77c-0.399,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.324,0.725,0.723,0.725  h0.716c0.399,0,0.723-0.324,0.723-0.725v-0.361C20.209,19.546,19.885,19.868,19.486,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M19.486,19.868H18.77c-0.399,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.324,0.725,0.723,0.725  h0.716c0.399,0,0.723-0.324,0.723-0.725v-0.361C20.209,19.546,19.885,19.868,19.486,19.868z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="19.1279" x2="19.1279" y1="18.0513" y2="19.5432">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M19.848,19.146c0,0.199-0.162,0.361-0.362,0.361H18.77c-0.199,0-0.361-0.162-0.361-0.361V18.43  c0-0.199,0.162-0.36,0.361-0.36h0.716c0.2,0,0.362,0.161,0.362,0.36V19.146z" fill="url(#SVGID_29_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 -1 -7634.4854 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="-7649.4858" x2="-7649.4858" y1="1924.5239" y2="1930.8613">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_home.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,29 +3,29 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+<stop offset="0" style="stop-color:#93AC5D"/>
+<stop offset="0.297" style="stop-color:#93AC5D"/>
+<stop offset="0.6667" style="stop-color:#356742"/>
+<stop offset="0.7939" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#447B42"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399  c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514  c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737  c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12  c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B1BE95" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B1BE95" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+<stop offset="0" style="stop-color:#315D3E"/>
+<stop offset="0.5" style="stop-color:#1E3A31"/>
+<stop offset="1" style="stop-color:#2E593D"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31  c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535  c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
@@ -33,9 +33,9 @@
 <g transform="matrix(1 0 0 1 30 30)">
 <path d="M21.5,30c-1.331,0-2.65-0.315-3.834-0.915H4.541v-2.15c-0.734-0.043-1.318-0.653-1.318-1.398v-0.818H2.514  C1.127,24.718,0,23.591,0,22.205V11.61c0-1.387,1.127-2.515,2.514-2.515h0.703V8.334h0.006V6.753c0-0.744,0.584-1.354,1.318-1.396  V0.915h20.918v4.441c0.734,0.043,1.318,0.652,1.318,1.396v1.581l0.006,0.762h0.703c1.386,0,2.514,1.128,2.514,2.515v10.595  c0,0.297-0.052,0.588-0.154,0.864C29.092,27.092,25.598,30,21.5,30L21.5,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.9995" x2="14.9995" y1="6.3018" y2="10.8418">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.3273" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.3273" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M25.777,10.497c0,0.22-0.179,0.397-0.399,0.397H4.621c-0.22,0-0.398-0.178-0.398-0.397V6.753  c0-0.221,0.179-0.398,0.398-0.398h20.757c0.221,0,0.399,0.178,0.399,0.398V10.497z" fill="url(#SVGID_1__)"/>
 <rect fill="#020202" fill-opacity="0.3" height="0.379" stroke-opacity="0.3" width="21.567" x="4.217" y="9.712"/>
@@ -67,32 +67,32 @@
 </linearGradient>
 <path d="M12.571,1.916c0,0,6.867,0.06,9.421,3.56  c0,0,1.83-2.256,2.467-0.229C24.188,3.855,21.737,1.864,12.571,1.916z" fill="url(#SVGID_4__)" fill-rule="evenodd"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="9.9375" y2="23.5601">
-<stop offset="0" style="stop-color:#BDC3C4"/>
-<stop offset="0.3515" style="stop-color:#DDE3E6"/>
-<stop offset="0.6545" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#BFC2C1"/>
+<stop offset="0.3515" style="stop-color:#E0E3E1"/>
+<stop offset="0.6545" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M29,22.205c0,0.835-0.678,1.513-1.514,1.513H2.514C1.678,23.718,1,23.04,1,22.205V11.61  c0-0.836,0.678-1.515,1.514-1.515h24.973c0.836,0,1.514,0.679,1.514,1.515V22.205z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.0005" x2="15.0005" y1="26.0557" y2="23.3406">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.3273" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.3273" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M4.223,23.718v1.818c0,0.221,0.179,0.4,0.398,0.4h20.757c0.221,0,0.399-0.18,0.399-0.4v-1.818H4.223z  " fill="url(#SVGID_6_)"/>
 <rect fill="#020202" fill-opacity="0.3" height="0.377" stroke-opacity="0.3" width="21.552" x="4.225" y="23.729"/>
 <rect fill="#020202" fill-opacity="0.15" height="0.379" stroke-opacity="0.15" width="21.552" x="4.225" y="24.105"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9995" x2="14.9995" y1="9.9375" y2="23.5601">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M27.486,10.096H2.514C1.678,10.096,1,10.774,1,11.61v10.595c0,0.835,0.678,1.513,1.514,1.513  c-0.626,0-1.135-0.51-1.135-1.136v-0.377V11.988V11.61c0-0.626,0.509-1.135,1.135-1.135h24.973c0.626,0,1.135,0.509,1.135,1.135  v0.378v10.217v0.377c0,0.626-0.509,1.136-1.135,1.136c0.836,0,1.514-0.678,1.514-1.513V11.61C29,10.774,28.322,10.096,27.486,10.096  z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="10.4917" x2="10.4917" y1="11.9312" y2="15.3514">
-<stop offset="0" style="stop-color:#686C6E"/>
-<stop offset="1" style="stop-color:#E4EEF2"/>
+<stop offset="0" style="stop-color:#6A6B6C"/>
+<stop offset="1" style="stop-color:#E8EEEA"/>
 </linearGradient>
 <path d="M5.004,15.329c-0.418,0-0.758-0.345-0.758-0.766V12.69c0-0.424,0.34-0.767,0.758-0.767  h10.979c0.416,0,0.756,0.343,0.756,0.767v1.873c0,0.421-0.34,0.766-0.756,0.766H5.004z" fill="url(#SVGID_8_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="10.4897" x2="10.4897" y1="12.3164" y2="14.996">
@@ -101,163 +101,163 @@
 </linearGradient>
 <path d="M16.355,14.563c0,0.21-0.17,0.383-0.379,0.383H5.004c-0.209,0-0.379-0.173-0.379-0.383V12.69  c0-0.214,0.17-0.385,0.379-0.385h10.973c0.209,0,0.379,0.171,0.379,0.385V14.563z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="10.4902" x2="10.4902" y1="9.2793" y2="15.8759">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#30A4D5"/>
-<stop offset="0.8727" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1C65C3"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#6292A3"/>
+<stop offset="0.8727" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#4E6591"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="1.873" width="10.973" x="5.004" y="12.69"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="10.4902" x2="10.4902" y1="10.1255" y2="15.6464">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#4FADD5"/>
-<stop offset="0.8727" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1C65C3"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#77A6AD"/>
+<stop offset="0.8727" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#4E6591"/>
 </linearGradient>
 <polygon fill="url(#SVGID_11_)" points="5.004,13.688 15.977,13.419 15.977,12.679 5.004,12.679 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="24.9111" x2="24.9111" y1="11.897" y2="14.1399">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M24.553,14.085c-0.398,0-0.723-0.323-0.723-0.722v-0.717  c0-0.398,0.324-0.723,0.723-0.723h0.717c0.398,0,0.723,0.324,0.723,0.723v0.717c0,0.398-0.324,0.722-0.723,0.722H24.553z" fill="url(#SVGID_12_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M25.27,14.085h-0.717c-0.398,0-0.723-0.323-0.723-0.722v0.36c0,0.399,0.324,0.724,0.723,0.724  h0.717c0.398,0,0.723-0.324,0.723-0.724v-0.36C25.992,13.762,25.668,14.085,25.27,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.27,14.085h-0.717c-0.398,0-0.723-0.323-0.723-0.722v0.36c0,0.399,0.324,0.724,0.723,0.724  h0.717c0.398,0,0.723-0.324,0.723-0.724v-0.36C25.992,13.762,25.668,14.085,25.27,14.085z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="24.9102" x2="24.9102" y1="12.2661" y2="13.76">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.631,13.363c0,0.2-0.162,0.36-0.361,0.36h-0.717c-0.199,0-0.362-0.16-0.362-0.36v-0.717  c0-0.2,0.163-0.362,0.362-0.362h0.717c0.199,0,0.361,0.162,0.361,0.362V13.363z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="22.0195" x2="22.0195" y1="11.897" y2="14.1399">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M21.661,14.085c-0.398,0-0.724-0.323-0.724-0.722v-0.717  c0-0.398,0.325-0.723,0.724-0.723h0.716c0.398,0,0.724,0.324,0.724,0.723v0.717c0,0.398-0.325,0.722-0.724,0.722H21.661z" fill="url(#SVGID_14_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M22.377,14.085h-0.716c-0.398,0-0.724-0.323-0.724-0.722v0.36  c0,0.399,0.325,0.724,0.724,0.724h0.716c0.398,0,0.724-0.324,0.724-0.724v-0.36C23.101,13.762,22.775,14.085,22.377,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M22.377,14.085h-0.716c-0.398,0-0.724-0.323-0.724-0.722v0.36  c0,0.399,0.325,0.724,0.724,0.724h0.716c0.398,0,0.724-0.324,0.724-0.724v-0.36C23.101,13.762,22.775,14.085,22.377,14.085z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.0195" x2="22.0195" y1="12.2661" y2="13.76">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M22.74,13.363c0,0.2-0.163,0.36-0.363,0.36h-0.716c-0.2,0-0.362-0.16-0.362-0.36v-0.717  c0-0.2,0.162-0.362,0.362-0.362h0.716c0.2,0,0.363,0.162,0.363,0.362V13.363z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="19.127" x2="19.127" y1="11.897" y2="14.1399">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M18.77,14.085c-0.398,0-0.724-0.323-0.724-0.722v-0.717  c0-0.398,0.325-0.723,0.724-0.723h0.716c0.398,0,0.724,0.324,0.724,0.723v0.717c0,0.398-0.325,0.722-0.724,0.722H18.77z" fill="url(#SVGID_16_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M19.485,14.085H18.77c-0.398,0-0.724-0.323-0.724-0.722v0.36c0,0.399,0.325,0.724,0.724,0.724  h0.716c0.398,0,0.724-0.324,0.724-0.724v-0.36C20.209,13.762,19.884,14.085,19.485,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M19.485,14.085H18.77c-0.398,0-0.724-0.323-0.724-0.722v0.36c0,0.399,0.325,0.724,0.724,0.724  h0.716c0.398,0,0.724-0.324,0.724-0.724v-0.36C20.209,13.762,19.884,14.085,19.485,14.085z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="19.1279" x2="19.1279" y1="12.2661" y2="13.76">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M19.848,13.363c0,0.2-0.162,0.36-0.362,0.36H18.77c-0.199,0-0.361-0.16-0.361-0.36v-0.717  c0-0.2,0.162-0.362,0.361-0.362h0.716c0.2,0,0.362,0.162,0.362,0.362V13.363z" fill="url(#SVGID_17_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="24.9111" x2="24.9111" y1="14.7866" y2="17.0331">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M24.553,16.978c-0.398,0-0.723-0.325-0.723-0.724v-0.717  c0-0.399,0.324-0.724,0.723-0.724h0.717c0.398,0,0.723,0.324,0.723,0.724v0.717c0,0.398-0.324,0.724-0.723,0.724H24.553z" fill="url(#SVGID_18_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M25.27,16.978h-0.717c-0.398,0-0.723-0.325-0.723-0.724v0.36c0,0.4,0.324,0.724,0.723,0.724  h0.717c0.398,0,0.723-0.323,0.723-0.724v-0.36C25.992,16.652,25.668,16.978,25.27,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.27,16.978h-0.717c-0.398,0-0.723-0.325-0.723-0.724v0.36c0,0.4,0.324,0.724,0.723,0.724  h0.717c0.398,0,0.723-0.323,0.723-0.724v-0.36C25.992,16.652,25.668,16.978,25.27,16.978z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="24.9102" x2="24.9102" y1="15.1587" y2="16.6511">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.631,16.254c0,0.201-0.162,0.36-0.361,0.36h-0.717c-0.199,0-0.362-0.159-0.362-0.36v-0.717  c0-0.199,0.163-0.36,0.362-0.36h0.717c0.199,0,0.361,0.161,0.361,0.36V16.254z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="22.0195" x2="22.0195" y1="14.7866" y2="17.0331">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M21.661,16.978c-0.398,0-0.724-0.325-0.724-0.724v-0.717  c0-0.399,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.324,0.724,0.724v0.717c0,0.398-0.325,0.724-0.724,0.724H21.661z" fill="url(#SVGID_20_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M22.377,16.978h-0.716c-0.398,0-0.724-0.325-0.724-0.724v0.36c0,0.4,0.325,0.724,0.724,0.724  h0.716c0.398,0,0.724-0.323,0.724-0.724v-0.36C23.101,16.652,22.775,16.978,22.377,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M22.377,16.978h-0.716c-0.398,0-0.724-0.325-0.724-0.724v0.36c0,0.4,0.325,0.724,0.724,0.724  h0.716c0.398,0,0.724-0.323,0.724-0.724v-0.36C23.101,16.652,22.775,16.978,22.377,16.978z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="22.0195" x2="22.0195" y1="15.1587" y2="16.6511">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M22.74,16.254c0,0.201-0.163,0.36-0.363,0.36h-0.716c-0.2,0-0.362-0.159-0.362-0.36v-0.717  c0-0.199,0.162-0.36,0.362-0.36h0.716c0.2,0,0.363,0.161,0.363,0.36V16.254z" fill="url(#SVGID_21_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.127" x2="19.127" y1="14.7866" y2="17.0331">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M18.77,16.978c-0.398,0-0.724-0.325-0.724-0.724v-0.717  c0-0.399,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.324,0.724,0.724v0.717c0,0.398-0.325,0.724-0.724,0.724H18.77z" fill="url(#SVGID_22_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M19.485,16.978H18.77c-0.398,0-0.724-0.325-0.724-0.724v0.36c0,0.4,0.325,0.724,0.724,0.724  h0.716c0.398,0,0.724-0.323,0.724-0.724v-0.36C20.209,16.652,19.884,16.978,19.485,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M19.485,16.978H18.77c-0.398,0-0.724-0.325-0.724-0.724v0.36c0,0.4,0.325,0.724,0.724,0.724  h0.716c0.398,0,0.724-0.323,0.724-0.724v-0.36C20.209,16.652,19.884,16.978,19.485,16.978z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.1279" x2="19.1279" y1="15.1587" y2="16.6511">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M19.848,16.254c0,0.201-0.162,0.36-0.362,0.36H18.77c-0.199,0-0.361-0.159-0.361-0.36v-0.717  c0-0.199,0.162-0.36,0.361-0.36h0.716c0.2,0,0.362,0.161,0.362,0.36V16.254z" fill="url(#SVGID_23_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="24.9111" x2="24.9111" y1="17.6797" y2="19.9236">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M24.553,19.868c-0.398,0-0.723-0.322-0.723-0.723V18.43  c0-0.398,0.324-0.724,0.723-0.724h0.717c0.398,0,0.723,0.325,0.723,0.724v0.716c0,0.4-0.324,0.723-0.723,0.723H24.553z" fill="url(#SVGID_24_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M25.27,19.868h-0.717c-0.398,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.324,0.725,0.723,0.725  h0.717c0.398,0,0.723-0.324,0.723-0.725v-0.361C25.992,19.546,25.668,19.868,25.27,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.27,19.868h-0.717c-0.398,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.324,0.725,0.723,0.725  h0.717c0.398,0,0.723-0.324,0.723-0.725v-0.361C25.992,19.546,25.668,19.868,25.27,19.868z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="24.9102" x2="24.9102" y1="18.0508" y2="19.5437">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.631,19.146c0,0.199-0.162,0.361-0.361,0.361h-0.717c-0.199,0-0.362-0.162-0.362-0.361V18.43  c0-0.199,0.163-0.361,0.362-0.361h0.717c0.199,0,0.361,0.162,0.361,0.361V19.146z" fill="url(#SVGID_25_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="22.0195" x2="22.0195" y1="17.6797" y2="19.9236">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M21.661,19.868c-0.398,0-0.724-0.322-0.724-0.723V18.43  c0-0.398,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.325,0.724,0.724v0.716c0,0.4-0.325,0.723-0.724,0.723H21.661z" fill="url(#SVGID_26_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M22.377,19.868h-0.716c-0.398,0-0.724-0.322-0.724-0.723v0.361c0,0.4,0.325,0.725,0.724,0.725  h0.716c0.398,0,0.724-0.324,0.724-0.725v-0.361C23.101,19.546,22.775,19.868,22.377,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M22.377,19.868h-0.716c-0.398,0-0.724-0.322-0.724-0.723v0.361c0,0.4,0.325,0.725,0.724,0.725  h0.716c0.398,0,0.724-0.324,0.724-0.725v-0.361C23.101,19.546,22.775,19.868,22.377,19.868z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="22.0195" x2="22.0195" y1="18.0508" y2="19.5437">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M22.74,19.146c0,0.199-0.163,0.361-0.363,0.361h-0.716c-0.2,0-0.362-0.162-0.362-0.361V18.43  c0-0.199,0.162-0.361,0.362-0.361h0.716c0.2,0,0.363,0.162,0.363,0.361V19.146z" fill="url(#SVGID_27_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="19.127" x2="19.127" y1="17.6797" y2="19.9236">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M18.77,19.868c-0.398,0-0.724-0.322-0.724-0.723V18.43  c0-0.398,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.325,0.724,0.724v0.716c0,0.4-0.325,0.723-0.724,0.723H18.77z" fill="url(#SVGID_28_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M19.485,19.868H18.77c-0.398,0-0.724-0.322-0.724-0.723v0.361c0,0.4,0.325,0.725,0.724,0.725  h0.716c0.398,0,0.724-0.324,0.724-0.725v-0.361C20.209,19.546,19.884,19.868,19.485,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M19.485,19.868H18.77c-0.398,0-0.724-0.322-0.724-0.723v0.361c0,0.4,0.325,0.725,0.724,0.725  h0.716c0.398,0,0.724-0.324,0.724-0.725v-0.361C20.209,19.546,19.884,19.868,19.485,19.868z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="19.1279" x2="19.1279" y1="18.0508" y2="19.5437">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M19.848,19.146c0,0.199-0.162,0.361-0.362,0.361H18.77c-0.199,0-0.361-0.162-0.361-0.361V18.43  c0-0.199,0.162-0.361,0.361-0.361h0.716c0.2,0,0.362,0.162,0.362,0.361V19.146z" fill="url(#SVGID_29_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 -1 -7790.2559 1179.5723)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="-7805.2559" x2="-7805.2559" y1="1151.4873" y2="1157.8247">
@@ -292,17 +292,17 @@
 <path d="M17.429,28.084c0,0-6.867-0.06-9.421-3.56  c0,0-1.83,2.256-2.467,0.229C5.813,26.145,8.262,28.136,17.429,28.084z" fill="url(#SVGID_33_)" fill-rule="evenodd"/>
 <rect fill="none" height="30" width="30"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -224.75 -299.25)" gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="492.5" x2="492.5" y1="-626.4292" y2="-656.4292">
-<stop offset="0" style="stop-color:#FFE1A3"/>
-<stop offset="0.297" style="stop-color:#FFE1A3"/>
-<stop offset="0.6667" style="stop-color:#AD4C01"/>
-<stop offset="1" style="stop-color:#FFE1A3"/>
+<stop offset="0" style="stop-color:#E3DBBF"/>
+<stop offset="0.297" style="stop-color:#E3DBBF"/>
+<stop offset="0.6667" style="stop-color:#794335"/>
+<stop offset="1" style="stop-color:#E3DBBF"/>
 </linearGradient>
 <path d="M21.5,29c-4.137,0-7.5-3.363-7.5-7.5c0-4.135,3.363-7.5,7.5-7.5c4.135,0,7.5,3.365,7.5,7.5  C29,25.637,25.635,29,21.5,29L21.5,29z" fill="url(#SVGID_34_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35_" x1="21.5" x2="21.5" y1="14.4858" y2="28.3326">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="0.297" style="stop-color:#FFC144"/>
-<stop offset="0.6667" style="stop-color:#EF6902"/>
-<stop offset="1" style="stop-color:#FEB037"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="0.297" style="stop-color:#C7B17C"/>
+<stop offset="0.6667" style="stop-color:#A86F49"/>
+<stop offset="1" style="stop-color:#C2A673"/>
 </linearGradient>
 <path d="M28.5,21.5c0,3.866-3.136,7-7,7c-3.867,0-7-3.134-7-7c0-3.864,3.133-7,7-7  C25.364,14.5,28.5,17.636,28.5,21.5z" fill="url(#SVGID_35_)"/>
 <polygon fill-opacity="0.3" points="25.703,22.889 21.498,18.435 17.297,22.889 16.658,22.209 21.498,17.077 26.342,22.209   25.703,22.889 " stroke-opacity="0.3"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_work.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_work.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_work.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,29 +3,29 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+<stop offset="0" style="stop-color:#93AC5D"/>
+<stop offset="0.297" style="stop-color:#93AC5D"/>
+<stop offset="0.6667" style="stop-color:#356742"/>
+<stop offset="0.7939" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#447B42"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399  c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514  c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737  c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12  c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B1BE95" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B1BE95" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+<stop offset="0" style="stop-color:#315D3E"/>
+<stop offset="0.5" style="stop-color:#1E3A31"/>
+<stop offset="1" style="stop-color:#2E593D"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31  c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535  c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
@@ -33,9 +33,9 @@
 <g transform="matrix(1 0 0 1 30 30)">
 <path d="M21.5,30c-1.331,0-2.65-0.315-3.834-0.915H4.541v-2.15c-0.734-0.043-1.318-0.653-1.318-1.398v-0.818H2.514  C1.127,24.718,0,23.591,0,22.205V11.61c0-1.387,1.127-2.515,2.514-2.515h0.703V8.334h0.006V6.753c0-0.744,0.584-1.354,1.318-1.396  V0.915h20.918v4.441c0.734,0.043,1.318,0.652,1.318,1.396v1.581l0.006,0.762h0.703c1.386,0,2.514,1.128,2.514,2.515v10.595  c0,0.297-0.052,0.588-0.154,0.864C29.092,27.092,25.598,30,21.5,30L21.5,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.9995" x2="14.9995" y1="6.3018" y2="10.8418">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.3273" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.3273" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M25.777,10.497c0,0.22-0.179,0.397-0.399,0.397H4.621c-0.22,0-0.398-0.178-0.398-0.397V6.753  c0-0.221,0.179-0.398,0.398-0.398h20.757c0.221,0,0.399,0.178,0.399,0.398V10.497z" fill="url(#SVGID_1__)"/>
 <rect fill="#020202" fill-opacity="0.3" height="0.379" stroke-opacity="0.3" width="21.567" x="4.217" y="9.712"/>
@@ -67,32 +67,32 @@
 </linearGradient>
 <path d="M12.571,1.916c0,0,6.867,0.06,9.421,3.56  c0,0,1.83-2.256,2.467-0.229C24.188,3.855,21.737,1.864,12.571,1.916z" fill="url(#SVGID_4__)" fill-rule="evenodd"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="9.9375" y2="23.5601">
-<stop offset="0" style="stop-color:#BDC3C4"/>
-<stop offset="0.3515" style="stop-color:#DDE3E6"/>
-<stop offset="0.6545" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#BFC2C1"/>
+<stop offset="0.3515" style="stop-color:#E0E3E1"/>
+<stop offset="0.6545" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M29,22.205c0,0.835-0.678,1.513-1.514,1.513H2.514C1.678,23.718,1,23.04,1,22.205V11.61  c0-0.836,0.678-1.515,1.514-1.515h24.973c0.836,0,1.514,0.679,1.514,1.515V22.205z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.0005" x2="15.0005" y1="26.0557" y2="23.3406">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.3273" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.3273" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M4.223,23.718v1.818c0,0.221,0.179,0.4,0.398,0.4h20.757c0.221,0,0.399-0.18,0.399-0.4v-1.818H4.223z  " fill="url(#SVGID_6_)"/>
 <rect fill="#020202" fill-opacity="0.3" height="0.377" stroke-opacity="0.3" width="21.552" x="4.225" y="23.729"/>
 <rect fill="#020202" fill-opacity="0.15" height="0.379" stroke-opacity="0.15" width="21.552" x="4.225" y="24.105"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9995" x2="14.9995" y1="9.9375" y2="23.5601">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M27.486,10.096H2.514C1.678,10.096,1,10.774,1,11.61v10.595c0,0.835,0.678,1.513,1.514,1.513  c-0.626,0-1.135-0.51-1.135-1.136v-0.377V11.988V11.61c0-0.626,0.509-1.135,1.135-1.135h24.973c0.626,0,1.135,0.509,1.135,1.135  v0.378v10.217v0.377c0,0.626-0.509,1.136-1.135,1.136c0.836,0,1.514-0.678,1.514-1.513V11.61C29,10.774,28.322,10.096,27.486,10.096  z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="10.4917" x2="10.4917" y1="11.9312" y2="15.3514">
-<stop offset="0" style="stop-color:#686C6E"/>
-<stop offset="1" style="stop-color:#E4EEF2"/>
+<stop offset="0" style="stop-color:#6A6B6C"/>
+<stop offset="1" style="stop-color:#E8EEEA"/>
 </linearGradient>
 <path d="M5.004,15.329c-0.418,0-0.758-0.345-0.758-0.766V12.69c0-0.424,0.34-0.767,0.758-0.767  h10.979c0.416,0,0.756,0.343,0.756,0.767v1.873c0,0.421-0.34,0.766-0.756,0.766H5.004z" fill="url(#SVGID_8_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="10.4897" x2="10.4897" y1="12.3164" y2="14.996">
@@ -101,163 +101,163 @@
 </linearGradient>
 <path d="M16.355,14.563c0,0.21-0.17,0.383-0.379,0.383H5.004c-0.209,0-0.379-0.173-0.379-0.383V12.69  c0-0.214,0.17-0.385,0.379-0.385h10.973c0.209,0,0.379,0.171,0.379,0.385V14.563z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="10.4902" x2="10.4902" y1="9.2793" y2="15.8759">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#30A4D5"/>
-<stop offset="0.8727" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1C65C3"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#6292A3"/>
+<stop offset="0.8727" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#4E6591"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="1.873" width="10.973" x="5.004" y="12.69"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="10.4902" x2="10.4902" y1="10.1255" y2="15.6464">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#4FADD5"/>
-<stop offset="0.8727" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1C65C3"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#77A6AD"/>
+<stop offset="0.8727" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#4E6591"/>
 </linearGradient>
 <polygon fill="url(#SVGID_11_)" points="5.004,13.688 15.977,13.419 15.977,12.679 5.004,12.679 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="24.9111" x2="24.9111" y1="11.897" y2="14.1399">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M24.553,14.085c-0.398,0-0.723-0.323-0.723-0.722v-0.717  c0-0.398,0.324-0.723,0.723-0.723h0.717c0.398,0,0.723,0.324,0.723,0.723v0.717c0,0.398-0.324,0.722-0.723,0.722H24.553z" fill="url(#SVGID_12_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M25.27,14.085h-0.717c-0.398,0-0.723-0.323-0.723-0.722v0.36c0,0.399,0.324,0.724,0.723,0.724  h0.717c0.398,0,0.723-0.324,0.723-0.724v-0.36C25.992,13.762,25.668,14.085,25.27,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.27,14.085h-0.717c-0.398,0-0.723-0.323-0.723-0.722v0.36c0,0.399,0.324,0.724,0.723,0.724  h0.717c0.398,0,0.723-0.324,0.723-0.724v-0.36C25.992,13.762,25.668,14.085,25.27,14.085z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="24.9102" x2="24.9102" y1="12.2661" y2="13.76">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.631,13.363c0,0.2-0.162,0.36-0.361,0.36h-0.717c-0.199,0-0.362-0.16-0.362-0.36v-0.717  c0-0.2,0.163-0.362,0.362-0.362h0.717c0.199,0,0.361,0.162,0.361,0.362V13.363z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="22.0195" x2="22.0195" y1="11.897" y2="14.1399">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M21.661,14.085c-0.398,0-0.724-0.323-0.724-0.722v-0.717  c0-0.398,0.325-0.723,0.724-0.723h0.716c0.398,0,0.724,0.324,0.724,0.723v0.717c0,0.398-0.325,0.722-0.724,0.722H21.661z" fill="url(#SVGID_14_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M22.377,14.085h-0.716c-0.398,0-0.724-0.323-0.724-0.722v0.36  c0,0.399,0.325,0.724,0.724,0.724h0.716c0.398,0,0.724-0.324,0.724-0.724v-0.36C23.101,13.762,22.775,14.085,22.377,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M22.377,14.085h-0.716c-0.398,0-0.724-0.323-0.724-0.722v0.36  c0,0.399,0.325,0.724,0.724,0.724h0.716c0.398,0,0.724-0.324,0.724-0.724v-0.36C23.101,13.762,22.775,14.085,22.377,14.085z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.0195" x2="22.0195" y1="12.2661" y2="13.76">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M22.74,13.363c0,0.2-0.163,0.36-0.363,0.36h-0.716c-0.2,0-0.362-0.16-0.362-0.36v-0.717  c0-0.2,0.162-0.362,0.362-0.362h0.716c0.2,0,0.363,0.162,0.363,0.362V13.363z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="19.127" x2="19.127" y1="11.897" y2="14.1399">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M18.77,14.085c-0.398,0-0.724-0.323-0.724-0.722v-0.717  c0-0.398,0.325-0.723,0.724-0.723h0.716c0.398,0,0.724,0.324,0.724,0.723v0.717c0,0.398-0.325,0.722-0.724,0.722H18.77z" fill="url(#SVGID_16_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M19.485,14.085H18.77c-0.398,0-0.724-0.323-0.724-0.722v0.36c0,0.399,0.325,0.724,0.724,0.724  h0.716c0.398,0,0.724-0.324,0.724-0.724v-0.36C20.209,13.762,19.884,14.085,19.485,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M19.485,14.085H18.77c-0.398,0-0.724-0.323-0.724-0.722v0.36c0,0.399,0.325,0.724,0.724,0.724  h0.716c0.398,0,0.724-0.324,0.724-0.724v-0.36C20.209,13.762,19.884,14.085,19.485,14.085z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="19.1279" x2="19.1279" y1="12.2661" y2="13.76">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M19.848,13.363c0,0.2-0.162,0.36-0.362,0.36H18.77c-0.199,0-0.361-0.16-0.361-0.36v-0.717  c0-0.2,0.162-0.362,0.361-0.362h0.716c0.2,0,0.362,0.162,0.362,0.362V13.363z" fill="url(#SVGID_17_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="24.9111" x2="24.9111" y1="14.7866" y2="17.0331">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M24.553,16.978c-0.398,0-0.723-0.325-0.723-0.724v-0.717  c0-0.399,0.324-0.724,0.723-0.724h0.717c0.398,0,0.723,0.324,0.723,0.724v0.717c0,0.398-0.324,0.724-0.723,0.724H24.553z" fill="url(#SVGID_18_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M25.27,16.978h-0.717c-0.398,0-0.723-0.325-0.723-0.724v0.36c0,0.4,0.324,0.724,0.723,0.724  h0.717c0.398,0,0.723-0.323,0.723-0.724v-0.36C25.992,16.652,25.668,16.978,25.27,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.27,16.978h-0.717c-0.398,0-0.723-0.325-0.723-0.724v0.36c0,0.4,0.324,0.724,0.723,0.724  h0.717c0.398,0,0.723-0.323,0.723-0.724v-0.36C25.992,16.652,25.668,16.978,25.27,16.978z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="24.9102" x2="24.9102" y1="15.1587" y2="16.6511">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.631,16.254c0,0.201-0.162,0.36-0.361,0.36h-0.717c-0.199,0-0.362-0.159-0.362-0.36v-0.717  c0-0.199,0.163-0.36,0.362-0.36h0.717c0.199,0,0.361,0.161,0.361,0.36V16.254z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="22.0195" x2="22.0195" y1="14.7866" y2="17.0331">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M21.661,16.978c-0.398,0-0.724-0.325-0.724-0.724v-0.717  c0-0.399,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.324,0.724,0.724v0.717c0,0.398-0.325,0.724-0.724,0.724H21.661z" fill="url(#SVGID_20_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M22.377,16.978h-0.716c-0.398,0-0.724-0.325-0.724-0.724v0.36c0,0.4,0.325,0.724,0.724,0.724  h0.716c0.398,0,0.724-0.323,0.724-0.724v-0.36C23.101,16.652,22.775,16.978,22.377,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M22.377,16.978h-0.716c-0.398,0-0.724-0.325-0.724-0.724v0.36c0,0.4,0.325,0.724,0.724,0.724  h0.716c0.398,0,0.724-0.323,0.724-0.724v-0.36C23.101,16.652,22.775,16.978,22.377,16.978z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="22.0195" x2="22.0195" y1="15.1587" y2="16.6511">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M22.74,16.254c0,0.201-0.163,0.36-0.363,0.36h-0.716c-0.2,0-0.362-0.159-0.362-0.36v-0.717  c0-0.199,0.162-0.36,0.362-0.36h0.716c0.2,0,0.363,0.161,0.363,0.36V16.254z" fill="url(#SVGID_21_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.127" x2="19.127" y1="14.7866" y2="17.0331">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M18.77,16.978c-0.398,0-0.724-0.325-0.724-0.724v-0.717  c0-0.399,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.324,0.724,0.724v0.717c0,0.398-0.325,0.724-0.724,0.724H18.77z" fill="url(#SVGID_22_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M19.485,16.978H18.77c-0.398,0-0.724-0.325-0.724-0.724v0.36c0,0.4,0.325,0.724,0.724,0.724  h0.716c0.398,0,0.724-0.323,0.724-0.724v-0.36C20.209,16.652,19.884,16.978,19.485,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M19.485,16.978H18.77c-0.398,0-0.724-0.325-0.724-0.724v0.36c0,0.4,0.325,0.724,0.724,0.724  h0.716c0.398,0,0.724-0.323,0.724-0.724v-0.36C20.209,16.652,19.884,16.978,19.485,16.978z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.1279" x2="19.1279" y1="15.1587" y2="16.6511">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M19.848,16.254c0,0.201-0.162,0.36-0.362,0.36H18.77c-0.199,0-0.361-0.159-0.361-0.36v-0.717  c0-0.199,0.162-0.36,0.361-0.36h0.716c0.2,0,0.362,0.161,0.362,0.36V16.254z" fill="url(#SVGID_23_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="24.9111" x2="24.9111" y1="17.6797" y2="19.9236">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M24.553,19.868c-0.398,0-0.723-0.322-0.723-0.723V18.43  c0-0.398,0.324-0.724,0.723-0.724h0.717c0.398,0,0.723,0.325,0.723,0.724v0.716c0,0.4-0.324,0.723-0.723,0.723H24.553z" fill="url(#SVGID_24_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M25.27,19.868h-0.717c-0.398,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.324,0.725,0.723,0.725  h0.717c0.398,0,0.723-0.324,0.723-0.725v-0.361C25.992,19.546,25.668,19.868,25.27,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.27,19.868h-0.717c-0.398,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.324,0.725,0.723,0.725  h0.717c0.398,0,0.723-0.324,0.723-0.725v-0.361C25.992,19.546,25.668,19.868,25.27,19.868z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="24.9102" x2="24.9102" y1="18.0508" y2="19.5437">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.631,19.146c0,0.199-0.162,0.361-0.361,0.361h-0.717c-0.199,0-0.362-0.162-0.362-0.361V18.43  c0-0.199,0.163-0.361,0.362-0.361h0.717c0.199,0,0.361,0.162,0.361,0.361V19.146z" fill="url(#SVGID_25_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="22.0195" x2="22.0195" y1="17.6797" y2="19.9236">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M21.661,19.868c-0.398,0-0.724-0.322-0.724-0.723V18.43  c0-0.398,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.325,0.724,0.724v0.716c0,0.4-0.325,0.723-0.724,0.723H21.661z" fill="url(#SVGID_26_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M22.377,19.868h-0.716c-0.398,0-0.724-0.322-0.724-0.723v0.361c0,0.4,0.325,0.725,0.724,0.725  h0.716c0.398,0,0.724-0.324,0.724-0.725v-0.361C23.101,19.546,22.775,19.868,22.377,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M22.377,19.868h-0.716c-0.398,0-0.724-0.322-0.724-0.723v0.361c0,0.4,0.325,0.725,0.724,0.725  h0.716c0.398,0,0.724-0.324,0.724-0.725v-0.361C23.101,19.546,22.775,19.868,22.377,19.868z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="22.0195" x2="22.0195" y1="18.0508" y2="19.5437">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M22.74,19.146c0,0.199-0.163,0.361-0.363,0.361h-0.716c-0.2,0-0.362-0.162-0.362-0.361V18.43  c0-0.199,0.162-0.361,0.362-0.361h0.716c0.2,0,0.363,0.162,0.363,0.361V19.146z" fill="url(#SVGID_27_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="19.127" x2="19.127" y1="17.6797" y2="19.9236">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M18.77,19.868c-0.398,0-0.724-0.322-0.724-0.723V18.43  c0-0.398,0.325-0.724,0.724-0.724h0.716c0.398,0,0.724,0.325,0.724,0.724v0.716c0,0.4-0.325,0.723-0.724,0.723H18.77z" fill="url(#SVGID_28_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M19.485,19.868H18.77c-0.398,0-0.724-0.322-0.724-0.723v0.361c0,0.4,0.325,0.725,0.724,0.725  h0.716c0.398,0,0.724-0.324,0.724-0.725v-0.361C20.209,19.546,19.884,19.868,19.485,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M19.485,19.868H18.77c-0.398,0-0.724-0.322-0.724-0.723v0.361c0,0.4,0.325,0.725,0.724,0.725  h0.716c0.398,0,0.724-0.324,0.724-0.725v-0.361C20.209,19.546,19.884,19.868,19.485,19.868z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="19.1279" x2="19.1279" y1="18.0508" y2="19.5437">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M19.848,19.146c0,0.199-0.162,0.361-0.362,0.361H18.77c-0.199,0-0.361-0.162-0.361-0.361V18.43  c0-0.199,0.162-0.361,0.361-0.361h0.716c0.2,0,0.362,0.162,0.362,0.361V19.146z" fill="url(#SVGID_29_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 -1 -7790.2559 1179.5723)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="-7805.2559" x2="-7805.2559" y1="1151.4873" y2="1157.8247">
@@ -292,15 +292,15 @@
 <path d="M17.429,28.084c0,0-6.867-0.06-9.421-3.56  c0,0-1.83,2.256-2.467,0.229C5.813,26.145,8.262,28.136,17.429,28.084z" fill="url(#SVGID_33_)" fill-rule="evenodd"/>
 <rect fill="none" height="30" width="30"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -224.75 -299.25)" gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="492.5" x2="492.5" y1="-626.4292" y2="-656.4292">
-<stop offset="0" style="stop-color:#B5BCBF"/>
-<stop offset="0.7091" style="stop-color:#494C4F"/>
-<stop offset="1" style="stop-color:#A8AFB2"/>
+<stop offset="0" style="stop-color:#B8BCBB"/>
+<stop offset="0.7091" style="stop-color:#4B4B4D"/>
+<stop offset="1" style="stop-color:#ABAFAF"/>
 </linearGradient>
 <path d="M21.5,29c-4.136,0-7.5-3.364-7.5-7.5c0-4.135,3.364-7.5,7.5-7.5c4.135,0,7.5,3.365,7.5,7.5  C29,25.636,25.635,29,21.5,29L21.5,29z" fill="url(#SVGID_34_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35_" x1="21.5" x2="21.5" y1="14.4453" y2="28.4458">
-<stop offset="0" style="stop-color:#727678"/>
-<stop offset="0.7394" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+<stop offset="0" style="stop-color:#747576"/>
+<stop offset="0.7394" style="stop-color:#262628"/>
+<stop offset="1" style="stop-color:#4B4B4D"/>
 </linearGradient>
 <path d="M28.5,21.5c0,3.866-3.135,7-7,7c-3.866,0-7-3.134-7-7c0-3.865,3.134-7,7-7  C25.365,14.5,28.5,17.635,28.5,21.5z" fill="url(#SVGID_35_)"/>
 <polygon fill="#FFFFFF" points="23,18 23,19 25,19 25,20 23,20 23,21 25,21 25,22 23,22 23,25 26,25 26,18 "/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_group.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_group.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_group.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,29 +3,29 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+<stop offset="0" style="stop-color:#93AC5D"/>
+<stop offset="0.297" style="stop-color:#93AC5D"/>
+<stop offset="0.6667" style="stop-color:#356742"/>
+<stop offset="0.7939" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#447B42"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399  c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514  c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737  c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12  c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B1BE95" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B1BE95" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+<stop offset="0" style="stop-color:#315D3E"/>
+<stop offset="0.5" style="stop-color:#1E3A31"/>
+<stop offset="1" style="stop-color:#2E593D"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31  c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535  c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
@@ -33,179 +33,179 @@
 <g transform="matrix(1 0 0 1 30 30)">
 <rect fill="none" height="30" width="30"/>
 <radialGradient cx="669.4" cy="-594.3" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="11.1">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.2" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<stop offset="0" stop-color="#DDC4B0"/>
+<stop offset="0.2" stop-color="#DDC4B0"/>
+<stop offset="0.96" stop-color="#A57665"/>
+<stop offset="1" stop-color="#A57665"/>
 </radialGradient>
 <path d="M23.46,18.68c-0.521-0.226-0.506-1.339-0.291-1.675,0.038-0.059,0.072-0.117,0.107-0.176h-4.365c0.035,0.059,0.069,0.116,0.107,0.176,0.215,0.336,0.23,1.448-0.291,1.675-0.522,0.228,2.428,2.202,2.428,2.202s2.81-1.98,2.29-2.2z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="669.2" x2="669.2" y1="-588.9" y2="-598.1">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="0.39" stop-color="#2D9BD2"/>
-<stop offset="0.89" stop-color="#1347BA"/>
-<stop offset="1" stop-color="#1347BA"/>
+<stop offset="0" stop-color="#70B4B6"/>
+<stop offset="0.39" stop-color="#5F8BA1"/>
+<stop offset="0.89" stop-color="#455188"/>
+<stop offset="1" stop-color="#455188"/>
 </linearGradient>
 <path d="M26.59,19.84c-0.549-0.286-3.27-1.238-3.322-1.299l-2.078,1.729-2.233-1.795c-0.063,0.092-2.752,1.035-3.374,1.365-0.713,0.377-1.877,1.246-1.877,3.207h14.76c0-1.97-1.33-2.93-1.88-3.21z" fill="url(#SVGID_2__)"/>
 <polygon fill="#020202" fill-opacity="0.3" points="18.45,18.69,21.19,20.88,23.77,18.74,23.27,18.54,21.19,20.27,18.96,18.47" stroke-opacity="0.3" style="enable-background:new;"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="669.2" x2="669.2" y1="-594.1" y2="-589.1">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#2D9BD2"/>
+<stop offset="0" stop-color="#70B4B6"/>
+<stop offset="1" stop-color="#5F8BA1"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3__)" points="21.19,20.88,18.45,18.69,18.29,18.76,21.19,21.07,23.93,18.8,23.77,18.74"/>
 <radialGradient cx="669.9" cy="-573.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="14.9">
-<stop offset="0" stop-color="#FFE2D9"/>
-<stop offset="0.51" stop-color="#FFC6B3"/>
-<stop offset="0.76" stop-color="#FFA98E"/>
-<stop offset="1" stop-color="#E88160"/>
+<stop offset="0" stop-color="#F4EDE4"/>
+<stop offset="0.51" stop-color="#E8D9CA"/>
+<stop offset="0.76" stop-color="#DDC4B0"/>
+<stop offset="1" stop-color="#BF9C89"/>
 </radialGradient>
 <path d="M24.71,13.56c-0.019-0.008-0.04-0.009-0.06-0.015v-0.001c-0.004-0.001-0.006-0.002-0.006-0.002-0.033-0.008-0.063-0.014-0.094-0.016-3.644-0.635-5.317-2.654-5.442-2.119-0.101,0.425-1.122,1.346-1.657,1.805,0.004,0.021,0.008,0.039,0.012,0.06,0,0,0.02,0.094,0.06,0.254-0.042,0.005-0.084,0.014-0.124,0.03-0.341,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.198,0.445,0.44,0.922,0.739,1.4,0.498,0.594,1.262,1.287,2.105,1.287,1.02,0,1.645-0.559,2.072-1.121,0.012-0.023,0.022-0.047,0.034-0.064,0.317-0.497,0.575-0.996,0.785-1.46,0.333,0.115,0.761-0.194,0.974-0.719,0.23-0.53,0.14-1.09-0.2-1.25z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="666.5" x2="672.8" y1="-589.1" y2="-582.8">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<stop offset="0" stop-color="#E8D9CA"/>
+<stop offset="1" stop-color="#DDC4B0"/>
 </linearGradient>
 <path d="M20.91,17.9c-0.621,0-1.246-0.289-1.707-0.727,0.486,0.514,1.143,1.012,1.857,1.012,1.02,0,1.645-0.559,2.072-1.121,0.011-0.023,0.021-0.047,0.034-0.064,0.317-0.497,0.575-0.996,0.785-1.46-1.15,2.03-2.01,2.36-3.03,2.36z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="669.1" x2="669.1" y1="-569.1" y2="-578.4">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M20.95,8.483c-1.265,0-1.872,0.574-2.341,1.175-0.764,0.117-1.974,0.817-1.119,3.882,0.535-0.459,1.514-1.703,1.614-2.128,0.128-0.54,1.828,1.521,5.542,2.137,0.045-0.172,0.063-0.272,0.063-0.272,0.6-2.62-0.67-4.694-3.75-4.797z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="672.2" x2="663.8" y1="-578" y2="-573">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.36" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M19.11,11.16s1.818,2.389,5.512,2.384c0,0-1.73-0.27-5.51-2.38z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="663.1" x2="663.1" y1="-572" y2="-577.3">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M18.68,9.836s-1.78,0.106-1.12,3.123c0,0-0.22-2.07,1.12-3.124z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="670.2" x2="670" y1="-569.9" y2="-572.3">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<stop offset="0" stop-color="#8D7B6A"/>
+<stop offset="1" stop-color="#451F1E"/>
 </linearGradient>
 <path d="M21.82,10.25c-0.828-0.118-2.23-0.853-2.779-0.59,0,0,1.799-2.053,4.971,0.284,0,0.004-0.76,0.516-2.19,0.306z" fill="url(#SVGID_9_)"/>
 <radialGradient cx="645" cy="-594.3" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="11.1">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.2" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<stop offset="0" stop-color="#DDC4B0"/>
+<stop offset="0.2" stop-color="#DDC4B0"/>
+<stop offset="0.96" stop-color="#A57665"/>
+<stop offset="1" stop-color="#A57665"/>
 </radialGradient>
 <path d="M11.28,18.68c-0.521-0.226-0.505-1.339-0.29-1.675,0.037-0.059,0.072-0.117,0.108-0.176h-4.371c0.035,0.059,0.069,0.116,0.107,0.176,0.215,0.336,0.23,1.448-0.29,1.675-0.523,0.228,2.427,2.202,2.427,2.202s2.827-1.98,2.307-2.2z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="644.8" x2="644.8" y1="-588.9" y2="-598.1">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="0.39" stop-color="#2D9BD2"/>
-<stop offset="0.89" stop-color="#1347BA"/>
-<stop offset="1" stop-color="#1347BA"/>
+<stop offset="0" stop-color="#70B4B6"/>
+<stop offset="0.39" stop-color="#5F8BA1"/>
+<stop offset="0.89" stop-color="#455188"/>
+<stop offset="1" stop-color="#455188"/>
 </linearGradient>
 <path d="M14.42,19.84c-0.549-0.286-3.271-1.238-3.322-1.299l-2.079,1.729-2.233-1.795c-0.063,0.092-2.752,1.035-3.375,1.365-0.712,0.377-1.876,1.246-1.876,3.207h14.76c-0.01-1.97-1.34-2.93-1.88-3.21z" fill="url(#SVGID_11_)"/>
 <polygon fill="#020202" fill-opacity="0.3" points="6.272,18.69,9.015,20.88,11.59,18.74,11.09,18.54,9.015,20.27,6.781,18.47" stroke-opacity="0.3" style="enable-background:new;"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="644.9" x2="644.9" y1="-594.1" y2="-589.1">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#2D9BD2"/>
+<stop offset="0" stop-color="#70B4B6"/>
+<stop offset="1" stop-color="#5F8BA1"/>
 </linearGradient>
 <polygon fill="url(#SVGID_12_)" points="9.015,20.88,6.271,18.69,6.113,18.76,9.015,21.07,11.75,18.8,11.59,18.74"/>
 <radialGradient cx="645.6" cy="-573.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="14.9">
-<stop offset="0" stop-color="#FFE2D9"/>
-<stop offset="0.51" stop-color="#FFC6B3"/>
-<stop offset="0.76" stop-color="#FFA98E"/>
-<stop offset="1" stop-color="#E88160"/>
+<stop offset="0" stop-color="#F4EDE4"/>
+<stop offset="0.51" stop-color="#E8D9CA"/>
+<stop offset="0.76" stop-color="#DDC4B0"/>
+<stop offset="1" stop-color="#BF9C89"/>
 </radialGradient>
 <path d="M12.53,13.56c-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-3.645-0.635-5.317-2.654-5.443-2.119-0.102,0.425-1.123,1.346-1.658,1.805,0.004,0.021,0.008,0.039,0.012,0.06,0,0,0.02,0.094,0.06,0.254-0.043,0.005-0.085,0.014-0.124,0.03-0.341,0.145-0.447,0.702-0.239,1.248,0.209,0.545,0.653,0.871,0.995,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.198,0.445,0.44,0.922,0.738,1.4,0.499,0.594,1.263,1.287,2.106,1.287,1.02,0,1.645-0.559,2.073-1.121,0.011-0.023,0.022-0.047,0.034-0.064,0.318-0.497,0.576-0.996,0.785-1.46,0.334,0.115,0.761-0.194,0.973-0.719,0.23-0.53,0.14-1.09-0.2-1.25z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="642.2" x2="648.5" y1="-589.1" y2="-582.8">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<stop offset="0" stop-color="#E8D9CA"/>
+<stop offset="1" stop-color="#DDC4B0"/>
 </linearGradient>
 <path d="M8.729,17.9c-0.621,0-1.247-0.289-1.708-0.727,0.487,0.514,1.144,1.012,1.858,1.012,1.02,0,1.645-0.559,2.073-1.121,0.011-0.023,0.022-0.047,0.034-0.064,0.318-0.497,0.576-0.996,0.785-1.46-1.15,2.03-2.011,2.36-3.031,2.36z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="644.7" x2="644.7" y1="-569.1" y2="-578.4">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M8.776,8.483c-1.265,0-1.872,0.574-2.342,1.175-0.763,0.117-1.973,0.817-1.118,3.882,0.535-0.459,1.514-1.703,1.615-2.128,0.127-0.54,1.828,1.521,5.542,2.137,0.043-0.172,0.063-0.272,0.063-0.272,0.59-2.62-0.68-4.694-3.754-4.797z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="647.9" x2="639.5" y1="-578" y2="-573">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.36" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M6.936,11.16s1.818,2.389,5.513,2.384c0,0-1.74-0.27-5.514-2.38z" fill="url(#SVGID_16_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="638.7" x2="638.8" y1="-572.3" y2="-577.7">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M6.498,9.836s-1.779,0.106-1.119,3.123c0,0-0.218-2.07,1.119-3.124z" fill="url(#SVGID_17_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="645.9" x2="645.6" y1="-569.9" y2="-572.3">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<stop offset="0" stop-color="#8D7B6A"/>
+<stop offset="1" stop-color="#451F1E"/>
 </linearGradient>
 <path d="M9.639,10.25c-0.828-0.118-2.23-0.853-2.78-0.59,0,0,1.8-2.053,4.973,0.284,0,0.004-0.76,0.516-2.191,0.306z" fill="url(#SVGID_18_)"/>
-<path d="M23.32,20.43c-0.506-0.264-2.081-0.849-3.348-1.317l-0.711-0.265-0.128-0.053-0.166-0.063-0.317-0.128-0.196,0.086c-0.001,0.002-0.003,0.002-0.004,0.003h-0.001c-0.826,0.323-2.406,0.897-2.865,1.143-0.178,0.095-0.385,0.222-0.596,0.388-0.221-0.183-0.426-0.311-0.573-0.388-0.395-0.205-1.904-0.753-2.746-1.067l-0.078-0.031-0.002,0.001-0.349-0.142-0.317,0.139c-0.311,0.122-0.693,0.268-1.103,0.424l-0.038,0.014c-1.21,0.461-2.582,0.982-3.107,1.262-1.177,0.625-2.025,1.51-2.525,2.609h21.66c-0.77-1.62-2.12-2.41-2.48-2.6z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M9.052,11.44c-0.561,0.477-0.712,1.432-0.349,2.38,0.342,0.894,1.048,1.494,1.758,1.494h0.002c0.106,0.221,0.217,0.439,0.331,0.654h-0.033l0.271,0.448s0.071,0.115,0.154,0.253c0.226-0.383,0.424-0.765,0.586-1.123,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.583-2.617-0.686-4.69-3.761-4.793-0.006,0-0.01,0.001-0.017,0.001-0.072,0.839,0.021,1.822,0.3,2.962z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.165,0.371,0.364,0.766,0.599,1.163,0.263-0.441,0.512-0.897,0.736-1.369,0.646-0.077,1.279-0.639,1.605-1.444,0.371-0.919,0.253-1.873-0.272-2.37,0.235-1.062,0.272-2.073,0.117-2.993-0.015-0.001-0.028-0.003-0.043-0.003-1.26-0.001-1.87,0.574-2.34,1.174zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M23.19,20.69c-0.49-0.256-2.057-0.836-3.314-1.305l-0.719-0.266-0.123-0.051-0.172-0.065-0.484-0.194c-0.016-0.021-0.027-0.051-0.041-0.073-0.85,0.327-2.31,0.862-2.746,1.097-0.179,0.094-0.386,0.221-0.597,0.387-0.221-0.182-0.426-0.311-0.573-0.387-0.395-0.205-1.904-0.754-2.746-1.068l-0.042-0.018-0.596,0.261c-0.32,0.125-0.719,0.276-1.144,0.438-1.202,0.457-2.565,0.975-3.074,1.244-1.071,0.568-1.857,1.363-2.338,2.35h21.01c-0.76-1.46-1.98-2.18-2.3-2.35z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
-<path d="M8.979,13.71c0.298,0.78,0.894,1.304,1.481,1.304,0.062,0,0.122-0.005,0.181-0.017,0.202,0.433,0.419,0.854,0.651,1.261h-0.009l0.068,0.113c0.155-0.283,0.3-0.563,0.419-0.829,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.564-2.535-0.613-4.556-3.483-4.772-0.08,0.847,0.026,1.864,0.336,3.057-0.57,0.33-0.751,1.24-0.404,2.15z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
-<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.124,0.278,0.269,0.569,0.429,0.864,0.256-0.439,0.497-0.891,0.715-1.357,0.014,0.001,0.025,0.001,0.039,0.001,0.58,0,1.177-0.511,1.483-1.27,0.358-0.884,0.21-1.785-0.325-2.144,0.025-0.106,0.036-0.166,0.036-0.166,0.233-1.043,0.267-2.035,0.11-2.931-1.08,0.083-1.64,0.612-2.08,1.169zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
+<path d="M23.32,20.43c-0.506-0.264-2.081-0.849-3.348-1.317l-0.711-0.265-0.128-0.053-0.166-0.063-0.317-0.128-0.196,0.086c-0.001,0.002-0.003,0.002-0.004,0.003h-0.001c-0.826,0.323-2.406,0.897-2.865,1.143-0.178,0.095-0.385,0.222-0.596,0.388-0.221-0.183-0.426-0.311-0.573-0.388-0.395-0.205-1.904-0.753-2.746-1.067l-0.078-0.031-0.002,0.001-0.349-0.142-0.317,0.139c-0.311,0.122-0.693,0.268-1.103,0.424l-0.038,0.014c-1.21,0.461-2.582,0.982-3.107,1.262-1.177,0.625-2.025,1.51-2.525,2.609h21.66c-0.77-1.62-2.12-2.41-2.48-2.6z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
+<path d="M9.052,11.44c-0.561,0.477-0.712,1.432-0.349,2.38,0.342,0.894,1.048,1.494,1.758,1.494h0.002c0.106,0.221,0.217,0.439,0.331,0.654h-0.033l0.271,0.448s0.071,0.115,0.154,0.253c0.226-0.383,0.424-0.765,0.586-1.123,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.583-2.617-0.686-4.69-3.761-4.793-0.006,0-0.01,0.001-0.017,0.001-0.072,0.839,0.021,1.822,0.3,2.962z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
+<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.165,0.371,0.364,0.766,0.599,1.163,0.263-0.441,0.512-0.897,0.736-1.369,0.646-0.077,1.279-0.639,1.605-1.444,0.371-0.919,0.253-1.873-0.272-2.37,0.235-1.062,0.272-2.073,0.117-2.993-0.015-0.001-0.028-0.003-0.043-0.003-1.26-0.001-1.87,0.574-2.34,1.174zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
+<path d="M23.19,20.69c-0.49-0.256-2.057-0.836-3.314-1.305l-0.719-0.266-0.123-0.051-0.172-0.065-0.484-0.194c-0.016-0.021-0.027-0.051-0.041-0.073-0.85,0.327-2.31,0.862-2.746,1.097-0.179,0.094-0.386,0.221-0.597,0.387-0.221-0.182-0.426-0.311-0.573-0.387-0.395-0.205-1.904-0.754-2.746-1.068l-0.042-0.018-0.596,0.261c-0.32,0.125-0.719,0.276-1.144,0.438-1.202,0.457-2.565,0.975-3.074,1.244-1.071,0.568-1.857,1.363-2.338,2.35h21.01c-0.76-1.46-1.98-2.18-2.3-2.35z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
+<path d="M8.979,13.71c0.298,0.78,0.894,1.304,1.481,1.304,0.062,0,0.122-0.005,0.181-0.017,0.202,0.433,0.419,0.854,0.651,1.261h-0.009l0.068,0.113c0.155-0.283,0.3-0.563,0.419-0.829,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.564-2.535-0.613-4.556-3.483-4.772-0.08,0.847,0.026,1.864,0.336,3.057-0.57,0.33-0.751,1.24-0.404,2.15z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
+<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.124,0.278,0.269,0.569,0.429,0.864,0.256-0.439,0.497-0.891,0.715-1.357,0.014,0.001,0.025,0.001,0.039,0.001,0.58,0,1.177-0.511,1.483-1.27,0.358-0.884,0.21-1.785-0.325-2.144,0.025-0.106,0.036-0.166,0.036-0.166,0.233-1.043,0.267-2.035,0.11-2.931-1.08,0.083-1.64,0.612-2.08,1.169zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
 <radialGradient cx="657.3" cy="-597.7" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_19_" r="16.23">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.2" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<stop offset="0" stop-color="#DDC4B0"/>
+<stop offset="0.2" stop-color="#DDC4B0"/>
+<stop offset="0.96" stop-color="#A57665"/>
+<stop offset="1" stop-color="#A57665"/>
 </radialGradient>
 <path d="M18.46,19.26c-0.764-0.332-0.738-1.957-0.424-2.448,0.055-0.086,0.104-0.172,0.156-0.258h-6.385c0.053,0.086,0.103,0.172,0.157,0.258,0.315,0.491,0.34,2.116-0.424,2.448-0.764,0.331,3.549,3.219,3.549,3.219s4.11-2.89,3.35-3.22z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="657" x2="657" y1="-589.9" y2="-603.3">
-<stop offset="0" stop-color="#FF7236"/>
-<stop offset="1" stop-color="#BA1212"/>
+<stop offset="0" stop-color="#C39072"/>
+<stop offset="1" stop-color="#88444B"/>
 </linearGradient>
 <path d="M23.05,20.96c-0.803-0.418-4.781-1.811-4.857-1.896l-3.04,2.524-3.266-2.623c-0.09,0.134-4.023,1.512-4.934,1.995-1.042,0.553-2.743,1.822-2.743,4.688h21.59c0-2.87-1.94-4.28-2.74-4.69z" fill="url(#SVGID_20_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="657.1" x2="657.1" y1="-589" y2="-596.9">
-<stop offset="0" stop-color="#BC1C24"/>
-<stop offset="1" stop-color="#6B1C24"/>
+<stop offset="0" stop-color="#8C4C54"/>
+<stop offset="1" stop-color="#53343E"/>
 </linearGradient>
 <polygon fill="url(#SVGID_21_)" points="11.14,19.28,15.15,22.48,18.92,19.35,18.19,19.06,15.15,21.58,11.89,18.96"/>
-<path d="M11.33,19.79s-5.72,1.493-5.72,5.502h-0.823c0-2.46,1.922-4.38,6.543-5.5z" fill="#FF7B56"/>
-<path d="M18.6,19.7s5.72,1.494,5.72,5.502h0.824c0-2.47-1.92-4.38-6.54-5.5z" fill="#FF7B56"/>
+<path d="M11.33,19.79s-5.72,1.493-5.72,5.502h-0.823c0-2.46,1.922-4.38,6.543-5.5z" fill="#CCA089"/>
+<path d="M18.6,19.7s5.72,1.494,5.72,5.502h0.824c0-2.47-1.92-4.38-6.54-5.5z" fill="#CCA089"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="657.1" x2="657.1" y1="-597.5" y2="-590.2">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<stop offset="0" stop-color="#DDC4B0"/>
+<stop offset="0.96" stop-color="#A57665"/>
+<stop offset="1" stop-color="#A57665"/>
 </linearGradient>
 <polygon fill="url(#SVGID_22_)" points="15.15,22.48,11.14,19.28,10.91,19.39,15.15,22.77,19.15,19.44,18.92,19.35"/>
 <radialGradient cx="658.1" cy="-567.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_23_" r="21.78">
-<stop offset="0" stop-color="#FFE2D9"/>
-<stop offset="0.51" stop-color="#FFC6B3"/>
-<stop offset="0.76" stop-color="#FFA98E"/>
-<stop offset="1" stop-color="#E88160"/>
+<stop offset="0" stop-color="#F4EDE4"/>
+<stop offset="0.51" stop-color="#E8D9CA"/>
+<stop offset="0.76" stop-color="#DDC4B0"/>
+<stop offset="1" stop-color="#BF9C89"/>
 </radialGradient>
 <path d="M20.29,11.79c-0.026-0.013-0.058-0.015-0.086-0.022v-0.002c-0.005-0.001-0.01-0.002-0.017-0.003-0.041-0.011-0.084-0.021-0.127-0.022-5.331-0.928-7.775-3.88-7.959-3.099-0.147,0.622-1.641,1.968-2.424,2.639,0.007,0.03,0.01,0.057,0.018,0.087,0,0,0.027,0.138,0.086,0.372-0.062,0.007-0.123,0.02-0.182,0.045-0.498,0.21-0.654,1.026-0.349,1.823,0.305,0.798,0.956,1.274,1.454,1.065,0.03-0.014,0.057-0.035,0.085-0.054,0.289,0.65,0.645,1.348,1.079,2.047,0.729,0.866,1.846,1.883,3.079,1.883,1.49,0,2.404-0.815,3.031-1.64,0.017-0.033,0.031-0.066,0.053-0.095,0.465-0.728,0.842-1.455,1.145-2.134,0.488,0.168,1.113-0.284,1.424-1.051,0.35-0.81,0.21-1.63-0.29-1.85z" fill="url(#SVGID_23_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="653.2" x2="662.4" y1="-590.1" y2="-580.9">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<stop offset="0" stop-color="#E8D9CA"/>
+<stop offset="1" stop-color="#DDC4B0"/>
 </linearGradient>
 <path d="M14.73,18.13c-0.908,0-1.822-0.423-2.496-1.06,0.713,0.748,1.672,1.478,2.716,1.478,1.491,0,2.403-0.815,3.032-1.64,0.016-0.033,0.031-0.066,0.051-0.095,0.465-0.728,0.842-1.455,1.146-2.134-1.7,2.95-2.96,3.44-4.45,3.44z" fill="url(#SVGID_24_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="656.8" x2="656.8" y1="-560.9" y2="-574.5">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M14.8,4.357c-1.847,0-2.736,0.84-3.423,1.718-1.12,0.172-2.884,1.195-1.636,5.675,0.783-0.67,2.214-2.489,2.361-3.111,0.186-0.788,2.672,2.226,8.103,3.124,0.063-0.251,0.093-0.398,0.093-0.398,0.86-3.821-0.99-6.853-5.49-7.003z" fill="url(#SVGID_25_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="661.5" x2="649.2" y1="-573.9" y2="-566.6">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.36" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M12.11,8.272s2.658,3.492,8.059,3.485c0,0-2.54-0.4-8.06-3.488z" fill="url(#SVGID_26_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="648.1" x2="648.2" y1="-565.2" y2="-573">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M11.47,6.335s-2.603,0.155-1.637,4.566c0.003,0-0.315-3.019,1.637-4.565z" fill="url(#SVGID_27_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="658.5" x2="658.2" y1="-562.1" y2="-565.6">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<stop offset="0" stop-color="#8D7B6A"/>
+<stop offset="1" stop-color="#451F1E"/>
 </linearGradient>
 <path d="M16.06,6.946c-1.212-0.173-3.263-1.247-4.065-0.863,0,0,2.63-3,7.271,0.415,0,0-1.11,0.747-3.21,0.448z" fill="url(#SVGID_28_)"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,29 +3,29 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+<stop offset="0" style="stop-color:#93AC5D"/>
+<stop offset="0.297" style="stop-color:#93AC5D"/>
+<stop offset="0.6667" style="stop-color:#356742"/>
+<stop offset="0.7939" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#447B42"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399  c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514  c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737  c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12  c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B1BE95" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B1BE95" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+<stop offset="0" style="stop-color:#315D3E"/>
+<stop offset="0.5" style="stop-color:#1E3A31"/>
+<stop offset="1" style="stop-color:#2E593D"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31  c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535  c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
@@ -33,171 +33,171 @@
 <g transform="matrix(1 0 0 1 30 30)">
 <polygon fill="none" points="0,8 0,25.294 0,30 30,30 30,25.294 30,8 30,0 0,0 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="2.1646" y2="28.4294">
-<stop offset="0" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#5A5D61"/>
+<stop offset="0" style="stop-color:#262628"/>
+<stop offset="1" style="stop-color:#5C5D5F"/>
 </linearGradient>
 <path d="M2.647,27.941C1.188,27.941,0,26.754,0,25.294V8c0-1.295,0.936-2.376,2.167-2.603  c0.436-1.91,2.147-3.339,4.187-3.339h0.822c2.024,0,3.726,1.407,4.177,3.295h15.999C28.813,5.354,30,6.541,30,8v17.294  c0,1.46-1.188,2.647-2.647,2.647H2.647z" fill="url(#SVGID_1__)" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="6.1143" y2="26.7021">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M29,25.294c0,0.909-0.738,1.647-1.647,1.647H2.647C1.738,26.941,1,26.203,1,25.294V8  c0-0.908,0.738-1.646,1.647-1.646h24.705C28.262,6.354,29,7.092,29,8V25.294z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="6.1143" y2="26.7021">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M27.353,6.354H2.647C1.738,6.354,1,7.092,1,8v17.294c0,0.909,0.738,1.647,1.647,1.647  c-0.682,0-1.235-0.554-1.235-1.236v-0.411V8.412V8c0-0.682,0.554-1.235,1.235-1.235h24.705c0.682,0,1.234,0.554,1.234,1.235v0.412  v16.882v0.411c0,0.683-0.552,1.236-1.234,1.236c0.909,0,1.647-0.738,1.647-1.647V8C29,7.092,28.262,6.354,27.353,6.354z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="24.4707" x2="24.4707" y1="20.7725" y2="24.0876">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M23.647,24.058c-0.455,0-0.824-0.368-0.824-0.822v-1.646  c0-0.455,0.369-0.824,0.824-0.824h1.647c0.456,0,0.824,0.369,0.824,0.824v1.646c0,0.454-0.368,0.822-0.824,0.822H23.647z" fill="url(#SVGID_4__)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="24.4707" x2="24.4707" y1="21.146" y2="23.7092">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.705,23.235c0,0.228-0.184,0.411-0.411,0.411h-1.647c-0.228,0-0.412-0.184-0.412-0.411v-1.646  c0-0.229,0.184-0.412,0.412-0.412h1.647c0.227,0,0.411,0.183,0.411,0.412V23.235z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="19.9414" x2="19.9414" y1="20.7324" y2="24.1276">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M19.118,24.058c-0.455,0-0.824-0.368-0.824-0.822v-1.646  c0-0.455,0.369-0.824,0.824-0.824h1.646c0.454,0,0.825,0.369,0.825,0.824v1.646c0,0.454-0.371,0.822-0.825,0.822H19.118z" fill="url(#SVGID_6_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="19.9409" x2="19.9409" y1="21.146" y2="23.7092">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M21.176,23.235c0,0.228-0.184,0.411-0.413,0.411h-1.646c-0.228,0-0.413-0.184-0.413-0.411v-1.646  c0-0.229,0.185-0.412,0.413-0.412h1.646c0.229,0,0.413,0.183,0.413,0.412V23.235z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="15.4126" x2="15.4126" y1="20.7324" y2="24.0876">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M14.587,24.058c-0.452,0-0.821-0.368-0.821-0.822v-1.646  c0-0.455,0.369-0.824,0.821-0.824h1.647c0.455,0,0.825,0.369,0.825,0.824v1.646c0,0.454-0.371,0.822-0.825,0.822H14.587z" fill="url(#SVGID_8_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="15.4121" x2="15.4121" y1="21.146" y2="23.7092">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M16.647,23.235c0,0.228-0.184,0.411-0.413,0.411h-1.647c-0.227,0-0.411-0.184-0.411-0.411v-1.646  c0-0.229,0.184-0.412,0.411-0.412h1.647c0.229,0,0.413,0.183,0.413,0.412V23.235z" fill="url(#SVGID_9_)"/>
-<path d="M25.294,19.942h-1.647c-0.455,0-0.824-0.369-0.824-0.825v0.412  c0,0.455,0.369,0.824,0.824,0.824h1.647c0.456,0,0.824-0.369,0.824-0.824v-0.412C26.118,19.573,25.75,19.942,25.294,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.294,19.942h-1.647c-0.455,0-0.824-0.369-0.824-0.825v0.412  c0,0.455,0.369,0.824,0.824,0.824h1.647c0.456,0,0.824-0.369,0.824-0.824v-0.412C26.118,19.573,25.75,19.942,25.294,19.942z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="24.4707" x2="24.4707" y1="16.6553" y2="19.9724">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M23.647,19.942c-0.455,0-0.824-0.369-0.824-0.825V17.47  c0-0.452,0.369-0.822,0.824-0.822h1.647c0.456,0,0.824,0.37,0.824,0.822v1.647c0,0.456-0.368,0.825-0.824,0.825H23.647z" fill="url(#SVGID_10_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="24.4707" x2="24.4707" y1="17.0278" y2="19.592">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.705,19.117c0,0.229-0.184,0.412-0.411,0.412h-1.647c-0.228,0-0.412-0.184-0.412-0.412V17.47  c0-0.226,0.184-0.411,0.412-0.411h1.647c0.227,0,0.411,0.186,0.411,0.411V19.117z" fill="url(#SVGID_11_)"/>
-<path d="M20.764,19.942h-1.646c-0.455,0-0.824-0.369-0.824-0.825v0.412  c0,0.455,0.369,0.824,0.824,0.824h1.646c0.454,0,0.825-0.369,0.825-0.824v-0.412C21.589,19.573,21.218,19.942,20.764,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M20.764,19.942h-1.646c-0.455,0-0.824-0.369-0.824-0.825v0.412  c0,0.455,0.369,0.824,0.824,0.824h1.646c0.454,0,0.825-0.369,0.825-0.824v-0.412C21.589,19.573,21.218,19.942,20.764,19.942z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="19.9414" x2="19.9414" y1="16.6152" y2="20.0124">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M19.118,19.942c-0.455,0-0.824-0.369-0.824-0.825V17.47  c0-0.452,0.369-0.822,0.824-0.822h1.646c0.454,0,0.825,0.37,0.825,0.822v1.647c0,0.456-0.371,0.825-0.825,0.825H19.118z" fill="url(#SVGID_12_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="19.9409" x2="19.9409" y1="17.0278" y2="19.592">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M21.176,19.117c0,0.229-0.184,0.412-0.413,0.412h-1.646c-0.228,0-0.413-0.184-0.413-0.412V17.47  c0-0.226,0.185-0.411,0.413-0.411h1.646c0.229,0,0.413,0.186,0.413,0.411V19.117z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="15.4126" x2="15.4126" y1="16.6152" y2="19.9724">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M14.587,19.942c-0.452,0-0.821-0.369-0.821-0.825V17.47  c0-0.452,0.369-0.822,0.821-0.822h1.647c0.455,0,0.825,0.37,0.825,0.822v1.647c0,0.456-0.371,0.825-0.825,0.825H14.587z" fill="url(#SVGID_14_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M16.234,19.942h-1.647c-0.452,0-0.821-0.369-0.821-0.825v0.412  c0,0.455,0.369,0.824,0.821,0.824h1.647c0.455,0,0.825-0.369,0.825-0.824v-0.412C17.06,19.573,16.689,19.942,16.234,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M16.234,19.942h-1.647c-0.452,0-0.821-0.369-0.821-0.825v0.412  c0,0.455,0.369,0.824,0.821,0.824h1.647c0.455,0,0.825-0.369,0.825-0.824v-0.412C17.06,19.573,16.689,19.942,16.234,19.942z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="15.4121" x2="15.4121" y1="17.0278" y2="19.592">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M16.647,19.117c0,0.229-0.184,0.412-0.413,0.412h-1.647c-0.227,0-0.411-0.184-0.411-0.412V17.47  c0-0.226,0.184-0.411,0.411-0.411h1.647c0.229,0,0.413,0.186,0.413,0.411V19.117z" fill="url(#SVGID_15_)"/>
-<path d="M25.294,15.822h-1.647c-0.455,0-0.824-0.369-0.824-0.822v0.411  c0,0.455,0.369,0.824,0.824,0.824h1.647c0.456,0,0.824-0.369,0.824-0.824V15C26.118,15.453,25.75,15.822,25.294,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.294,15.822h-1.647c-0.455,0-0.824-0.369-0.824-0.822v0.411  c0,0.455,0.369,0.824,0.824,0.824h1.647c0.456,0,0.824-0.369,0.824-0.824V15C26.118,15.453,25.75,15.822,25.294,15.822z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="24.4707" x2="24.4707" y1="12.5381" y2="15.8522">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M23.647,15.822c-0.455,0-0.824-0.369-0.824-0.822v-1.647  c0-0.452,0.369-0.822,0.824-0.822h1.647c0.456,0,0.824,0.37,0.824,0.822V15c0,0.453-0.368,0.822-0.824,0.822H23.647z" fill="url(#SVGID_16_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="24.4707" x2="24.4707" y1="12.9106" y2="15.4738">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.705,15c0,0.228-0.184,0.411-0.411,0.411h-1.647c-0.228,0-0.412-0.184-0.412-0.411v-1.647  c0-0.228,0.184-0.411,0.412-0.411h1.647c0.227,0,0.411,0.184,0.411,0.411V15z" fill="url(#SVGID_17_)"/>
-<path d="M20.764,15.822h-1.646c-0.455,0-0.824-0.369-0.824-0.822v0.411  c0,0.455,0.369,0.824,0.824,0.824h1.646c0.454,0,0.825-0.369,0.825-0.824V15C21.589,15.453,21.218,15.822,20.764,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M20.764,15.822h-1.646c-0.455,0-0.824-0.369-0.824-0.822v0.411  c0,0.455,0.369,0.824,0.824,0.824h1.646c0.454,0,0.825-0.369,0.825-0.824V15C21.589,15.453,21.218,15.822,20.764,15.822z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="19.9414" x2="19.9414" y1="12.498" y2="15.8922">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M19.118,15.822c-0.455,0-0.824-0.369-0.824-0.822v-1.647  c0-0.452,0.369-0.822,0.824-0.822h1.646c0.454,0,0.825,0.37,0.825,0.822V15c0,0.453-0.371,0.822-0.825,0.822H19.118z" fill="url(#SVGID_18_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="19.9409" x2="19.9409" y1="12.9106" y2="15.4738">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M21.176,15c0,0.228-0.184,0.411-0.413,0.411h-1.646c-0.228,0-0.413-0.184-0.413-0.411v-1.647  c0-0.228,0.185-0.411,0.413-0.411h1.646c0.229,0,0.413,0.184,0.413,0.411V15z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="15.4126" x2="15.4126" y1="12.498" y2="15.8522">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M14.587,15.822c-0.452,0-0.821-0.369-0.821-0.822v-1.647  c0-0.452,0.369-0.822,0.821-0.822h1.647c0.455,0,0.825,0.37,0.825,0.822V15c0,0.453-0.371,0.822-0.825,0.822H14.587z" fill="url(#SVGID_20_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M16.234,15.822h-1.647c-0.452,0-0.821-0.369-0.821-0.822v0.411  c0,0.455,0.369,0.824,0.821,0.824h1.647c0.455,0,0.825-0.369,0.825-0.824V15C17.06,15.453,16.689,15.822,16.234,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M16.234,15.822h-1.647c-0.452,0-0.821-0.369-0.821-0.822v0.411  c0,0.455,0.369,0.824,0.821,0.824h1.647c0.455,0,0.825-0.369,0.825-0.824V15C17.06,15.453,16.689,15.822,16.234,15.822z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="15.4121" x2="15.4121" y1="12.9106" y2="15.4738">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M16.647,15c0,0.228-0.184,0.411-0.413,0.411h-1.647c-0.227,0-0.411-0.184-0.411-0.411v-1.647  c0-0.228,0.184-0.411,0.411-0.411h1.647c0.229,0,0.413,0.184,0.413,0.411V15z" fill="url(#SVGID_21_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.9434" x2="19.9434" y1="7.5977" y2="11.732">
-<stop offset="0" style="stop-color:#686C6E"/>
-<stop offset="1" style="stop-color:#E4EEF2"/>
+<stop offset="0" style="stop-color:#6A6B6C"/>
+<stop offset="1" style="stop-color:#E8EEEA"/>
 </linearGradient>
 <path d="M13.354,11.705c-0.454,0-0.825-0.374-0.825-0.833V8.423  c0-0.461,0.371-0.834,0.825-0.834h13.181c0.454,0,0.823,0.373,0.823,0.834v2.449c0,0.459-0.369,0.833-0.823,0.833H13.354z" fill="url(#SVGID_22_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.9419" x2="19.9419" y1="8.0195" y2="11.3512">
@@ -206,48 +206,48 @@
 </linearGradient>
 <path d="M26.942,10.872c0,0.23-0.183,0.417-0.411,0.417H13.354c-0.227,0-0.412-0.187-0.412-0.417V8.423  c0-0.23,0.185-0.417,0.412-0.417h13.177c0.228,0,0.411,0.187,0.411,0.417V10.872z" fill="url(#SVGID_23_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="19.9424" x2="19.9424" y1="3.9624" y2="12.5882">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#30A4D5"/>
-<stop offset="0.8727" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1C65C3"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#6292A3"/>
+<stop offset="0.8727" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#4E6591"/>
 </linearGradient>
 <rect fill="url(#SVGID_24_)" height="2.449" width="13.177" x="13.354" y="8.423"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="19.9424" x2="19.9424" y1="5.6362" y2="11.6377">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#4FADD5"/>
-<stop offset="0.8727" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1C65C3"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#77A6AD"/>
+<stop offset="0.8727" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#4E6591"/>
 </linearGradient>
 <polygon fill="url(#SVGID_25_)" points="13.354,9.51 26.531,8.807 26.531,8.412 13.354,8.412 "/>
 <path d="M2.234,21.177c0,2.27,1.849,4.117,4.12,4.117h0.822c2.27,0,4.118-1.848,4.118-4.117V6.354  H4.706H2.647c-0.147,0-0.277,0.046-0.413,0.083V21.177z" fill="#050505" fill-opacity="0.1" stroke-opacity="0.1"/>
 <path d="M6.354,24.883h0.822c2.044,0,3.706-1.662,3.706-3.706V6.354H4.706H2.647v14.823  C2.647,23.221,4.31,24.883,6.354,24.883z" fill="#050505" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="6.7656" x2="6.7656" y1="3.1465" y2="24.8746">
-<stop offset="0" style="stop-color:#727678"/>
-<stop offset="0.7394" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+<stop offset="0" style="stop-color:#747576"/>
+<stop offset="0.7394" style="stop-color:#262628"/>
+<stop offset="1" style="stop-color:#4B4B4D"/>
 </linearGradient>
 <path d="M10.471,21.177c0,1.819-1.474,3.294-3.295,3.294H6.354c-1.82,0-3.294-1.475-3.294-3.294V6.354  c0-1.819,1.474-3.295,3.294-3.295h0.822c1.821,0,3.295,1.476,3.295,3.295V21.177z" fill="url(#SVGID_26_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="6.7656" x2="6.7656" y1="3.082" y2="8.9318">
-<stop offset="0" style="stop-color:#B5BCBF"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+<stop offset="0" style="stop-color:#B8BCBB"/>
+<stop offset="1" style="stop-color:#4B4B4D"/>
 </linearGradient>
 <path d="M7.176,3.059H6.354c-1.82,0-3.294,1.476-3.294,3.295v2.47c0-1.819,1.474-3.295,3.294-3.295h0.822  c1.821,0,3.295,1.476,3.295,3.295v-2.47C10.471,4.534,8.997,3.059,7.176,3.059z" fill="url(#SVGID_27_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="6.7656" x2="6.7656" y1="3.0688" y2="7.2577">
-<stop offset="0" style="stop-color:#D5DDE0"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+<stop offset="0" style="stop-color:#D8DDDA"/>
+<stop offset="1" style="stop-color:#4B4B4D"/>
 </linearGradient>
 <path d="M7.176,3.059H6.354c-1.82,0-3.294,1.476-3.294,3.295v0.411c0-1.818,1.474-3.295,3.294-3.295h0.822  c1.821,0,3.295,1.477,3.295,3.295V6.354C10.471,4.534,8.997,3.059,7.176,3.059z" fill="url(#SVGID_28_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="6.7646" x2="6.7646" y1="2.7354" y2="24.6079">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="0.7576" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#1F2021"/>
+<stop offset="0" style="stop-color:#A2A6A5"/>
+<stop offset="0.7576" style="stop-color:#262628"/>
+<stop offset="1" style="stop-color:#202020"/>
 </linearGradient>
 <path d="M7.176,5.528H6.354c-0.438,0-0.855,0.087-1.236,0.244V22h3.292V5.772  C8.03,5.615,7.614,5.528,7.176,5.528z" fill="url(#SVGID_29_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="6.7656" x2="6.7656" y1="18.7295" y2="24.5792">
-<stop offset="0" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#5A5D61"/>
+<stop offset="0" style="stop-color:#262628"/>
+<stop offset="1" style="stop-color:#5C5D5F"/>
 </linearGradient>
 <path d="M7.176,22H6.354c-1.82,0-3.294-1.476-3.294-3.294v2.471c0,1.819,1.474,3.294,3.294,3.294h0.822  c1.821,0,3.295-1.475,3.295-3.294v-2.471C10.471,20.524,8.997,22,7.176,22z" fill="url(#SVGID_30_)"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_home.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,29 +3,29 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+<stop offset="0" style="stop-color:#93AC5D"/>
+<stop offset="0.297" style="stop-color:#93AC5D"/>
+<stop offset="0.6667" style="stop-color:#356742"/>
+<stop offset="0.7939" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#447B42"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399  c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514  c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737  c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12  c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B1BE95" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B1BE95" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+<stop offset="0" style="stop-color:#315D3E"/>
+<stop offset="0.5" style="stop-color:#1E3A31"/>
+<stop offset="1" style="stop-color:#2E593D"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31  c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535  c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
@@ -33,166 +33,166 @@
 <g transform="matrix(1 0 0 1 30 30)">
 <path d="M21.5,30c-2.038,0-3.986-0.729-5.531-2.059H2.647C1.188,27.941,0,26.754,0,25.294V8  c0-1.295,0.936-2.376,2.167-2.603c0.436-1.91,2.147-3.339,4.188-3.339h0.822c2.023,0,3.725,1.407,4.177,3.295h15.999  C28.813,5.354,30,6.541,30,8v17.294c0,1.46-1.188,2.647-2.647,2.647h-0.321C25.485,29.271,23.537,30,21.5,30L21.5,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.9995" x2="14.9995" y1="6.1143" y2="26.7026">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M29,25.294c0,0.909-0.738,1.647-1.647,1.647H2.647C1.738,26.941,1,26.203,1,25.294V8  c0-0.908,0.738-1.646,1.647-1.646h24.705C28.262,6.354,29,7.092,29,8V25.294z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9995" x2="14.9995" y1="6.1143" y2="26.7026">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M27.353,6.354H2.647C1.738,6.354,1,7.092,1,8v17.294c0,0.909,0.738,1.647,1.647,1.647  c-0.682,0-1.234-0.554-1.234-1.236v-0.411V8.412V8c0-0.682,0.553-1.235,1.234-1.235h24.705c0.682,0,1.234,0.554,1.234,1.235v0.412  v16.882v0.411c0,0.683-0.553,1.236-1.234,1.236c0.909,0,1.647-0.738,1.647-1.647V8C29,7.092,28.262,6.354,27.353,6.354z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="24.4707" x2="24.4707" y1="20.7725" y2="24.0876">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M23.647,24.058c-0.455,0-0.824-0.368-0.824-0.822v-1.646  c0-0.455,0.369-0.824,0.824-0.824h1.646c0.457,0,0.824,0.369,0.824,0.824v1.646c0,0.454-0.367,0.822-0.824,0.822H23.647z" fill="url(#SVGID_3__)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="24.4707" x2="24.4707" y1="21.1465" y2="23.7097">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.705,23.235c0,0.228-0.184,0.411-0.411,0.411h-1.646c-0.229,0-0.412-0.184-0.412-0.411v-1.646  c0-0.229,0.184-0.412,0.412-0.412h1.646c0.228,0,0.411,0.183,0.411,0.412V23.235z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="19.9414" x2="19.9414" y1="20.7324" y2="24.1276">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M19.118,24.058c-0.455,0-0.824-0.368-0.824-0.822v-1.646  c0-0.455,0.369-0.824,0.824-0.824h1.646c0.453,0,0.824,0.369,0.824,0.824v1.646c0,0.454-0.371,0.822-0.824,0.822H19.118z" fill="url(#SVGID_5_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="19.9414" x2="19.9414" y1="21.1465" y2="23.7097">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M21.177,23.235c0,0.228-0.185,0.411-0.412,0.411h-1.646c-0.228,0-0.412-0.184-0.412-0.411v-1.646  c0-0.229,0.185-0.412,0.412-0.412h1.646c0.228,0,0.412,0.183,0.412,0.412V23.235z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.4126" x2="15.4126" y1="20.7324" y2="24.0876">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M14.587,24.058c-0.452,0-0.821-0.368-0.821-0.822v-1.646  c0-0.455,0.369-0.824,0.821-0.824h1.647c0.454,0,0.825,0.369,0.825,0.824v1.646c0,0.454-0.371,0.822-0.825,0.822H14.587z" fill="url(#SVGID_7_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="15.4116" x2="15.4116" y1="21.1465" y2="23.7097">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M16.647,23.235c0,0.228-0.184,0.411-0.413,0.411h-1.647c-0.227,0-0.41-0.184-0.41-0.411v-1.646  c0-0.229,0.184-0.412,0.41-0.412h1.647c0.229,0,0.413,0.183,0.413,0.412V23.235z" fill="url(#SVGID_8_)"/>
-<path d="M25.294,19.942h-1.646c-0.455,0-0.824-0.369-0.824-0.825v0.412  c0,0.455,0.369,0.824,0.824,0.824h1.646c0.457,0,0.824-0.369,0.824-0.824v-0.412C26.118,19.573,25.751,19.942,25.294,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.294,19.942h-1.646c-0.455,0-0.824-0.369-0.824-0.825v0.412  c0,0.455,0.369,0.824,0.824,0.824h1.646c0.457,0,0.824-0.369,0.824-0.824v-0.412C26.118,19.573,25.751,19.942,25.294,19.942z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="24.4707" x2="24.4707" y1="16.6553" y2="19.9724">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M23.647,19.942c-0.455,0-0.824-0.369-0.824-0.825V17.47  c0-0.452,0.369-0.822,0.824-0.822h1.646c0.457,0,0.824,0.37,0.824,0.822v1.647c0,0.456-0.367,0.825-0.824,0.825H23.647z" fill="url(#SVGID_9_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="24.4707" x2="24.4707" y1="17.0283" y2="19.5925">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.705,19.117c0,0.229-0.184,0.412-0.411,0.412h-1.646c-0.229,0-0.412-0.184-0.412-0.412V17.47  c0-0.226,0.184-0.411,0.412-0.411h1.646c0.228,0,0.411,0.186,0.411,0.411V19.117z" fill="url(#SVGID_10_)"/>
-<path d="M20.765,19.942h-1.646c-0.455,0-0.824-0.369-0.824-0.825v0.412  c0,0.455,0.369,0.824,0.824,0.824h1.646c0.453,0,0.824-0.369,0.824-0.824v-0.412C21.589,19.573,21.218,19.942,20.765,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M20.765,19.942h-1.646c-0.455,0-0.824-0.369-0.824-0.825v0.412  c0,0.455,0.369,0.824,0.824,0.824h1.646c0.453,0,0.824-0.369,0.824-0.824v-0.412C21.589,19.573,21.218,19.942,20.765,19.942z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="19.9414" x2="19.9414" y1="16.6152" y2="20.0124">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M19.118,19.942c-0.455,0-0.824-0.369-0.824-0.825V17.47  c0-0.452,0.369-0.822,0.824-0.822h1.646c0.453,0,0.824,0.37,0.824,0.822v1.647c0,0.456-0.371,0.825-0.824,0.825H19.118z" fill="url(#SVGID_11_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="19.9414" x2="19.9414" y1="17.0283" y2="19.5925">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M21.177,19.117c0,0.229-0.185,0.412-0.412,0.412h-1.646c-0.228,0-0.412-0.184-0.412-0.412V17.47  c0-0.226,0.185-0.411,0.412-0.411h1.646c0.228,0,0.412,0.186,0.412,0.411V19.117z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="15.4126" x2="15.4126" y1="16.6152" y2="19.9724">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M14.587,19.942c-0.452,0-0.821-0.369-0.821-0.825V17.47  c0-0.452,0.369-0.822,0.821-0.822h1.647c0.454,0,0.825,0.37,0.825,0.822v1.647c0,0.456-0.371,0.825-0.825,0.825H14.587z" fill="url(#SVGID_13_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M16.234,19.942h-1.647c-0.452,0-0.821-0.369-0.821-0.825v0.412  c0,0.455,0.369,0.824,0.821,0.824h1.647c0.454,0,0.825-0.369,0.825-0.824v-0.412C17.06,19.573,16.688,19.942,16.234,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M16.234,19.942h-1.647c-0.452,0-0.821-0.369-0.821-0.825v0.412  c0,0.455,0.369,0.824,0.821,0.824h1.647c0.454,0,0.825-0.369,0.825-0.824v-0.412C17.06,19.573,16.688,19.942,16.234,19.942z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="15.4116" x2="15.4116" y1="17.0283" y2="19.5925">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M16.647,19.117c0,0.229-0.184,0.412-0.413,0.412h-1.647c-0.227,0-0.41-0.184-0.41-0.412V17.47  c0-0.226,0.184-0.411,0.41-0.411h1.647c0.229,0,0.413,0.186,0.413,0.411V19.117z" fill="url(#SVGID_14_)"/>
-<path d="M25.294,15.822h-1.646c-0.455,0-0.824-0.369-0.824-0.822v0.411  c0,0.455,0.369,0.824,0.824,0.824h1.646c0.457,0,0.824-0.369,0.824-0.824V15C26.118,15.453,25.751,15.822,25.294,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.294,15.822h-1.646c-0.455,0-0.824-0.369-0.824-0.822v0.411  c0,0.455,0.369,0.824,0.824,0.824h1.646c0.457,0,0.824-0.369,0.824-0.824V15C26.118,15.453,25.751,15.822,25.294,15.822z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="24.4707" x2="24.4707" y1="12.5381" y2="15.8522">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M23.647,15.822c-0.455,0-0.824-0.369-0.824-0.822v-1.647  c0-0.452,0.369-0.822,0.824-0.822h1.646c0.457,0,0.824,0.37,0.824,0.822V15c0,0.453-0.367,0.822-0.824,0.822H23.647z" fill="url(#SVGID_15_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="24.4707" x2="24.4707" y1="12.9106" y2="15.4738">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.705,15c0,0.228-0.184,0.411-0.411,0.411h-1.646c-0.229,0-0.412-0.184-0.412-0.411v-1.647  c0-0.228,0.184-0.411,0.412-0.411h1.646c0.228,0,0.411,0.184,0.411,0.411V15z" fill="url(#SVGID_16_)"/>
-<path d="M20.765,15.822h-1.646c-0.455,0-0.824-0.369-0.824-0.822v0.411  c0,0.455,0.369,0.824,0.824,0.824h1.646c0.453,0,0.824-0.369,0.824-0.824V15C21.589,15.453,21.218,15.822,20.765,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M20.765,15.822h-1.646c-0.455,0-0.824-0.369-0.824-0.822v0.411  c0,0.455,0.369,0.824,0.824,0.824h1.646c0.453,0,0.824-0.369,0.824-0.824V15C21.589,15.453,21.218,15.822,20.765,15.822z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="19.9414" x2="19.9414" y1="12.498" y2="15.8922">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M19.118,15.822c-0.455,0-0.824-0.369-0.824-0.822v-1.647  c0-0.452,0.369-0.822,0.824-0.822h1.646c0.453,0,0.824,0.37,0.824,0.822V15c0,0.453-0.371,0.822-0.824,0.822H19.118z" fill="url(#SVGID_17_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="19.9414" x2="19.9414" y1="12.9106" y2="15.4738">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M21.177,15c0,0.228-0.185,0.411-0.412,0.411h-1.646c-0.228,0-0.412-0.184-0.412-0.411v-1.647  c0-0.228,0.185-0.411,0.412-0.411h1.646c0.228,0,0.412,0.184,0.412,0.411V15z" fill="url(#SVGID_18_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="15.4126" x2="15.4126" y1="12.498" y2="15.8522">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M14.587,15.822c-0.452,0-0.821-0.369-0.821-0.822v-1.647  c0-0.452,0.369-0.822,0.821-0.822h1.647c0.454,0,0.825,0.37,0.825,0.822V15c0,0.453-0.371,0.822-0.825,0.822H14.587z" fill="url(#SVGID_19_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M16.234,15.822h-1.647c-0.452,0-0.821-0.369-0.821-0.822v0.411  c0,0.455,0.369,0.824,0.821,0.824h1.647c0.454,0,0.825-0.369,0.825-0.824V15C17.06,15.453,16.688,15.822,16.234,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M16.234,15.822h-1.647c-0.452,0-0.821-0.369-0.821-0.822v0.411  c0,0.455,0.369,0.824,0.821,0.824h1.647c0.454,0,0.825-0.369,0.825-0.824V15C17.06,15.453,16.688,15.822,16.234,15.822z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="15.4116" x2="15.4116" y1="12.9106" y2="15.4738">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M16.647,15c0,0.228-0.184,0.411-0.413,0.411h-1.647c-0.227,0-0.41-0.184-0.41-0.411v-1.647  c0-0.228,0.184-0.411,0.41-0.411h1.647c0.229,0,0.413,0.184,0.413,0.411V15z" fill="url(#SVGID_20_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="19.9434" x2="19.9434" y1="7.5977" y2="11.732">
-<stop offset="0" style="stop-color:#686C6E"/>
-<stop offset="1" style="stop-color:#E4EEF2"/>
+<stop offset="0" style="stop-color:#6A6B6C"/>
+<stop offset="1" style="stop-color:#E8EEEA"/>
 </linearGradient>
 <path d="M13.354,11.705c-0.454,0-0.825-0.374-0.825-0.832v-2.45  c0-0.461,0.371-0.834,0.825-0.834h13.181c0.454,0,0.823,0.373,0.823,0.834v2.45c0,0.458-0.369,0.832-0.823,0.832H13.354z" fill="url(#SVGID_21_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.9424" x2="19.9424" y1="8.0195" y2="11.3512">
@@ -201,63 +201,63 @@
 </linearGradient>
 <path d="M26.942,10.873c0,0.229-0.184,0.416-0.412,0.416H13.354c-0.227,0-0.411-0.187-0.411-0.416v-2.45  c0-0.23,0.185-0.417,0.411-0.417H26.53c0.229,0,0.412,0.187,0.412,0.417V10.873z" fill="url(#SVGID_22_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.9424" x2="19.9424" y1="3.9609" y2="12.5901">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#30A4D5"/>
-<stop offset="0.8727" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1C65C3"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#6292A3"/>
+<stop offset="0.8727" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#4E6591"/>
 </linearGradient>
 <rect fill="url(#SVGID_23_)" height="2.45" width="13.177" x="13.354" y="8.423"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="19.9424" x2="19.9424" y1="5.6362" y2="11.6377">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#4FADD5"/>
-<stop offset="0.8727" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1C65C3"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#77A6AD"/>
+<stop offset="0.8727" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#4E6591"/>
 </linearGradient>
 <polygon fill="url(#SVGID_24_)" points="13.354,9.51 26.53,8.807 26.53,8.412 13.354,8.412 "/>
 <path d="M2.234,21.177c0,2.27,1.849,4.117,4.12,4.117h0.822c2.27,0,4.117-1.848,4.117-4.117V6.354  H4.706H2.647c-0.147,0-0.277,0.046-0.413,0.083V21.177z" fill="#050505" fill-opacity="0.1" stroke-opacity="0.1"/>
 <path d="M6.354,24.883h0.822c2.043,0,3.705-1.662,3.705-3.706V6.354H4.706H2.647v14.823  C2.647,23.221,4.31,24.883,6.354,24.883z" fill="#050505" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="6.7656" x2="6.7656" y1="3.1465" y2="24.8751">
-<stop offset="0" style="stop-color:#727678"/>
-<stop offset="0.7394" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+<stop offset="0" style="stop-color:#747576"/>
+<stop offset="0.7394" style="stop-color:#262628"/>
+<stop offset="1" style="stop-color:#4B4B4D"/>
 </linearGradient>
 <path d="M10.472,21.177c0,1.819-1.475,3.294-3.295,3.294H6.354c-1.82,0-3.295-1.475-3.295-3.294V6.354  c0-1.819,1.475-3.295,3.295-3.295h0.822c1.82,0,3.295,1.476,3.295,3.295V21.177z" fill="url(#SVGID_25_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="6.7656" x2="6.7656" y1="3.082" y2="8.9318">
-<stop offset="0" style="stop-color:#B5BCBF"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+<stop offset="0" style="stop-color:#B8BCBB"/>
+<stop offset="1" style="stop-color:#4B4B4D"/>
 </linearGradient>
 <path d="M7.177,3.059H6.354c-1.82,0-3.295,1.476-3.295,3.295v2.47c0-1.819,1.475-3.295,3.295-3.295h0.822  c1.82,0,3.295,1.476,3.295,3.295v-2.47C10.472,4.534,8.997,3.059,7.177,3.059z" fill="url(#SVGID_26_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="6.7656" x2="6.7656" y1="3.0688" y2="7.2577">
-<stop offset="0" style="stop-color:#D5DDE0"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+<stop offset="0" style="stop-color:#D8DDDA"/>
+<stop offset="1" style="stop-color:#4B4B4D"/>
 </linearGradient>
 <path d="M7.177,3.059H6.354c-1.82,0-3.295,1.476-3.295,3.295v0.411c0-1.818,1.475-3.295,3.295-3.295h0.822  c1.82,0,3.295,1.477,3.295,3.295V6.354C10.472,4.534,8.997,3.059,7.177,3.059z" fill="url(#SVGID_27_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="6.7646" x2="6.7646" y1="2.7354" y2="24.6086">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="0.7576" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#1F2021"/>
+<stop offset="0" style="stop-color:#A2A6A5"/>
+<stop offset="0.7576" style="stop-color:#262628"/>
+<stop offset="1" style="stop-color:#202020"/>
 </linearGradient>
 <path d="M7.177,5.528H6.354c-0.439,0-0.855,0.087-1.236,0.244V22h3.293V5.772  C8.03,5.615,7.614,5.528,7.177,5.528z" fill="url(#SVGID_28_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="6.7656" x2="6.7656" y1="18.7295" y2="24.5792">
-<stop offset="0" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#5A5D61"/>
+<stop offset="0" style="stop-color:#262628"/>
+<stop offset="1" style="stop-color:#5C5D5F"/>
 </linearGradient>
 <path d="M7.177,22H6.354c-1.82,0-3.295-1.476-3.295-3.294v2.471c0,1.819,1.475,3.294,3.295,3.294h0.822  c1.82,0,3.295-1.475,3.295-3.294v-2.471C10.472,20.524,8.997,22,7.177,22z" fill="url(#SVGID_29_)"/>
 <rect fill="none" height="30" width="30"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -224.75 -299.25)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="492.5" x2="492.5" y1="-626.4292" y2="-656.4292">
-<stop offset="0" style="stop-color:#FFE1A3"/>
-<stop offset="0.297" style="stop-color:#FFE1A3"/>
-<stop offset="0.6667" style="stop-color:#AD4C01"/>
-<stop offset="1" style="stop-color:#FFE1A3"/>
+<stop offset="0" style="stop-color:#E3DBBF"/>
+<stop offset="0.297" style="stop-color:#E3DBBF"/>
+<stop offset="0.6667" style="stop-color:#794335"/>
+<stop offset="1" style="stop-color:#E3DBBF"/>
 </linearGradient>
 <path d="M21.5,29c-4.137,0-7.5-3.363-7.5-7.5c0-4.135,3.363-7.5,7.5-7.5c4.136,0,7.5,3.365,7.5,7.5  C29,25.637,25.636,29,21.5,29L21.5,29z" fill="url(#SVGID_30_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="21.501" x2="21.501" y1="14.4502" y2="28.2501">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="0.297" style="stop-color:#FFC144"/>
-<stop offset="0.6667" style="stop-color:#EF6902"/>
-<stop offset="1" style="stop-color:#FEB037"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="0.297" style="stop-color:#C7B17C"/>
+<stop offset="0.6667" style="stop-color:#A86F49"/>
+<stop offset="1" style="stop-color:#C2A673"/>
 </linearGradient>
 <path d="M28.501,21.5c0,3.866-3.137,7-7.001,7c-3.866,0-6.999-3.134-6.999-7c0-3.864,3.133-7,6.999-7  C25.364,14.5,28.501,17.636,28.501,21.5z" fill="url(#SVGID_31_)"/>
 <polygon fill-opacity="0.3" points="25.703,22.889 21.499,18.435 17.297,22.889 16.658,22.209 21.499,17.077 26.342,22.209   25.703,22.889 " stroke-opacity="0.3"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_work.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_work.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_work.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,29 +3,29 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+<stop offset="0" style="stop-color:#93AC5D"/>
+<stop offset="0.297" style="stop-color:#93AC5D"/>
+<stop offset="0.6667" style="stop-color:#356742"/>
+<stop offset="0.7939" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#447B42"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399  c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514  c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737  c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12  c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B1BE95" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B1BE95" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+<stop offset="0" style="stop-color:#315D3E"/>
+<stop offset="0.5" style="stop-color:#1E3A31"/>
+<stop offset="1" style="stop-color:#2E593D"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31  c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535  c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
@@ -33,166 +33,166 @@
 <g transform="matrix(1 0 0 1 30 30)">
 <path d="M21.5,30c-2.037,0-3.985-0.729-5.531-2.059H2.647C1.188,27.941,0,26.754,0,25.294V8  c0-1.295,0.936-2.376,2.167-2.603c0.436-1.91,2.147-3.339,4.187-3.339h0.822c2.024,0,3.727,1.407,4.178,3.295h15.999  C28.813,5.354,30,6.541,30,8v17.294c0,1.46-1.188,2.647-2.647,2.647H27.03C25.484,29.271,23.537,30,21.5,30L21.5,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.9995" x2="14.9995" y1="6.1143" y2="26.7026">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M29,25.294c0,0.909-0.738,1.647-1.647,1.647H2.647C1.738,26.941,1,26.203,1,25.294V8  c0-0.908,0.738-1.646,1.647-1.646h24.705C28.262,6.354,29,7.092,29,8V25.294z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9995" x2="14.9995" y1="6.1143" y2="26.7026">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M27.353,6.354H2.647C1.738,6.354,1,7.092,1,8v17.294c0,0.909,0.738,1.647,1.647,1.647  c-0.682,0-1.235-0.554-1.235-1.236v-0.411V8.412V8c0-0.682,0.554-1.235,1.235-1.235h24.705c0.683,0,1.235,0.554,1.235,1.235v0.412  v16.882v0.411c0,0.683-0.553,1.236-1.235,1.236c0.909,0,1.647-0.738,1.647-1.647V8C29,7.092,28.262,6.354,27.353,6.354z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="24.4707" x2="24.4707" y1="20.7725" y2="24.0876">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M23.647,24.058c-0.454,0-0.823-0.368-0.823-0.822v-1.646  c0-0.455,0.369-0.824,0.823-0.824h1.647c0.455,0,0.823,0.369,0.823,0.824v1.646c0,0.454-0.368,0.822-0.823,0.822H23.647z" fill="url(#SVGID_3__)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="24.4707" x2="24.4707" y1="21.1465" y2="23.7097">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.705,23.235c0,0.228-0.184,0.411-0.41,0.411h-1.647c-0.228,0-0.411-0.184-0.411-0.411v-1.646  c0-0.229,0.184-0.412,0.411-0.412h1.647c0.227,0,0.41,0.183,0.41,0.412V23.235z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="19.9424" x2="19.9424" y1="20.7324" y2="24.1276">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M19.118,24.058c-0.454,0-0.823-0.368-0.823-0.822v-1.646  c0-0.455,0.369-0.824,0.823-0.824h1.646c0.455,0,0.826,0.369,0.826,0.824v1.646c0,0.454-0.371,0.822-0.826,0.822H19.118z" fill="url(#SVGID_5_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="19.9404" x2="19.9404" y1="21.1465" y2="23.7097">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M21.176,23.235c0,0.228-0.184,0.411-0.412,0.411h-1.646c-0.228,0-0.413-0.184-0.413-0.411v-1.646  c0-0.229,0.186-0.412,0.413-0.412h1.646c0.229,0,0.412,0.183,0.412,0.412V23.235z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.4126" x2="15.4126" y1="20.7324" y2="24.0876">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M14.588,24.058c-0.453,0-0.822-0.368-0.822-0.822v-1.646  c0-0.455,0.369-0.824,0.822-0.824h1.646c0.455,0,0.825,0.369,0.825,0.824v1.646c0,0.454-0.37,0.822-0.825,0.822H14.588z" fill="url(#SVGID_7_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="15.4116" x2="15.4116" y1="21.1465" y2="23.7097">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M16.647,23.235c0,0.228-0.185,0.411-0.413,0.411h-1.646c-0.228,0-0.412-0.184-0.412-0.411v-1.646  c0-0.229,0.185-0.412,0.412-0.412h1.646c0.229,0,0.413,0.183,0.413,0.412V23.235z" fill="url(#SVGID_8_)"/>
-<path d="M25.295,19.942h-1.647c-0.454,0-0.823-0.369-0.823-0.825v0.412  c0,0.455,0.369,0.824,0.823,0.824h1.647c0.455,0,0.823-0.369,0.823-0.824v-0.412C26.118,19.573,25.75,19.942,25.295,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.295,19.942h-1.647c-0.454,0-0.823-0.369-0.823-0.825v0.412  c0,0.455,0.369,0.824,0.823,0.824h1.647c0.455,0,0.823-0.369,0.823-0.824v-0.412C26.118,19.573,25.75,19.942,25.295,19.942z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="24.4707" x2="24.4707" y1="16.6553" y2="19.9724">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M23.647,19.942c-0.454,0-0.823-0.369-0.823-0.825V17.47  c0-0.452,0.369-0.822,0.823-0.822h1.647c0.455,0,0.823,0.37,0.823,0.822v1.647c0,0.456-0.368,0.825-0.823,0.825H23.647z" fill="url(#SVGID_9_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="24.4707" x2="24.4707" y1="17.0283" y2="19.5925">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.705,19.117c0,0.229-0.184,0.412-0.41,0.412h-1.647c-0.228,0-0.411-0.184-0.411-0.412V17.47  c0-0.226,0.184-0.411,0.411-0.411h1.647c0.227,0,0.41,0.186,0.41,0.411V19.117z" fill="url(#SVGID_10_)"/>
-<path d="M20.764,19.942h-1.646c-0.454,0-0.823-0.369-0.823-0.825v0.412  c0,0.455,0.369,0.824,0.823,0.824h1.646c0.455,0,0.826-0.369,0.826-0.824v-0.412C21.59,19.573,21.219,19.942,20.764,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M20.764,19.942h-1.646c-0.454,0-0.823-0.369-0.823-0.825v0.412  c0,0.455,0.369,0.824,0.823,0.824h1.646c0.455,0,0.826-0.369,0.826-0.824v-0.412C21.59,19.573,21.219,19.942,20.764,19.942z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="19.9424" x2="19.9424" y1="16.6152" y2="20.0124">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M19.118,19.942c-0.454,0-0.823-0.369-0.823-0.825V17.47  c0-0.452,0.369-0.822,0.823-0.822h1.646c0.455,0,0.826,0.37,0.826,0.822v1.647c0,0.456-0.371,0.825-0.826,0.825H19.118z" fill="url(#SVGID_11_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="19.9404" x2="19.9404" y1="17.0283" y2="19.5925">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M21.176,19.117c0,0.229-0.184,0.412-0.412,0.412h-1.646c-0.228,0-0.413-0.184-0.413-0.412V17.47  c0-0.226,0.186-0.411,0.413-0.411h1.646c0.229,0,0.412,0.186,0.412,0.411V19.117z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="15.4126" x2="15.4126" y1="16.6152" y2="19.9724">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M14.588,19.942c-0.453,0-0.822-0.369-0.822-0.825V17.47  c0-0.452,0.369-0.822,0.822-0.822h1.646c0.455,0,0.825,0.37,0.825,0.822v1.647c0,0.456-0.37,0.825-0.825,0.825H14.588z" fill="url(#SVGID_13_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M16.234,19.942h-1.646c-0.453,0-0.822-0.369-0.822-0.825v0.412  c0,0.455,0.369,0.824,0.822,0.824h1.646c0.455,0,0.825-0.369,0.825-0.824v-0.412C17.06,19.573,16.689,19.942,16.234,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M16.234,19.942h-1.646c-0.453,0-0.822-0.369-0.822-0.825v0.412  c0,0.455,0.369,0.824,0.822,0.824h1.646c0.455,0,0.825-0.369,0.825-0.824v-0.412C17.06,19.573,16.689,19.942,16.234,19.942z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="15.4116" x2="15.4116" y1="17.0283" y2="19.5925">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M16.647,19.117c0,0.229-0.185,0.412-0.413,0.412h-1.646c-0.228,0-0.412-0.184-0.412-0.412V17.47  c0-0.226,0.185-0.411,0.412-0.411h1.646c0.229,0,0.413,0.186,0.413,0.411V19.117z" fill="url(#SVGID_14_)"/>
-<path d="M25.295,15.822h-1.647c-0.454,0-0.823-0.369-0.823-0.822v0.411  c0,0.455,0.369,0.824,0.823,0.824h1.647c0.455,0,0.823-0.369,0.823-0.824V15C26.118,15.453,25.75,15.822,25.295,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.295,15.822h-1.647c-0.454,0-0.823-0.369-0.823-0.822v0.411  c0,0.455,0.369,0.824,0.823,0.824h1.647c0.455,0,0.823-0.369,0.823-0.824V15C26.118,15.453,25.75,15.822,25.295,15.822z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="24.4707" x2="24.4707" y1="12.5381" y2="15.8522">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M23.647,15.822c-0.454,0-0.823-0.369-0.823-0.822v-1.647  c0-0.452,0.369-0.822,0.823-0.822h1.647c0.455,0,0.823,0.37,0.823,0.822V15c0,0.453-0.368,0.822-0.823,0.822H23.647z" fill="url(#SVGID_15_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="24.4707" x2="24.4707" y1="12.9106" y2="15.4738">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M25.705,15c0,0.228-0.184,0.411-0.41,0.411h-1.647c-0.228,0-0.411-0.184-0.411-0.411v-1.647  c0-0.228,0.184-0.411,0.411-0.411h1.647c0.227,0,0.41,0.184,0.41,0.411V15z" fill="url(#SVGID_16_)"/>
-<path d="M20.764,15.822h-1.646c-0.454,0-0.823-0.369-0.823-0.822v0.411  c0,0.455,0.369,0.824,0.823,0.824h1.646c0.455,0,0.826-0.369,0.826-0.824V15C21.59,15.453,21.219,15.822,20.764,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M20.764,15.822h-1.646c-0.454,0-0.823-0.369-0.823-0.822v0.411  c0,0.455,0.369,0.824,0.823,0.824h1.646c0.455,0,0.826-0.369,0.826-0.824V15C21.59,15.453,21.219,15.822,20.764,15.822z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="19.9424" x2="19.9424" y1="12.498" y2="15.8922">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M19.118,15.822c-0.454,0-0.823-0.369-0.823-0.822v-1.647  c0-0.452,0.369-0.822,0.823-0.822h1.646c0.455,0,0.826,0.37,0.826,0.822V15c0,0.453-0.371,0.822-0.826,0.822H19.118z" fill="url(#SVGID_17_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="19.9404" x2="19.9404" y1="12.9106" y2="15.4738">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M21.176,15c0,0.228-0.184,0.411-0.412,0.411h-1.646c-0.228,0-0.413-0.184-0.413-0.411v-1.647  c0-0.228,0.186-0.411,0.413-0.411h1.646c0.229,0,0.412,0.184,0.412,0.411V15z" fill="url(#SVGID_18_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="15.4126" x2="15.4126" y1="12.498" y2="15.8522">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M14.588,15.822c-0.453,0-0.822-0.369-0.822-0.822v-1.647  c0-0.452,0.369-0.822,0.822-0.822h1.646c0.455,0,0.825,0.37,0.825,0.822V15c0,0.453-0.37,0.822-0.825,0.822H14.588z" fill="url(#SVGID_19_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M16.234,15.822h-1.646c-0.453,0-0.822-0.369-0.822-0.822v0.411  c0,0.455,0.369,0.824,0.822,0.824h1.646c0.455,0,0.825-0.369,0.825-0.824V15C17.06,15.453,16.689,15.822,16.234,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M16.234,15.822h-1.646c-0.453,0-0.822-0.369-0.822-0.822v0.411  c0,0.455,0.369,0.824,0.822,0.824h1.646c0.455,0,0.825-0.369,0.825-0.824V15C17.06,15.453,16.689,15.822,16.234,15.822z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="15.4116" x2="15.4116" y1="12.9106" y2="15.4738">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M16.647,15c0,0.228-0.185,0.411-0.413,0.411h-1.646c-0.228,0-0.412-0.184-0.412-0.411v-1.647  c0-0.228,0.185-0.411,0.412-0.411h1.646c0.229,0,0.413,0.184,0.413,0.411V15z" fill="url(#SVGID_20_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="19.9434" x2="19.9434" y1="7.5977" y2="11.732">
-<stop offset="0" style="stop-color:#686C6E"/>
-<stop offset="1" style="stop-color:#E4EEF2"/>
+<stop offset="0" style="stop-color:#6A6B6C"/>
+<stop offset="1" style="stop-color:#E8EEEA"/>
 </linearGradient>
 <path d="M13.354,11.705c-0.453,0-0.824-0.374-0.824-0.832v-2.45  c0-0.461,0.371-0.834,0.824-0.834h13.181c0.454,0,0.823,0.373,0.823,0.834v2.45c0,0.458-0.369,0.832-0.823,0.832H13.354z" fill="url(#SVGID_21_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.9414" x2="19.9414" y1="8.0195" y2="11.3512">
@@ -201,61 +201,61 @@
 </linearGradient>
 <path d="M26.941,10.873c0,0.229-0.183,0.416-0.41,0.416H13.354c-0.227,0-0.412-0.187-0.412-0.416v-2.45  c0-0.23,0.186-0.417,0.412-0.417h13.178c0.228,0,0.41,0.187,0.41,0.417V10.873z" fill="url(#SVGID_22_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.9424" x2="19.9424" y1="3.9609" y2="12.5901">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#30A4D5"/>
-<stop offset="0.8727" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1C65C3"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#6292A3"/>
+<stop offset="0.8727" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#4E6591"/>
 </linearGradient>
 <rect fill="url(#SVGID_23_)" height="2.45" width="13.178" x="13.354" y="8.423"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="19.9424" x2="19.9424" y1="5.6362" y2="11.6377">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#4FADD5"/>
-<stop offset="0.8727" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1C65C3"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#77A6AD"/>
+<stop offset="0.8727" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#4E6591"/>
 </linearGradient>
 <polygon fill="url(#SVGID_24_)" points="13.354,9.51 26.531,8.807 26.531,8.412 13.354,8.412 "/>
 <path d="M2.234,21.177c0,2.27,1.849,4.117,4.119,4.117h0.822c2.27,0,4.119-1.848,4.119-4.117V6.354  h-6.59H2.647c-0.147,0-0.277,0.046-0.413,0.083V21.177z" fill="#050505" fill-opacity="0.1" stroke-opacity="0.1"/>
 <path d="M6.354,24.883h0.822c2.045,0,3.706-1.662,3.706-3.706V6.354H4.705H2.647v14.823  C2.647,23.221,4.31,24.883,6.354,24.883z" fill="#050505" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="6.7651" x2="6.7651" y1="3.1465" y2="24.8751">
-<stop offset="0" style="stop-color:#727678"/>
-<stop offset="0.7394" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+<stop offset="0" style="stop-color:#747576"/>
+<stop offset="0.7394" style="stop-color:#262628"/>
+<stop offset="1" style="stop-color:#4B4B4D"/>
 </linearGradient>
 <path d="M10.471,21.177c0,1.819-1.474,3.294-3.295,3.294H6.354c-1.82,0-3.294-1.475-3.294-3.294V6.354  c0-1.819,1.474-3.295,3.294-3.295h0.822c1.821,0,3.295,1.476,3.295,3.295V21.177z" fill="url(#SVGID_25_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="6.7651" x2="6.7651" y1="3.082" y2="8.9318">
-<stop offset="0" style="stop-color:#B5BCBF"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+<stop offset="0" style="stop-color:#B8BCBB"/>
+<stop offset="1" style="stop-color:#4B4B4D"/>
 </linearGradient>
 <path d="M7.176,3.059H6.354c-1.82,0-3.294,1.476-3.294,3.295v2.47c0-1.819,1.474-3.295,3.294-3.295h0.822  c1.821,0,3.295,1.476,3.295,3.295v-2.47C10.471,4.534,8.997,3.059,7.176,3.059z" fill="url(#SVGID_26_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="6.7651" x2="6.7651" y1="3.0688" y2="7.2577">
-<stop offset="0" style="stop-color:#D5DDE0"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+<stop offset="0" style="stop-color:#D8DDDA"/>
+<stop offset="1" style="stop-color:#4B4B4D"/>
 </linearGradient>
 <path d="M7.176,3.059H6.354c-1.82,0-3.294,1.476-3.294,3.295v0.411c0-1.818,1.474-3.295,3.294-3.295h0.822  c1.821,0,3.295,1.477,3.295,3.295V6.354C10.471,4.534,8.997,3.059,7.176,3.059z" fill="url(#SVGID_27_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="6.7642" x2="6.7642" y1="2.7354" y2="24.6086">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="0.7576" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#1F2021"/>
+<stop offset="0" style="stop-color:#A2A6A5"/>
+<stop offset="0.7576" style="stop-color:#262628"/>
+<stop offset="1" style="stop-color:#202020"/>
 </linearGradient>
 <path d="M7.176,5.528H6.354c-0.438,0-0.855,0.087-1.235,0.244V22H8.41V5.772  C8.03,5.615,7.613,5.528,7.176,5.528z" fill="url(#SVGID_28_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="6.7651" x2="6.7651" y1="18.7295" y2="24.5792">
-<stop offset="0" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#5A5D61"/>
+<stop offset="0" style="stop-color:#262628"/>
+<stop offset="1" style="stop-color:#5C5D5F"/>
 </linearGradient>
 <path d="M7.176,22H6.354c-1.82,0-3.294-1.476-3.294-3.294v2.471c0,1.819,1.474,3.294,3.294,3.294h0.822  c1.821,0,3.295-1.475,3.295-3.294v-2.471C10.471,20.524,8.997,22,7.176,22z" fill="url(#SVGID_29_)"/>
 <rect fill="none" height="30" width="30"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -224.75 -299.25)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="492.5" x2="492.5" y1="-626.4292" y2="-656.4292">
-<stop offset="0" style="stop-color:#B5BCBF"/>
-<stop offset="0.7091" style="stop-color:#494C4F"/>
-<stop offset="1" style="stop-color:#A8AFB2"/>
+<stop offset="0" style="stop-color:#B8BCBB"/>
+<stop offset="0.7091" style="stop-color:#4B4B4D"/>
+<stop offset="1" style="stop-color:#ABAFAF"/>
 </linearGradient>
 <path d="M21.5,29c-4.136,0-7.5-3.364-7.5-7.5c0-4.135,3.364-7.5,7.5-7.5c4.135,0,7.5,3.365,7.5,7.5  C29,25.636,25.635,29,21.5,29L21.5,29z" fill="url(#SVGID_30_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="21.5" x2="21.5" y1="14.4453" y2="28.4458">
-<stop offset="0" style="stop-color:#727678"/>
-<stop offset="0.7394" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+<stop offset="0" style="stop-color:#747576"/>
+<stop offset="0.7394" style="stop-color:#262628"/>
+<stop offset="1" style="stop-color:#4B4B4D"/>
 </linearGradient>
 <path d="M28.5,21.5c0,3.866-3.135,7-7,7c-3.866,0-7-3.134-7-7c0-3.865,3.134-7,7-7  C25.365,14.5,28.5,17.635,28.5,21.5z" fill="url(#SVGID_31_)"/>
 <polygon fill="#FFFFFF" points="23,18 23,19 25,19 25,20 23,20 23,21 25,21 25,22 23,22 23,25 26,25 26,18 "/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,29 +3,29 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+<stop offset="0" style="stop-color:#93AC5D"/>
+<stop offset="0.297" style="stop-color:#93AC5D"/>
+<stop offset="0.6667" style="stop-color:#356742"/>
+<stop offset="0.7939" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#447B42"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399  c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514  c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737  c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12  c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B1BE95" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B1BE95" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+<stop offset="0" style="stop-color:#315D3E"/>
+<stop offset="0.5" style="stop-color:#1E3A31"/>
+<stop offset="1" style="stop-color:#2E593D"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31  c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535  c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
@@ -34,25 +34,25 @@
 <polygon fill="none" points="7.52,0 0,0 0,30 7.52,30 22.479,30 30,30 30,0 22.479,0 "/>
 <path d="M7.52,30c-0.699,0-1.352-0.281-1.836-0.793l-0.039-0.041l-0.057-0.07c-0.045-0.047-0.123-0.146-0.193-0.254  l-0.031-0.049l-0.041-0.079c-0.031-0.044-0.094-0.16-0.146-0.284l-0.023-0.057l-0.033-0.117c-0.035-0.096-0.064-0.191-0.084-0.291  c-0.033-0.161-0.051-0.327-0.051-0.498V2.534C4.984,1.137,6.123,0,7.52,0h14.959c1.398,0,2.535,1.137,2.535,2.534v24.933  c0,0.171-0.018,0.337-0.051,0.498c-0.027,0.135-0.066,0.262-0.113,0.387c-0.074,0.188-0.137,0.314-0.207,0.428l-0.039,0.065  c-0.072,0.111-0.156,0.214-0.244,0.313C23.828,29.72,23.178,30,22.479,30H7.52z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.999" x2="14.999" y1="1" y2="28.9273">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M24.014,27.467c0,0.847-0.688,1.533-1.535,1.533H7.52c-0.848,0-1.535-0.687-1.535-1.533V2.534  C5.984,1.687,6.672,1,7.52,1h14.959c0.848,0,1.535,0.687,1.535,1.534V27.467z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.999" x2="14.999" y1="1" y2="28.45">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M22.479,1H7.52C6.672,1,5.984,1.687,5.984,2.534v24.933c0,0.409,0.164,0.779,0.424,1.055  c-0.021-0.094-0.039-0.188-0.039-0.287v-0.768V3.3V2.534c0-0.635,0.516-1.151,1.15-1.151h14.959c0.635,0,1.152,0.517,1.152,1.151  V3.3v24.167v0.768c0,0.099-0.018,0.193-0.041,0.287c0.26-0.275,0.424-0.646,0.424-1.055V2.534C24.014,1.687,23.326,1,22.479,1z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="2.9458" y2="21.7146">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <rect fill="url(#SVGID_3__)" fill-opacity="0.6" height="18.795" stroke-opacity="0.6" width="15.727" x="7.137" y="2.918"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.999" x2="14.999" y1="3.3267" y2="21.3309">
@@ -61,69 +61,69 @@
 </linearGradient>
 <rect fill="url(#SVGID_4__)" height="18.029" width="14.959" x="7.52" y="3.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="3.71" y2="20.9477">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="17.262" width="14.191" x="7.904" y="3.685"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15" x2="15" y1="3.9844" y2="10.8451">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+<stop offset="0" style="stop-color:#AADAC6"/>
+<stop offset="1" style="stop-color:#6A99AA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="22.096,9.821 7.904,11.356 7.904,4.067 22.096,4.067 "/>
-<rect fill="#9FE4FF" height="0.383" width="14.191" x="7.904" y="3.685"/>
+<rect fill="#BCE2D2" height="0.383" width="14.191" x="7.904" y="3.685"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9404" x2="14.9404" y1="22.1118" y2="27.8145">
-<stop offset="0" style="stop-color:#B6BBBD"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M13.553,27.851c-0.82,0-1.488-0.662-1.488-1.475v-2.805  c0-0.813,0.668-1.476,1.488-1.476h2.773c0.822,0,1.49,0.663,1.49,1.476v2.805c0,0.813-0.668,1.475-1.49,1.475H13.553z" fill="url(#SVGID_7_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M13.551,27.467c-0.607,0-1.104-0.489-1.104-1.091v-2.805c0-0.602,0.496-1.09,1.104-1.09h2.777  c0.609,0,1.105,0.488,1.105,1.09v2.805c0,0.602-0.496,1.091-1.105,1.091H13.551z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.9404" x2="14.9404" y1="22.8438" y2="27.0903">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M17.051,26.376c0,0.391-0.322,0.707-0.719,0.707h-2.785c-0.395,0-0.717-0.316-0.717-0.707v-2.805  c0-0.391,0.322-0.708,0.717-0.708h2.785c0.396,0,0.719,0.317,0.719,0.708V26.376z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.9404" x2="14.9404" y1="23.5933" y2="26.3081">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M14.363,26.316c-0.422,0-0.766-0.344-0.766-0.769v-1.149c0-0.424,0.344-0.769,0.766-0.769h1.152  c0.424,0,0.768,0.345,0.768,0.769v1.149c0,0.425-0.344,0.769-0.768,0.769H14.363z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="8.833" x2="8.833" y1="22.46" y2="27.0908">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M8.609,27.083c-0.811,0-1.473-0.66-1.473-1.476v-1.652  c0-0.813,0.662-1.474,1.473-1.474h0.443c0.814,0,1.477,0.66,1.477,1.474v1.652c0,0.815-0.662,1.476-1.477,1.476H8.609z" fill="url(#SVGID_10_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="8.832" x2="8.832" y1="22.8452" y2="26.7065">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M8.609,26.7c-0.6,0-1.09-0.49-1.09-1.093v-1.652c0-0.602,0.49-1.092,1.09-1.092h0.443  c0.604,0,1.092,0.49,1.092,1.092v1.652c0,0.603-0.488,1.093-1.092,1.093H8.609z" fill="url(#SVGID_11_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="8.833" x2="8.833" y1="23.2339" y2="26.3218">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M9.762,25.607c0,0.393-0.316,0.709-0.709,0.709H8.609c-0.389,0-0.705-0.316-0.705-0.709v-1.652  c0-0.392,0.316-0.707,0.705-0.707h0.443c0.393,0,0.709,0.315,0.709,0.707V25.607z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="20.835" x2="20.835" y1="22.46" y2="27.0908">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M20.615,27.083c-0.814,0-1.477-0.66-1.477-1.476v-1.652  c0-0.813,0.662-1.474,1.477-1.474h0.441c0.814,0,1.475,0.66,1.475,1.474v1.652c0,0.815-0.66,1.476-1.475,1.476H20.615z" fill="url(#SVGID_13_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="20.835" x2="20.835" y1="22.8452" y2="26.7065">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M20.615,26.7c-0.604,0-1.094-0.49-1.094-1.093v-1.652c0-0.602,0.49-1.092,1.094-1.092  h0.441c0.602,0,1.092,0.49,1.092,1.092v1.652c0,0.603-0.49,1.093-1.092,1.093H20.615z" fill="url(#SVGID_14_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="20.8359" x2="20.8359" y1="23.2339" y2="26.3218">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+<stop offset="0" style="stop-color:#C6B17B"/>
+<stop offset="0.7455" style="stop-color:#98604F"/>
+<stop offset="1" style="stop-color:#7F3736"/>
 </linearGradient>
 <path d="M21.766,25.607c0,0.393-0.318,0.709-0.709,0.709h-0.441c-0.393,0-0.709-0.316-0.709-0.709v-1.652  c0-0.392,0.316-0.707,0.709-0.707h0.441c0.391,0,0.709,0.315,0.709,0.707V25.607z" fill="url(#SVGID_15_)"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_home.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,29 +3,29 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+<stop offset="0" style="stop-color:#93AC5D"/>
+<stop offset="0.297" style="stop-color:#93AC5D"/>
+<stop offset="0.6667" style="stop-color:#356742"/>
+<stop offset="0.7939" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#447B42"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399  c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514  c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737  c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12  c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B1BE95" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B1BE95" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+<stop offset="0" style="stop-color:#315D3E"/>
+<stop offset="0.5" style="stop-color:#1E3A31"/>
+<stop offset="1" style="stop-color:#2E593D"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31  c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535  c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
@@ -33,25 +33,25 @@
 <g transform="matrix(1 0 0 1 30 30)">
 <path d="M7.521,30c-0.672,0-1.3-0.26-1.776-0.732l-0.053-0.04l-0.094-0.121c-0.045-0.045-0.13-0.151-0.204-0.268  l-0.058-0.101c-0.041-0.06-0.104-0.18-0.157-0.305l-0.024-0.059l-0.033-0.114c-0.035-0.101-0.066-0.199-0.086-0.302  c-0.032-0.155-0.049-0.324-0.049-0.492V2.534C4.986,1.137,6.123,0,7.521,0h14.96c1.396,0,2.533,1.137,2.533,2.534V13.77  C28.023,15.141,30,18.163,30,21.5c0,3.895-2.619,7.258-6.385,8.226C23.258,29.905,22.869,30,22.48,30H7.521z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.9995" x2="14.9995" y1="1" y2="28.9277">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M24.014,27.467c0,0.847-0.687,1.533-1.533,1.533H7.521c-0.847,0-1.534-0.687-1.534-1.533V2.534  C5.986,1.687,6.674,1,7.521,1h14.96c0.847,0,1.533,0.687,1.533,1.534V27.467z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9995" x2="14.9995" y1="1" y2="28.4505">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M22.48,1H7.521C6.674,1,5.986,1.687,5.986,2.534v24.933c0,0.409,0.162,0.779,0.424,1.055  c-0.023-0.094-0.041-0.188-0.041-0.287v-0.768V3.3V2.534c0-0.635,0.517-1.151,1.151-1.151h14.96c0.634,0,1.15,0.517,1.15,1.151V3.3  v24.167v0.768c0,0.099-0.018,0.193-0.041,0.287c0.261-0.275,0.424-0.646,0.424-1.055V2.534C24.014,1.687,23.327,1,22.48,1z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.9995" x2="14.9995" y1="2.9458" y2="21.7151">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <rect fill="url(#SVGID_3__)" fill-opacity="0.6" height="18.795" stroke-opacity="0.6" width="15.727" x="7.137" y="2.918"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15.0005" x2="15.0005" y1="3.3267" y2="21.3314">
@@ -60,83 +60,83 @@
 </linearGradient>
 <rect fill="url(#SVGID_4__)" height="18.029" width="14.96" x="7.521" y="3.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="3.71" y2="20.9482">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="17.262" width="14.191" x="7.904" y="3.685"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9995" x2="14.9995" y1="3.9844" y2="10.8451">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+<stop offset="0" style="stop-color:#AADAC6"/>
+<stop offset="1" style="stop-color:#6A99AA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="22.096,9.821 7.904,11.356 7.904,4.067 22.096,4.067 "/>
-<rect fill="#9FE4FF" height="0.383" width="14.191" x="7.904" y="3.685"/>
+<rect fill="#BCE2D2" height="0.383" width="14.191" x="7.904" y="3.685"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9409" x2="14.9409" y1="22.1113" y2="27.814">
-<stop offset="0" style="stop-color:#B6BBBD"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M13.555,27.851c-0.822,0-1.49-0.662-1.49-1.475v-2.805c0-0.813,0.668-1.476,1.49-1.476  h2.773c0.821,0,1.489,0.663,1.489,1.476v2.805c0,0.813-0.668,1.475-1.489,1.475H13.555z" fill="url(#SVGID_7_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M13.553,27.467c-0.609,0-1.105-0.489-1.105-1.091v-2.805c0-0.602,0.496-1.09,1.105-1.09h2.775  c0.61,0,1.105,0.488,1.105,1.09v2.805c0,0.602-0.495,1.091-1.105,1.091H13.553z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.9409" x2="14.9409" y1="22.8438" y2="27.0903">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M17.051,26.376c0,0.391-0.322,0.707-0.719,0.707h-2.783c-0.396,0-0.718-0.316-0.718-0.707v-2.805  c0-0.391,0.321-0.708,0.718-0.708h2.783c0.396,0,0.719,0.317,0.719,0.708V26.376z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.9409" x2="14.9409" y1="23.5928" y2="26.3076">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M14.365,26.316c-0.423,0-0.767-0.344-0.767-0.769v-1.149c0-0.424,0.344-0.769,0.767-0.769h1.151  c0.423,0,0.767,0.345,0.767,0.769v1.149c0,0.425-0.344,0.769-0.767,0.769H14.365z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="8.833" x2="8.833" y1="22.46" y2="27.0908">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M8.611,27.083c-0.813,0-1.475-0.66-1.475-1.476v-1.652  c0-0.813,0.662-1.474,1.475-1.474h0.443c0.813,0,1.475,0.66,1.475,1.474v1.652c0,0.815-0.661,1.476-1.475,1.476H8.611z" fill="url(#SVGID_10_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="8.8335" x2="8.8335" y1="22.8457" y2="26.707">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M8.611,26.7c-0.602,0-1.091-0.49-1.091-1.093v-1.652c0-0.602,0.489-1.092,1.091-1.092  h0.443c0.603,0,1.092,0.49,1.092,1.092v1.652c0,0.603-0.489,1.093-1.092,1.093H8.611z" fill="url(#SVGID_11_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="8.834" x2="8.834" y1="23.2334" y2="26.3213">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M9.764,25.607c0,0.393-0.318,0.709-0.709,0.709H8.611c-0.39,0-0.707-0.316-0.707-0.709v-1.652  c0-0.392,0.317-0.707,0.707-0.707h0.443c0.391,0,0.709,0.315,0.709,0.707V25.607z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="20.8359" x2="20.8359" y1="22.46" y2="27.0908">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M20.615,27.083c-0.813,0-1.476-0.66-1.476-1.476v-1.652  c0-0.813,0.662-1.474,1.476-1.474h0.441c0.814,0,1.477,0.66,1.477,1.474v1.652c0,0.815-0.662,1.476-1.477,1.476H20.615z" fill="url(#SVGID_13_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="20.8359" x2="20.8359" y1="22.8457" y2="26.707">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M20.615,26.7c-0.603,0-1.092-0.49-1.092-1.093v-1.652  c0-0.602,0.489-1.092,1.092-1.092h0.441c0.603,0,1.092,0.49,1.092,1.092v1.652c0,0.603-0.489,1.093-1.092,1.093H20.615z" fill="url(#SVGID_14_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="20.8359" x2="20.8359" y1="23.2334" y2="26.3213">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+<stop offset="0" style="stop-color:#C6B17B"/>
+<stop offset="0.7455" style="stop-color:#98604F"/>
+<stop offset="1" style="stop-color:#7F3736"/>
 </linearGradient>
 <path d="M21.766,25.607c0,0.393-0.317,0.709-0.709,0.709h-0.441c-0.392,0-0.709-0.316-0.709-0.709v-1.652  c0-0.392,0.317-0.707,0.709-0.707h0.441c0.392,0,0.709,0.315,0.709,0.707V25.607z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -224.75 -299.25)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="492.5" x2="492.5" y1="-626.4292" y2="-656.4292">
-<stop offset="0" style="stop-color:#FFE1A3"/>
-<stop offset="0.297" style="stop-color:#FFE1A3"/>
-<stop offset="0.6667" style="stop-color:#AD4C01"/>
-<stop offset="1" style="stop-color:#FFE1A3"/>
+<stop offset="0" style="stop-color:#E3DBBF"/>
+<stop offset="0.297" style="stop-color:#E3DBBF"/>
+<stop offset="0.6667" style="stop-color:#794335"/>
+<stop offset="1" style="stop-color:#E3DBBF"/>
 </linearGradient>
 <path d="M21.5,29c-4.137,0-7.5-3.363-7.5-7.5c0-4.135,3.363-7.5,7.5-7.5c4.135,0,7.5,3.365,7.5,7.5  C29,25.637,25.635,29,21.5,29L21.5,29z" fill="url(#SVGID_16_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="21.5" x2="21.5" y1="14.3818" y2="28.3359">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="0.297" style="stop-color:#FFC144"/>
-<stop offset="0.6667" style="stop-color:#EF6902"/>
-<stop offset="1" style="stop-color:#FEB037"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="0.297" style="stop-color:#C7B17C"/>
+<stop offset="0.6667" style="stop-color:#A86F49"/>
+<stop offset="1" style="stop-color:#C2A673"/>
 </linearGradient>
 <path d="M28.5,21.5c0,3.866-3.136,7-7,7c-3.867,0-7-3.134-7-7c0-3.864,3.133-7,7-7  C25.364,14.5,28.5,17.636,28.5,21.5z" fill="url(#SVGID_17_)"/>
 <polygon fill-opacity="0.3" points="25.703,22.889 21.499,18.435 17.297,22.889 16.658,22.209 21.499,17.077 26.342,22.209   25.703,22.889 " stroke-opacity="0.3"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_work.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_work.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_work.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,29 +3,29 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+<stop offset="0" style="stop-color:#93AC5D"/>
+<stop offset="0.297" style="stop-color:#93AC5D"/>
+<stop offset="0.6667" style="stop-color:#356742"/>
+<stop offset="0.7939" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#447B42"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399  c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514  c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737  c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12  c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B1BE95" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B1BE95" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+<stop offset="0" style="stop-color:#315D3E"/>
+<stop offset="0.5" style="stop-color:#1E3A31"/>
+<stop offset="1" style="stop-color:#2E593D"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31  c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535  c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
@@ -33,25 +33,25 @@
 <g transform="matrix(1 0 0 1 30 30)">
 <path d="M7.52,30c-0.699,0-1.352-0.281-1.836-0.793l-0.039-0.041l-0.055-0.07c-0.045-0.047-0.125-0.146-0.195-0.254  l-0.031-0.049l-0.041-0.079c-0.031-0.044-0.094-0.16-0.145-0.284l-0.023-0.057l-0.035-0.117c-0.033-0.096-0.064-0.191-0.084-0.291  c-0.031-0.161-0.049-0.327-0.049-0.498V2.534C4.986,1.137,6.123,0,7.52,0H22.48c1.396,0,2.533,1.137,2.533,2.534v11.236  C28.023,15.142,30,18.164,30,21.5c0,3.895-2.619,7.257-6.385,8.225C23.26,29.905,22.869,30,22.48,30H7.52z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.9995" x2="14.9995" y1="1" y2="28.9277">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M24.014,27.467c0,0.847-0.686,1.533-1.533,1.533H7.52c-0.846,0-1.533-0.687-1.533-1.533V2.534  C5.986,1.687,6.674,1,7.52,1H22.48c0.848,0,1.533,0.687,1.533,1.534V27.467z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9995" x2="14.9995" y1="1" y2="28.4505">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M22.48,1H7.52C6.674,1,5.986,1.687,5.986,2.534v24.933c0,0.409,0.162,0.779,0.424,1.055  c-0.023-0.094-0.041-0.188-0.041-0.287v-0.768V3.3V2.534c0-0.635,0.518-1.151,1.15-1.151H22.48c0.635,0,1.15,0.517,1.15,1.151V3.3  v24.167v0.768c0,0.099-0.018,0.193-0.041,0.287c0.26-0.275,0.424-0.646,0.424-1.055V2.534C24.014,1.687,23.328,1,22.48,1z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.9995" x2="14.9995" y1="2.9458" y2="21.7151">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <rect fill="url(#SVGID_3__)" fill-opacity="0.6" height="18.795" stroke-opacity="0.6" width="15.727" x="7.137" y="2.918"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.9995" x2="14.9995" y1="3.3267" y2="21.3314">
@@ -60,82 +60,82 @@
 </linearGradient>
 <rect fill="url(#SVGID_4__)" height="18.029" width="14.961" x="7.52" y="3.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="3.71" y2="20.9482">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="17.262" width="14.191" x="7.904" y="3.685"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9995" x2="14.9995" y1="3.9844" y2="10.8451">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+<stop offset="0" style="stop-color:#AADAC6"/>
+<stop offset="1" style="stop-color:#6A99AA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="22.096,9.821 7.904,11.356 7.904,4.067 22.096,4.067 "/>
-<rect fill="#9FE4FF" height="0.383" width="14.191" x="7.904" y="3.685"/>
+<rect fill="#BCE2D2" height="0.383" width="14.191" x="7.904" y="3.685"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9409" x2="14.9409" y1="22.1113" y2="27.814">
-<stop offset="0" style="stop-color:#B6BBBD"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M13.555,27.851c-0.822,0-1.49-0.662-1.49-1.475v-2.805c0-0.813,0.668-1.476,1.49-1.476  h2.773c0.82,0,1.49,0.663,1.49,1.476v2.805c0,0.813-0.67,1.475-1.49,1.475H13.555z" fill="url(#SVGID_7_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M13.553,27.467c-0.609,0-1.105-0.489-1.105-1.091v-2.805c0-0.602,0.496-1.09,1.105-1.09h2.775  c0.611,0,1.105,0.488,1.105,1.09v2.805c0,0.602-0.494,1.091-1.105,1.091H13.553z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.9409" x2="14.9409" y1="22.8438" y2="27.0903">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M17.051,26.376c0,0.391-0.322,0.707-0.719,0.707h-2.783c-0.396,0-0.717-0.316-0.717-0.707v-2.805  c0-0.391,0.32-0.708,0.717-0.708h2.783c0.396,0,0.719,0.317,0.719,0.708V26.376z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.9399" x2="14.9399" y1="23.5928" y2="26.3076">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M14.365,26.316c-0.422,0-0.768-0.344-0.768-0.769v-1.149c0-0.424,0.346-0.769,0.768-0.769h1.152  c0.422,0,0.766,0.345,0.766,0.769v1.149c0,0.425-0.344,0.769-0.766,0.769H14.365z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="8.833" x2="8.833" y1="22.46" y2="27.0908">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M8.611,27.083c-0.813,0-1.475-0.66-1.475-1.476v-1.652  c0-0.813,0.662-1.474,1.475-1.474h0.443c0.814,0,1.475,0.66,1.475,1.474v1.652c0,0.815-0.66,1.476-1.475,1.476H8.611z" fill="url(#SVGID_10_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="8.833" x2="8.833" y1="22.8457" y2="26.707">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M8.611,26.7c-0.602,0-1.092-0.49-1.092-1.093v-1.652c0-0.602,0.49-1.092,1.092-1.092  h0.443c0.602,0,1.092,0.49,1.092,1.092v1.652c0,0.603-0.49,1.093-1.092,1.093H8.611z" fill="url(#SVGID_11_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="8.834" x2="8.834" y1="23.2334" y2="26.3213">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M9.764,25.607c0,0.393-0.318,0.709-0.709,0.709H8.611c-0.389,0-0.707-0.316-0.707-0.709v-1.652  c0-0.392,0.318-0.707,0.707-0.707h0.443c0.391,0,0.709,0.315,0.709,0.707V25.607z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="20.8369" x2="20.8369" y1="22.46" y2="27.0908">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M20.615,27.083c-0.813,0-1.475-0.66-1.475-1.476v-1.652  c0-0.813,0.662-1.474,1.475-1.474h0.441c0.814,0,1.477,0.66,1.477,1.474v1.652c0,0.815-0.662,1.476-1.477,1.476H20.615z" fill="url(#SVGID_13_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="20.8359" x2="20.8359" y1="22.8457" y2="26.707">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M20.615,26.7c-0.604,0-1.092-0.49-1.092-1.093v-1.652  c0-0.602,0.488-1.092,1.092-1.092h0.441c0.604,0,1.092,0.49,1.092,1.092v1.652c0,0.603-0.488,1.093-1.092,1.093H20.615z" fill="url(#SVGID_14_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="20.8359" x2="20.8359" y1="23.2334" y2="26.3213">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+<stop offset="0" style="stop-color:#C6B17B"/>
+<stop offset="0.7455" style="stop-color:#98604F"/>
+<stop offset="1" style="stop-color:#7F3736"/>
 </linearGradient>
 <path d="M21.766,25.607c0,0.393-0.316,0.709-0.709,0.709h-0.441c-0.391,0-0.709-0.316-0.709-0.709v-1.652  c0-0.392,0.318-0.707,0.709-0.707h0.441c0.393,0,0.709,0.315,0.709,0.707V25.607z" fill="url(#SVGID_15_)"/>
 <rect fill="none" height="30" width="30"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -224.75 -299.25)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="492.5" x2="492.5" y1="-626.4292" y2="-656.4292">
-<stop offset="0" style="stop-color:#B5BCBF"/>
-<stop offset="0.7091" style="stop-color:#494C4F"/>
-<stop offset="1" style="stop-color:#A8AFB2"/>
+<stop offset="0" style="stop-color:#B8BCBB"/>
+<stop offset="0.7091" style="stop-color:#4B4B4D"/>
+<stop offset="1" style="stop-color:#ABAFAF"/>
 </linearGradient>
 <path d="M21.5,29c-4.136,0-7.5-3.364-7.5-7.5c0-4.135,3.364-7.5,7.5-7.5c4.135,0,7.5,3.365,7.5,7.5  C29,25.636,25.635,29,21.5,29L21.5,29z" fill="url(#SVGID_16_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="21.5" x2="21.5" y1="14.4453" y2="28.4458">
-<stop offset="0" style="stop-color:#727678"/>
-<stop offset="0.7394" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+<stop offset="0" style="stop-color:#747576"/>
+<stop offset="0.7394" style="stop-color:#262628"/>
+<stop offset="1" style="stop-color:#4B4B4D"/>
 </linearGradient>
 <path d="M28.5,21.5c0,3.866-3.135,7-7,7c-3.866,0-7-3.134-7-7c0-3.865,3.134-7,7-7  C25.365,14.5,28.5,17.635,28.5,21.5z" fill="url(#SVGID_17_)"/>
 <polygon fill="#FFFFFF" points="23,18 23,19 25,19 25,20 23,20 23,21 25,21 25,22 23,22 23,25 26,25 26,18 "/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_muted.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_muted.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_muted.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,10 +5,10 @@
 <rect fill="none" height="60" width="60"/>
 <path d="M49.816,18.774L49.816,18.774c2.203-4.334,1.499-9.768-2.128-13.393c-3.624-3.624-9.056-4.33-13.391-2.127  l0,0c0,0-0.002,0.001-0.005,0.002c-1.055,0.538-2.049,1.242-2.932,2.125L21.019,15.725c-0.3-0.3-0.79-0.3-1.09,0l-0.544,0.544  v-0.002l-2.177,2.179c-0.299,0.3-0.299,0.789,0,1.089l-4.897,4.897c-4.51,4.51-4.51,11.821,0,16.33  c2.907,2.907,6.978,3.929,10.711,3.087c0.18-0.039,0.357-0.081,0.535-0.131c0.151-0.041,0.301-0.088,0.449-0.135  c0.041-0.015,0.083-0.024,0.125-0.038v3.85c-0.892,0.086-1.541,0.4-1.541,1.388v5.367h-5.405c-0.166,0-0.327,0.02-0.482,0.055  c-0.028,0.005-0.05,0.016-0.077,0.021c-0.13,0.033-0.258,0.074-0.378,0.128c-0.012,0.005-0.023,0.013-0.036,0.017  c-0.776,0.364-1.32,1.14-1.32,2.046v0.506c0,0.084,0.005,0.166,0.014,0.333c0.008,0.153,0.02,0.377,0.033,0.745h0.002h22.994h0.001  c0.032-0.767,0.048-0.92,0.048-1.078v-0.506c0-0.906-0.542-1.682-1.321-2.046c-0.01-0.004-0.021-0.012-0.033-0.017  c-0.122-0.054-0.248-0.095-0.378-0.128c-0.027-0.006-0.051-0.017-0.077-0.021c-0.156-0.035-0.317-0.055-0.482-0.055h-5.405  l-0.001-5.367c0-0.987-0.649-1.302-1.538-1.388v-6.742l4.788-4.79c0.301,0.3,0.79,0.3,1.09,0l2.721-2.721  c0.3-0.299,0.3-0.789,0-1.089c0,0,10.687-10.718,10.854-10.906v-0.001c0.645-0.736,1.186-1.529,1.613-2.367L49.816,18.774z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="267.0962" x2="290.189" y1="468.0112" y2="468.0112">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+<stop offset="0.7091" style="stop-color:#6A6C6E"/>
+<stop offset="1" style="stop-color:#AAAFAE"/>
 </linearGradient>
 <path d="M47.688,5.382c-4.507-4.509-11.819-4.509-16.327,0L21.019,15.725l16.328,16.328l10.341-10.342  C52.198,17.202,52.199,9.893,47.688,5.382z" fill="url(#SVGID_1_)"/>
 <path d="M47.688,5.382c-4.507-4.509-11.819-4.509-16.327,0l-1.634,1.633  c4.51-4.509,9.643-2.331,14.151,2.178c4.511,4.51,6.687,9.644,2.178,14.151l1.632-1.633C52.198,17.202,52.199,9.893,47.688,5.382z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -58,147 +58,147 @@
 <circle cx="41.157" cy="11.914" fill="#FFFFFF" r="0.77"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="267.4819" x2="267.4819" y1="462.314" y2="479.7079">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M23.196,14.637c0.301-0.302,0.301-0.788,0-1.091l-1.088,1.091  C22.409,14.937,22.895,14.937,23.196,14.637z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="267.481" x2="267.481" y1="462.3311" y2="479.7029">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M27.549,10.28c0.302-0.3,0.302-0.788,0-1.088l-1.087,1.088C26.763,10.582,27.249,10.581,27.549,10.28  z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="267.481" x2="267.481" y1="462.3467" y2="479.6524">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M31.903,5.927c0.292-0.291,0.294-0.754,0.023-1.057c-0.192,0.168-0.386,0.33-0.566,0.512  l-0.545,0.545C31.116,6.228,31.603,6.228,31.903,5.927z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="270.9458" x2="270.9458" y1="462.3418" y2="479.7027">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="27.549" cy="14.635" fill="url(#SVGID_7_)" r="0.769"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="270.9458" x2="270.9458" y1="462.3311" y2="479.6974">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="31.905" cy="10.28" fill="url(#SVGID_8_)" r="0.769"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="270.9458" x2="270.9458" y1="462.3247" y2="479.6966">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="36.26" cy="5.926" fill="url(#SVGID_9_)" r="0.769"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="274.7954" x2="274.7954" y1="462.314" y2="479.7079">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="28.094" cy="19.534" fill="url(#SVGID_10_)" r="0.77"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="274.7944" x2="274.7944" y1="462.3257" y2="479.7086">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="32.448" cy="15.181" fill="url(#SVGID_11_)" r="0.77"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="274.7944" x2="274.7944" y1="462.3267" y2="479.6985">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="36.803" cy="10.825" fill="url(#SVGID_12_)" r="0.769"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="289.8052" x2="289.8052" y1="462.335" y2="479.7068">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M38.437,29.876c-0.301,0.301-0.301,0.788,0,1.088l1.088-1.088  C39.225,29.574,38.737,29.575,38.437,29.876z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="289.8052" x2="289.8052" y1="462.3247" y2="479.7076">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M42.79,25.521c-0.301,0.301-0.301,0.787,0,1.09l1.088-1.09C43.579,25.22,43.091,25.22,42.79,25.521z  " fill="url(#SVGID_14_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="289.8032" x2="289.8032" y1="462.3516" y2="479.6407">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M48.201,21.146c-0.302-0.274-0.765-0.271-1.057,0.02c-0.301,0.302-0.301,0.788,0,1.089l0.544-0.544  C47.871,21.529,48.034,21.335,48.201,21.146z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="286.3403" x2="286.3403" y1="462.3247" y2="479.7076">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="38.436" cy="25.521" fill="url(#SVGID_16_)" r="0.77"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="286.3403" x2="286.3403" y1="462.3271" y2="479.7046">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="42.79" cy="21.167" fill="url(#SVGID_17_)" r="0.77"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="286.3403" x2="286.3403" y1="462.3262" y2="479.7036">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M47.688,17.357c-0.297,0.3-0.786,0.3-1.088,0c-0.301-0.301-0.301-0.788,0-1.089s0.787-0.301,1.088,0  C47.991,16.569,47.989,17.057,47.688,17.357z" fill="url(#SVGID_18_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="282.4907" x2="282.4907" y1="462.3296" y2="479.707">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M34.08,25.521c-0.298,0.301-0.786,0.301-1.088,0c-0.301-0.301-0.301-0.788,0-1.089  c0.301-0.3,0.789-0.301,1.088,0C34.383,24.734,34.381,25.22,34.08,25.521z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="282.4917" x2="282.4917" y1="462.3237" y2="479.7066">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="37.892" cy="20.622" fill="url(#SVGID_20_)" r="0.77"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="282.4917" x2="282.4917" y1="462.3267" y2="479.7041">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="42.246" cy="16.269" fill="url(#SVGID_21_)" r="0.77"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="278.6431" x2="278.6431" y1="462.3335" y2="479.7054">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="32.992" cy="20.078" fill="url(#SVGID_22_)" r="0.769"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="278.6431" x2="278.6431" y1="462.3223" y2="479.7107">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="37.347" cy="15.724" fill="url(#SVGID_23_)" r="0.77"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="278.6431" x2="278.6431" y1="462.3242" y2="479.7016">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
@@ -233,9 +233,9 @@
 <path d="M28.748,47.992c0,0.426-0.344,0.77-0.77,0.77h-3.079c-0.425,0-0.768-0.344-0.768-0.77V25.67  c0-0.425,0.343-0.771,0.768-0.771h3.079c0.426,0,0.77,0.346,0.77,0.771V47.992z" fill="url(#SVGID_27_)"/>
 <path d="M26.439,29.237c-2.124,0-3.849-1.727-3.849-3.848c0-2.123,1.725-3.85,3.849-3.85  c2.121,0,3.848,1.727,3.848,3.85C30.288,27.511,28.56,29.237,26.439,29.237L26.439,29.237z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="26.439" x2="26.439" y1="22.3696" y2="28.3803">
-<stop offset="0" style="stop-color:#9D9B9C"/>
-<stop offset="0.1515" style="stop-color:#D6D4D4"/>
-<stop offset="0.703" style="stop-color:#555557"/>
+<stop offset="0" style="stop-color:#9C9C9C"/>
+<stop offset="0.1515" style="stop-color:#D5D5D5"/>
+<stop offset="0.703" style="stop-color:#565656"/>
 <stop offset="0.9879" style="stop-color:#575757"/>
 <stop offset="1" style="stop-color:#575757"/>
 </linearGradient>
@@ -253,9 +253,9 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill-opacity="0.35" height="33.866" stroke-opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 670.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="260" x2="284" y1="655.9761" y2="655.9761">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="0.8424" style="stop-color:#CC1414"/>
-<stop offset="1" style="stop-color:#FF4D00"/>
+<stop offset="0" style="stop-color:#B36B4D"/>
+<stop offset="0.8424" style="stop-color:#954B50"/>
+<stop offset="1" style="stop-color:#B36B4D"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="25.809,26.431 3,4.177 4.191,2.956 27,25.21 "/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_pager.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_pager.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_pager.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,29 +3,29 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+<stop offset="0" style="stop-color:#93AC5D"/>
+<stop offset="0.297" style="stop-color:#93AC5D"/>
+<stop offset="0.6667" style="stop-color:#356742"/>
+<stop offset="0.7939" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#447B42"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399  c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514  c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737  c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12  c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B1BE95" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B1BE95" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+<stop offset="0" style="stop-color:#315D3E"/>
+<stop offset="0.5" style="stop-color:#1E3A31"/>
+<stop offset="1" style="stop-color:#2E593D"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31  c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535  c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
@@ -34,25 +34,25 @@
 <polygon fill="none" points="0,6.354 0,23.646 0,30 30,30 30,23.646 30,6.354 30,0 0,0 "/>
 <path d="M2.647,26.295C1.188,26.295,0,25.106,0,23.646V6.354c0-1.46,1.188-2.648,2.647-2.648h24.706  C28.813,3.705,30,4.894,30,6.354v17.293c0,1.46-1.188,2.648-2.646,2.648H2.647z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="4.4658" y2="25.0557">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M29,23.646c0,0.91-0.738,1.648-1.646,1.648H2.647C1.738,25.295,1,24.557,1,23.646V6.354  c0-0.91,0.738-1.648,1.647-1.648h24.706C28.262,4.705,29,5.443,29,6.354V23.646z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="4.4658" y2="25.0557">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M27.354,4.705H2.647C1.738,4.705,1,5.443,1,6.354v17.293c0,0.91,0.738,1.648,1.647,1.648  c-0.681,0-1.235-0.554-1.235-1.236v-0.412V6.764v-0.41c0-0.682,0.555-1.235,1.235-1.235h24.706c0.683,0,1.234,0.554,1.234,1.235  v0.41v16.883v0.412c0,0.683-0.552,1.236-1.234,1.236c0.908,0,1.646-0.738,1.646-1.648V6.354C29,5.443,28.262,4.705,27.354,4.705z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15.002" x2="15.002" y1="7.4736" y2="16.6938">
-<stop offset="0" style="stop-color:#686C6E"/>
-<stop offset="1" style="stop-color:#E4EEF2"/>
+<stop offset="0" style="stop-color:#6A6B6C"/>
+<stop offset="1" style="stop-color:#E8EEEA"/>
 </linearGradient>
 <path d="M4.032,16.634c-0.455,0-0.825-0.374-0.825-0.832V8.288c0-0.459,0.37-0.834,0.825-0.834  h21.938c0.455,0,0.826,0.375,0.826,0.834v7.514c0,0.458-0.371,0.832-0.826,0.832H4.032z" fill="url(#SVGID_3__)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.9995" x2="14.9995" y1="7.9063" y2="16.3741">
@@ -61,51 +61,51 @@
 </linearGradient>
 <path d="M26.379,15.802c0,0.229-0.184,0.415-0.413,0.415H4.032c-0.229,0-0.412-0.186-0.412-0.415V8.288  c0-0.231,0.184-0.416,0.412-0.416h21.934c0.229,0,0.413,0.185,0.413,0.416V15.802z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.999" x2="14.999" y1="-5.395" y2="21.0669">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#30A4D5"/>
-<stop offset="0.8727" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1C65C3"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#6292A3"/>
+<stop offset="0.8727" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#4E6591"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="7.514" width="21.934" x="4.032" y="8.288"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.999" x2="14.999" y1="0.04" y2="17.8522">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#4FADD5"/>
-<stop offset="0.8727" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1C65C3"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#77A6AD"/>
+<stop offset="0.8727" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#4E6591"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="4.032,11.536 25.966,10.833 25.966,8.278 4.032,8.278 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="17.6641" x2="17.6641" y1="18.374" y2="21.7321">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M14.734,21.702c-0.453,0-0.822-0.371-0.822-0.826V19.23  c0-0.454,0.369-0.824,0.822-0.824h5.856c0.455,0,0.825,0.37,0.825,0.824v1.646c0,0.455-0.37,0.826-0.825,0.826H14.734z" fill="url(#SVGID_7_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M20.591,21.702h-5.856c-0.453,0-0.822-0.371-0.822-0.826v0.412  c0,0.454,0.369,0.823,0.822,0.823h5.856c0.455,0,0.825-0.369,0.825-0.823v-0.412C21.416,21.331,21.046,21.702,20.591,21.702z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M20.591,21.702h-5.856c-0.453,0-0.822-0.371-0.822-0.826v0.412  c0,0.454,0.369,0.823,0.822,0.823h5.856c0.455,0,0.825-0.369,0.825-0.823v-0.412C21.416,21.331,21.046,21.702,20.591,21.702z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="17.6631" x2="17.6631" y1="18.7876" y2="21.3508">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M21.004,20.876c0,0.229-0.184,0.412-0.413,0.412h-5.856c-0.229,0-0.412-0.184-0.412-0.412V19.23  c0-0.228,0.184-0.412,0.412-0.412h5.856c0.229,0,0.413,0.185,0.413,0.412V20.876z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="7.77" x2="7.77" y1="18.374" y2="21.7321">
-<stop offset="0" style="stop-color:#646263"/>
+<stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.2" style="stop-color:#4D4D4D"/>
 <stop offset="0.7212" style="stop-color:#242424"/>
 <stop offset="1" style="stop-color:#373737"/>
 </linearGradient>
 <path d="M4.842,21.702c-0.452,0-0.823-0.371-0.823-0.826V19.23  c0-0.454,0.371-0.824,0.823-0.824h5.857c0.455,0,0.822,0.37,0.822,0.824v1.646c0,0.455-0.367,0.826-0.822,0.826H4.842z" fill="url(#SVGID_9_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M10.699,21.702H4.842c-0.452,0-0.823-0.371-0.823-0.826v0.412  c0,0.454,0.371,0.823,0.823,0.823h5.857c0.455,0,0.822-0.369,0.822-0.823v-0.412C11.521,21.331,11.154,21.702,10.699,21.702z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M10.699,21.702H4.842c-0.452,0-0.823-0.371-0.823-0.826v0.412  c0,0.454,0.371,0.823,0.823,0.823h5.857c0.455,0,0.822-0.369,0.822-0.823v-0.412C11.521,21.331,11.154,21.702,10.699,21.702z" fill="#222021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="7.772" x2="7.772" y1="18.7876" y2="21.3508">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.1333" style="stop-color:#838688"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.1333" style="stop-color:#848686"/>
+<stop offset="0.2606" style="stop-color:#7D7E7F"/>
+<stop offset="0.6606" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M11.112,20.876c0,0.229-0.185,0.412-0.413,0.412H4.842c-0.227,0-0.41-0.184-0.41-0.412V19.23  c0-0.228,0.184-0.412,0.41-0.412h5.857c0.229,0,0.413,0.185,0.413,0.412V20.876z" fill="url(#SVGID_10_)"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_service.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_service.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_service.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -43,30 +43,30 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5  c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
 <path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15  l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691  l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586  c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156  l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979  l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202  l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848  L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212  l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15  c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428  C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15  C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094  c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
 <radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383  l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15  l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85  l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164  l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552  l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443  L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247  l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,107 +5,107 @@
 <rect fill="none" height="60" width="60"/>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2162.3384" x2="-2162.3384" y1="3603.7246" y2="3654.8755">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#2A3662"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <circle cx="31.662" cy="27.76" fill="url(#SVGID_1_)" r="25.76"/>
 <radialGradient cx="-2106.918" cy="3745.7734" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="32.2687">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <path d="M56.761,27.759c0,13.864-11.234,25.097-25.099,25.097c-13.863,0-25.101-11.232-25.101-25.097  c0-13.859,11.239-25.099,25.101-25.099C45.53,2.66,56.761,13.899,56.761,27.759z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2162.3384" x2="-2162.3384" y1="3654.5078" y2="3603.9641">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#A6CDC2"/>
 </linearGradient>
 <path d="M31.663,2.66c-13.863,0-25.101,11.239-25.101,25.099  c0,13.864,11.239,25.097,25.101,25.097c13.864,0,25.099-11.232,25.099-25.097C56.761,13.899,45.53,2.66,31.663,2.66z M31.663,50.659  c-13.033,0-23.638-10.598-23.638-23.63c0-13.034,10.603-23.637,23.638-23.637c13.033,0,23.634,10.603,23.634,23.637  C55.296,40.06,44.696,50.659,31.663,50.659z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2187.0283" x2="-2183.0366" y1="3625.7734" y2="3625.7734">
-<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="0" style="stop-color:#59595A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M8.918,27.351c-0.268-0.357-0.871-0.357-1.137-0.357  c-0.525,0-0.804,0.376-0.809,0.742v0.023l0.001,0.038c-0.001,0.646,0.035,1.37,0.113,2.251c0.016,0.164,0.036,0.331,0.057,0.498  l0.028,0.241c0.067,0.521,0.145,1.033,0.235,1.531l0.041,0.218c0.038,0.198,0.075,0.391,0.117,0.583  c0.107,0.488,0.238,0.993,0.399,1.552c0.023,0.08,0.044,0.159,0.065,0.239c0.036,0.132,0.07,0.261,0.11,0.388l0.006,0.017  l0.014,0.04c-0.003-0.012-0.009-0.028-0.012-0.045l1.44-0.097c0.022-0.227,0.028-0.46,0.022-0.691  c-0.012-0.364-0.025-0.813-0.129-1.191l1.337-1.796l0.145-0.194v-0.244v-1.4v-0.303l-0.215-0.215L8.918,27.351z" fill="url(#SVGID_4_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2179.3354" x2="-2137.5874" y1="3633.083" y2="3633.083">
-<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="0" style="stop-color:#59595A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M56.406,22.84c-0.019-0.094-0.034-0.161-0.052-0.229  c-0.013-0.051-0.024-0.101-0.034-0.15c-0.128-0.595-0.285-1.208-0.472-1.832l-0.02-0.071c-0.041-0.14-0.082-0.281-0.127-0.42  c-0.227-0.706-0.473-1.38-0.732-2.003c-0.031-0.078-0.066-0.149-0.1-0.226l-0.055-0.119c-0.246-0.57-0.523-1.139-0.813-1.688  l-0.036-0.071c-0.057-0.107-0.111-0.216-0.17-0.321c-0.354-0.642-0.728-1.251-1.103-1.819c-0.04-0.06-0.085-0.122-0.13-0.184  c-0.027-0.038-0.054-0.075-0.078-0.111c-0.363-0.525-0.743-1.037-1.138-1.525l-0.076-0.099c-0.053-0.065-0.106-0.133-0.161-0.199  c-0.459-0.55-0.941-1.08-1.441-1.583c-0.068-0.067-0.139-0.138-0.211-0.209l-0.061-0.057c-0.45-0.44-0.93-0.878-1.422-1.289  l-0.097-0.083c-0.05-0.046-0.101-0.087-0.15-0.128c-0.536-0.441-1.118-0.875-1.725-1.291c-0.075-0.052-0.153-0.101-0.229-0.15  l-0.092-0.061c-0.546-0.362-1.115-0.709-1.688-1.023l-0.085-0.052c-0.049-0.028-0.096-0.054-0.144-0.082  c-0.636-0.341-1.3-0.66-1.976-0.951l-0.17-0.068l-0.186-0.077c-0.177-0.073-0.355-0.136-0.531-0.197  c-0.093-0.03-0.182-0.063-0.275-0.097l-0.339-0.127l-0.308,0.195c-0.203,0.129-1.01,0.589-1.484,0.859  c-0.526-0.07-1.801-0.23-3.089-0.355c0.396-0.036,0.946-0.082,1.719-0.133l0.108-1.446l-0.059-0.017  c-0.047-0.012-0.092-0.024-0.139-0.035l-0.111-0.021l-0.088-0.017c-0.789-0.159-1.529-0.273-2.264-0.351L34.57,2.925l-0.103-0.011  c-0.84-0.083-1.693-0.127-2.539-0.127c-0.744,0-1.517,0.04-2.361,0.122c-0.13,0.013-0.256,0.025-0.385,0.038  C28.35,3.041,27.62,3.151,26.93,3.292l-0.024,0.002l-0.017,0.003c-0.727,0.149-1.457,0.338-2.232,0.573  c-0.068,0.022-0.139,0.044-0.207,0.067l-0.156,0.052c-0.658,0.212-1.303,0.444-1.92,0.7c-0.051,0.021-0.086,0.032-0.121,0.046  l-0.094,0.038c-0.678,0.288-1.354,0.615-2.028,0.977c-0.073,0.037-0.142,0.079-0.212,0.118l-0.084,0.054  c-0.189,0.103-0.381,0.223-0.569,0.34l-0.244,0.153l-1.345,0.821l1.494,0.499c0.223,0.076,0.463,0.111,0.711,0.111  c0.805,0,1.582-0.395,2.209-0.713c0.252-0.125,0.627-0.317,0.779-0.346c0.182,0.054,0.369,0.082,0.55,0.082  c0.685,0,1.244-0.368,1.739-0.694l0.135-0.087c0.16-0.052,0.434-0.154,0.98-0.359c0.561-0.209,1.58-0.593,1.854-0.658  c0.527-0.005,1.16-0.079,1.609-0.359c0.422,0.07,1.174,0.188,1.945,0.289c-0.057,0.034-0.112,0.07-0.158,0.115  c-0.251,0.232-1.605,0.642-2.02,0.695c-0.779,0.098-1.092,0.49-1.217,0.801c-0.163,0.403-0.064,0.808,0.094,1.139  c-0.295,0.194-0.656,0.41-0.966,0.575c0,0,0.003-0.015,0.005-0.023c0.111-0.622,0.191-1.071-0.11-1.431  c-0.153-0.184-0.38-0.289-0.624-0.289c-0.354,0-0.631,0.22-0.854,0.436c-0.626,0.604-1.004,1.356-1.145,1.641l-0.026,0.052  l-0.023,0.042c-0.271,0.519-0.382,0.887-0.231,2.028c-0.064,0.05-0.264,0.124-0.534,0.124c-0.036,0-0.07-0.001-0.095-0.004  c-0.176-0.189-0.42-0.298-0.693-0.298l0,0c-0.63,0-1.488,0.709-2.551,2.107l-0.342,0.451l0.347,0.446l0.323,0.411  c-5.066,3.918-5.104,4.14-5.157,4.468c-0.009,0.03-0.054,0.165-0.115,0.352c-0.754,2.348-1.174,4.104-0.765,5.044  c0.942,2.179,2.006,4.212,3.383,4.325c0.122,0.01,0.256,0.015,0.398,0.015c1.265,0,3.311-0.382,4.295-0.584  c0.182,0.341,0.402,0.738,0.527,0.956l0.217,0.39l0.445-0.015c0.004,0,0.239-0.009,0.539-0.009c0.342,0,0.573,0.011,0.723,0.021  c0.536,1.571,1.563,5.189,1.373,5.943l-0.004,0.002c-1.732,2.597,0.368,5.982,1.377,7.607c0.078,0.129,0.15,0.244,0.213,0.345  c0.389,1.108,0.861,1.841,1.856,1.841c0.075,0,0.149-0.004,0.227-0.01c0.058-0.002,0.115-0.004,0.175-0.004  c0.109,0,0.189,0.012,0.271,0.042l0.09,0.032l0.097,0.008c0.187,0.016,0.368,0.042,0.544,0.068c0.309,0.042,0.625,0.084,0.947,0.084  c0.868,0,1.555-0.327,2.148-1.028c0.023-0.003,0.044-0.005,0.067-0.008c0.622-0.086,0.854-0.398,0.935-0.678  c0.045-0.047,0.107-0.104,0.157-0.15c0.245-0.226,0.538-0.493,0.739-0.811c0.091-0.054,0.193-0.114,0.311-0.183  c0.2-0.124,0.428-0.26,0.605-0.352c0.157-0.05,0.297-0.142,0.401-0.271c0.251-0.31,0.2-0.659,0.157-0.941  c-0.041-0.291-0.084-0.592,0.072-0.911c0.889-0.428,2.466-1.479,2.721-1.652l-0.002,0.021c-0.016,0.141-0.057,0.517-0.119,0.757  c-0.336,0.335-0.617,0.845-0.704,1.018l-0.06,0.113l-0.018,0.125c-0.023,0.164-0.113,1.021,0.367,1.575  c0.242,0.277,0.59,0.432,0.978,0.432c0.124,0,0.253-0.016,0.384-0.047c1.234-0.279,3.426-3.249,3.604-4.888  c0.086-0.789-0.223-1.409-0.846-1.703l-0.465-0.221l-0.367,0.364l-1.352,1.353c-0.457,0.043-0.814,0.179-1.057,0.393  c0.014-0.578-0.043-1.17-0.104-1.745c-0.186-1.74-0.222-2.848,0.846-3.602l0.054-0.04l0.046-0.047  c0.387-0.392,0.813-0.734,1.264-1.099c1.059-0.85,2.152-1.729,2.804-3.315l0.027-0.067c0.209-0.543,0.524-1.361,0.097-1.984  c-0.107-0.155-0.33-0.395-0.75-0.478c0.556-0.225,0.98-0.399,1.023-0.417l0.129-0.052l0.1-0.097l2.281-2.19l0.334-0.321  l-0.146-0.441c-0.021-0.057-0.144-0.401-0.494-0.897c0.666,0.09,1.236,0.251,1.424,0.393c0.069,0.147,0.207,0.477,0.352,0.822  c2.512,5.918,2.863,6.224,3.518,6.233c0.025,0,0.045,0.002,0.061,0.005c0.055,0.002,0.101,0.004,0.145,0.004  c0.371,0,0.584-0.188,0.677-0.303c0.273-0.328,0.196-0.73,0.169-0.88l-0.01-0.052c-0.031-0.354-0.012-1.946,0.039-3.254  c0.004,0.002,0.004,0.006,0.008,0.011l1.346-0.534L56.406,22.84z M36.622,15.6c-0.104,0.004-0.217,0.009-0.338,0.014  c-0.388,0.02-0.828,0.038-1.268,0.038c-1.147,0-1.409-0.142-1.438-0.157c-0.135-0.1-0.275-0.174-0.42-0.226  c0.26-0.059,0.557-0.259,0.863-0.853c0.303,0.586,0.712,1.104,1.342,1.104c0.171,0,0.332-0.043,0.488-0.122  C36.063,15.401,36.413,15.522,36.622,15.6z M36.17,12.397c-0.086,0-0.156-0.004-0.211-0.009c0.059-0.153,0.129-0.243,0.186-0.293  c0.071,0.111,0.169,0.209,0.277,0.294C36.334,12.395,36.252,12.397,36.17,12.397z M31.6,13.933c0.394,0.771,0.686,1.103,0.916,1.246  c-0.57,0.047-1.001,0.409-1.354,0.752c-0.248-0.081-0.678-0.343-0.808-0.526c-0.075-0.106-0.165-0.199-0.265-0.279  C30.713,14.948,31.262,14.369,31.6,13.933z M29.428,13.366l-0.817-0.039l-2.737-0.134c0.332-0.275,0.65-0.534,0.837-0.686  c0.05-0.018,0.246-0.073,0.728-0.073c0.291,0,0.569,0.021,0.746,0.035L29.428,13.366z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="-2106.0845" cy="3754.9141" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="29.4754">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M7.703,27.745L7.703,27.745c0,0.009,0.001,0.014,0.001,0.022c0,0.747,0.047,1.484,0.112,2.218  c0.021,0.236,0.056,0.476,0.083,0.718c0.065,0.5,0.14,0.998,0.228,1.488c0.051,0.258,0.097,0.521,0.152,0.774  c0.114,0.508,0.244,1.008,0.386,1.501c0.06,0.204,0.107,0.411,0.169,0.61c0.009,0.023,0.019,0.04,0.023,0.061  c0.02-0.189,0.026-0.39,0.02-0.594C8.83,33.103,8.6,33.288,8.6,33.288l1.629-2.19v-1.402l-1.91-1.908  C8.319,27.787,7.704,27.69,7.703,27.745z" fill="url(#SVGID_6_)"/>
 <radialGradient cx="-2106.0928" cy="3754.918" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="29.4765">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M23.042,6.076c0.706,0.233,1.282-0.24,1.939-0.66c0.231-0.049,2.81-1.076,3.089-1.076  s1.216-0.036,1.448-0.409c0,0,4.035,0.702,4.644,0.468c0.33-0.13,1.723-0.24,2.914-0.317c-0.066-0.014-0.127-0.036-0.195-0.05  c-0.064-0.015-0.125-0.023-0.191-0.035c-0.75-0.152-1.505-0.272-2.277-0.35c-0.008,0-0.012,0-0.02-0.003  c-0.81-0.082-1.633-0.124-2.467-0.124c-0.773,0-1.535,0.045-2.291,0.117c-0.133,0.015-0.266,0.025-0.397,0.043  c-0.731,0.079-1.456,0.186-2.165,0.328c-0.013,0.005-0.025,0.005-0.037,0.008c-0.736,0.152-1.459,0.34-2.168,0.559  c-0.121,0.035-0.238,0.077-0.362,0.115c-0.626,0.202-1.248,0.427-1.856,0.678c-0.071,0.031-0.145,0.057-0.215,0.087  c-0.67,0.286-1.322,0.602-1.96,0.941c-0.097,0.053-0.188,0.108-0.282,0.163c-0.271,0.149-0.527,0.32-0.793,0.481  C20.713,7.479,22.349,5.842,23.042,6.076z" fill="url(#SVGID_7_)"/>
 <radialGradient cx="-2106.0928" cy="3754.9209" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="29.4743">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.3152" style="stop-color:#B7CC97"/>
+<stop offset="0.7273" style="stop-color:#568E4C"/>
+<stop offset="1" style="stop-color:#255541"/>
 </radialGradient>
 <path d="M55.685,22.962c-0.026-0.122-0.06-0.237-0.083-0.356c-0.127-0.601-0.28-1.19-0.455-1.773  c-0.045-0.154-0.092-0.316-0.143-0.474c-0.211-0.659-0.445-1.31-0.709-1.941c-0.047-0.112-0.1-0.223-0.15-0.331  c-0.242-0.56-0.504-1.104-0.789-1.639c-0.066-0.128-0.131-0.259-0.199-0.383c-0.336-0.604-0.691-1.194-1.074-1.768  c-0.064-0.1-0.137-0.192-0.203-0.292c-0.35-0.507-0.717-0.997-1.102-1.477c-0.078-0.094-0.152-0.192-0.233-0.287  c-0.442-0.532-0.909-1.044-1.396-1.534c-0.082-0.085-0.172-0.17-0.259-0.252c-0.444-0.437-0.907-0.857-1.387-1.258  c-0.079-0.069-0.157-0.139-0.237-0.206c-0.537-0.439-1.1-0.857-1.678-1.254c-0.1-0.069-0.203-0.135-0.307-0.2  c-0.531-0.354-1.079-0.686-1.643-0.998c-0.074-0.042-0.148-0.087-0.225-0.129c-0.625-0.336-1.262-0.642-1.916-0.924  c-0.117-0.049-0.232-0.096-0.348-0.145c-0.254-0.104-0.521-0.188-0.777-0.282c-0.306,0.195-1.729,1.001-1.729,1.001  s-6.18-0.846-6.602-0.426c-0.423,0.426-2.068,0.854-2.441,0.903c-0.376,0.049-1.151,0.247-0.221,1.396  c-0.139,0.141-2.795,1.99-2.795,1.15s0.594-2.348-0.24-1.54c-0.599,0.577-0.957,1.364-1.034,1.51  c-0.195,0.375-0.315,0.554-0.174,1.632c0.142,1.077-1.719,1.07-1.845,0.791c-0.332-0.746-2.174,1.676-2.174,1.676l0.776,0.996  c0,0-5.421,4.177-5.468,4.456c-0.048,0.282-1.399,3.907-0.93,4.984c0.468,1.079,1.652,3.797,2.771,3.888  c1.47,0.12,5.032-0.673,5.032-0.673c0.097,0.236,0.768,1.43,0.768,1.43s1.747-0.058,1.843,0.133  c0.033,0.063,2.104,6.157,1.422,6.965c-1.632,2.444,0.932,6.024,1.645,7.235c0.715,2.08,1.176,1.148,2.115,1.489  c1.155,0.101,2.129,0.528,3.111-0.735c0.285-0.235,0.77-0.049,0.77-0.376c0-0.183,0.84-0.718,1.057-1.223  c0.226-0.105,0.811-0.498,1.205-0.688c0.36-0.023-0.34-0.986,0.372-2.002c0.769-0.303,2.842-1.7,2.842-1.7  c0.095-2.05-1.01-4.581,1.05-6.033c1.326-1.355,3.068-2.126,3.912-4.183c0.232-0.61,0.756-1.854-0.744-1.48  c-1.41,0.354-2.981,0.435-2.236-0.187c-0.086-0.761-1.022-1.12-1.863-1.863c-0.436-1.028-1.118-2.86-1.118-2.86l-1.491-2.266  l0.186-0.468l1.773,2.609l1.771,2.142c0.65,2.143,1.209,2.33,1.209,2.33c0.98-0.345,3.311-1.305,3.311-1.305l2.281-2.19  c0,0-0.233-0.697-1.16-1.583l-0.703-0.418c-0.152,0.43-0.965,0.59-0.965,0.59l-1.973-2.361l0.733-0.147l0.565,1.076l1.356,0.47  c0,0,0.377-0.274,1.073,0.446c0.568-0.047,2.788,0.108,3.306,0.765c0.102,0.13,2.748,6.739,3.271,6.749  c0.229,0.002,0.395,0.091,0.32-0.309c-0.094-0.188,0-4.338,0.14-5.229c0.354-0.753,0.412-0.002,1.25,1.428  C55.696,23.033,55.692,22.997,55.685,22.962z M32.397,6.947c0.184-0.552,1.258-0.739,1.258-0.739s-0.308,0.568-0.236,0.859  c0.072,0.298-0.49,0.483-0.554,1.182c-0.061,0.694-1.343,0.287-1.447,0.043C31.311,8.049,32.208,7.497,32.397,6.947z M36.993,16.324  c-0.795,0-3.18,0.235-3.834-0.234c-0.658-0.467-1.168,0.05-1.639,0.52c-0.311,0.303-1.434-0.314-1.765-0.782  c-0.325-0.467-1.429-0.434-1.429-0.434l0.251-1.335l-3.171-0.154l-1.802,0.528l-1.694,0.05l0.95-0.454l1.181-0.278  c0,0,1.721-1.414,2.235-1.834c0.435-0.356,2.177-0.155,2.177-0.155l1.91,1.378c0,0-0.424,1.08-0.611,1.312  c0.701-0.047,1.525-1.321,1.525-1.321c-1.488-1.368-1.428-1.832-1.428-1.832l1.963,1.377l0.02,0.012c0,0,0.795,1.874,1.127,1.874  c0.326,0,0.744-1.289,0.744-1.289l0.559-0.142c0.248,0.593,0.715,1.929,1.272,1.614c0.323-0.177,0.854-0.015,1.462,0.218  c0.611,0.235,1.025-0.124,1.521,0.31C38.452,17.195,37.321,16.419,36.993,16.324z M38.239,13.102  c-0.818-0.311-3.587,0.704-2.969-0.957c0.33-0.896,1.179-1.083,1.469-0.487c0.076,0.247,0.998,0.625,0.99,0.108  c-0.006-0.518,0.928-0.791,1.063-0.406C38.293,11.716,40.737,13.58,38.239,13.102z M43.454,14.675  c-0.453-0.364,0.205-0.679-0.465-1.252c-0.959-0.822-1.708-1.176-0.401-1.841c1.612-0.202,0.263,0.515,0.529,0.943  c0.144,0.23,0.956,0.996,1.593,1.938C45.238,15.244,43.905,15.038,43.454,14.675z" fill="url(#SVGID_8_)"/>
 <radialGradient cx="-2106.0933" cy="3754.916" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="29.4698">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M44.104,36.019l-1.555,1.552c0,0-0.934,0-0.979,0.378c-0.021,0.159-0.075,0.853-0.23,1.209  c-0.311,0.217-0.684,0.931-0.684,0.931s-0.191,1.382,0.839,1.146C42.526,41.001,45.698,36.77,44.104,36.019z" fill="url(#SVGID_9_)"/>
 <path d="M32.02,52.439c1.859,0,3.664-0.209,5.408-0.589  c-0.047-0.059-0.086-0.12-0.137-0.174l-9.057-9.324c-0.522-0.537-1.239-0.847-1.97-0.847c-0.685,0-1.324,0.265-1.804,0.751  l-1.373,1.418l-0.568,0.573l-0.524,0.537c-1.987-1.927-3.765-4.139-5.697-7.06c-1.067-1.62-1.986-3.592-2.57-4.956l-0.213-0.51  c0,0-0.291-0.718-0.39-0.975l-0.032-0.082c-0.081-0.211-0.153-0.408-0.221-0.601l-0.031-0.083l2.215-0.77  c1.222-0.414,1.915-1.688,1.638-3.071l-0.009-0.045l-1.386-4.235l-2.734-8.158c-0.193-0.582-0.564-1.064-1.032-1.394  c-2.904,4.096-4.617,9.095-4.617,14.496C6.917,41.205,18.155,52.439,32.02,52.439z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
 <path d="M32.02,52.439c1.563,0,3.09-0.15,4.576-0.422l-8.889-9.153  c-0.386-0.396-0.912-0.624-1.442-0.624c-0.485,0-0.936,0.188-1.274,0.531l-1.381,1.42l-0.561,0.568l-0.51,0.523l0.004,0.005  l-0.523,0.535c-2.243-2.087-4.219-4.489-6.334-7.693c-1.095-1.661-2.036-3.678-2.634-5.074l-0.19-0.45l-0.029-0.071  c0,0-0.292-0.723-0.393-0.981l-0.035-0.087c-0.082-0.216-0.156-0.415-0.229-0.614c0,0-0.144-0.406-0.174-0.493l0.085-0.354  l2.731-0.951c0.866-0.294,1.355-1.214,1.161-2.187l-0.008-0.044l-1.373-4.188l-2.734-8.161c-0.144-0.43-0.412-0.781-0.752-1.024  c-2.648,3.98-4.198,8.756-4.198,13.893C6.917,41.205,18.155,52.439,32.02,52.439z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <radialGradient cx="-2983.5728" cy="4023.543" gradientTransform="matrix(0.9654 -0.0107 -0.0107 -0.9654 2968.4299 3872.1846)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="42.6078">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.8364" style="stop-color:#E9F0F2"/>
-<stop offset="0.8909" style="stop-color:#AAB1B5"/>
-<stop offset="0.9515" style="stop-color:#7C878C"/>
-<stop offset="1" style="stop-color:#838F94"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.8364" style="stop-color:#ECEFED"/>
+<stop offset="0.8909" style="stop-color:#ADB2B1"/>
+<stop offset="0.9515" style="stop-color:#818587"/>
+<stop offset="1" style="stop-color:#888E8F"/>
 </radialGradient>
 <path d="M22.051,46.847c-2.873-2.563-5.037-5.372-6.979-8.311c-1.865-2.832-3.556-7.079-4.079-8.93  l-7.54-10.621c-0.429,0.711-1.107,3.264-0.794,6.717c0.316,3.454,3.534,11.814,7.313,17.545c3.782,5.731,9.389,11.118,11.269,12.311  c2.959,1.878,6.523,2.493,7.608,2.439c0,0,1.002-0.118,2.367-0.597C31.803,57.196,22.051,46.847,22.051,46.847z" fill="url(#SVGID_10_)"/>
 <path d="M12.413,33.434c-0.661-1.542-1.174-2.953-1.418-3.827L3.658,19.27  c-0.077,0.108-0.12,0.173-0.12,0.173c-0.126,0.207-0.266,0.55-0.406,0.977c-0.142,0.722-0.214,1.466-0.202,2.229  C3.002,28.046,7.083,32.497,12.413,33.434z" fill-opacity="0.05" stroke-opacity="0.05"/>
 <path d="M12.099,32.685c-0.507-1.242-0.899-2.348-1.104-3.078l-7.363-10.37  C3.548,19.356,3.5,19.429,3.5,19.429c-0.118,0.195-0.25,0.522-0.383,0.925c-0.134,0.682-0.202,1.383-0.19,2.105  C2.997,27.635,6.961,31.889,12.099,32.685z" fill-opacity="0.05" stroke-opacity="0.05"/>
 <path d="M3.443,19.407c-0.105,0.177-0.226,0.472-0.348,0.839  c-0.123,0.617-0.183,1.256-0.172,1.911c0.064,4.82,3.858,8.755,8.702,9.323c-0.278-0.742-0.495-1.39-0.632-1.874L3.596,19.185  C3.496,19.325,3.443,19.407,3.443,19.407z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <radialGradient cx="-3022.0488" cy="4026.5146" gradientTransform="matrix(0.9664 -0.0083 -0.013 -0.9569 2980.2107 3844.9014)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="14.7389">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0424" style="stop-color:#D3D7D5"/>
+<stop offset="0.4" style="stop-color:#BDC0BF"/>
+<stop offset="0.7333" style="stop-color:#82898B"/>
+<stop offset="1" style="stop-color:#ACB2B1"/>
 </radialGradient>
 <path d="M10.993,29.606l1.577-0.554c0,0-3.343-14.954-4.669-14.266c-0.667,0.348-0.66,0.538-1.335,1.026  c-2.014,1.464-3.112,3.174-3.112,3.174c-0.092,0.155-0.197,0.415-0.303,0.737c-0.105,0.54-0.161,1.102-0.153,1.672  c0.06,4.353,3.581,7.891,8.007,8.225C11,29.616,10.995,29.611,10.993,29.606z" fill="url(#SVGID_11_)"/>
 <path d="M21.933,48.33c-0.311,0.874-0.481,1.802-0.47,2.769  c0.031,2.291,1.062,4.354,2.695,5.889c2.064,0.771,3.951,1.047,4.689,1.01c0,0,1.002-0.118,2.367-0.597  c0.492-0.171-6.277-7.469-8.48-9.823L21.933,48.33z" fill-opacity="0.05" stroke-opacity="0.05"/>
 <path d="M22.125,47.537c-0.313,0.871-0.481,1.799-0.47,2.766  c0.043,3.142,1.947,5.86,4.748,7.363c0.927,0.218,1.705,0.318,2.198,0.331c0.013,0,0.032,0.002,0.045,0c0,0,1-0.115,2.37-0.594  c0.508-0.179-6.761-7.982-8.693-10.055L22.125,47.537z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <radialGradient cx="-3005.0166" cy="3996.4961" gradientTransform="matrix(0.9664 -0.0083 -0.013 -0.9569 2980.2107 3844.9014)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="14.9991">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0424" style="stop-color:#D3D7D5"/>
+<stop offset="0.4" style="stop-color:#BDC0BF"/>
+<stop offset="0.7333" style="stop-color:#82898B"/>
+<stop offset="1" style="stop-color:#ACB2B1"/>
 </radialGradient>
 <path d="M33.125,56.564c0.785-0.42,0.984-0.408,1.625-0.887c1.178-0.891-10.615-10.968-10.615-10.968  l-2.057,2.111c-0.277,0.833-0.428,1.724-0.415,2.648c0.062,4.526,3.869,8.17,8.542,8.24C30.997,57.499,32.036,57.146,33.125,56.564z  " fill="url(#SVGID_12_)"/>
 <path d="M11.808,29.311l0.762-0.258c0,0-3.343-14.954-4.669-14.266  c-0.35,0.181-0.515,0.322-0.688,0.481L11.808,29.311z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientTransform="matrix(0.9999 -0.0111 -0.0111 -0.9999 3135.2356 3906.9067)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-3082.8984" x2="-3077.6428" y1="3928.3984" y2="3911.7034">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.4" style="stop-color:#D4D9DB"/>
-<stop offset="0.7333" style="stop-color:#98AAAD"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.0424" style="stop-color:#ECEFED"/>
+<stop offset="0.4" style="stop-color:#D6D9D7"/>
+<stop offset="0.7333" style="stop-color:#9EA7A5"/>
+<stop offset="1" style="stop-color:#D4DAD7"/>
 </linearGradient>
 <path d="M12.57,29.056l2.016-0.703c0.523-0.176,0.792-0.756,0.676-1.346l-1.356-4.141l-2.734-8.162  c-0.214-0.641-0.854-1.006-1.43-0.813c0,0-0.515,0.211-1.837,0.898L12.57,29.056z" fill="url(#SVGID_13_)"/>
 <path d="M24.135,44.708l-0.563,0.568l10.516,10.866  c0.227-0.158,0.457-0.313,0.662-0.468C35.928,54.784,24.135,44.708,24.135,44.708z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientTransform="matrix(0.9999 -0.0111 -0.0111 -0.9999 3135.2356 3906.9067)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-3066.7827" x2="-3055.8347" y1="3897.6836" y2="3885.627">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.4" style="stop-color:#D4D9DB"/>
-<stop offset="0.7333" style="stop-color:#98AAAD"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.0424" style="stop-color:#ECEFED"/>
+<stop offset="0.4" style="stop-color:#D6D9D7"/>
+<stop offset="0.7333" style="stop-color:#9EA7A5"/>
+<stop offset="1" style="stop-color:#D4DAD7"/>
 </linearGradient>
 <path d="M34.749,55.673c1.176-0.889,1.558-1.273,1.558-1.273c0.438-0.448,0.407-1.204-0.071-1.697  l-9.057-9.322c-0.478-0.496-1.222-0.544-1.66-0.097l-1.383,1.425L34.749,55.673z" fill="url(#SVGID_14_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_home.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,107 +5,107 @@
 <rect fill="none" height="60" width="60"/>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2162.3384" x2="-2162.3384" y1="3603.7246" y2="3654.8755">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#2A3662"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <circle cx="31.662" cy="27.76" fill="url(#SVGID_1_)" r="25.76"/>
 <radialGradient cx="-2106.918" cy="3745.7734" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="32.2687">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <path d="M56.761,27.759c0,13.864-11.234,25.097-25.099,25.097c-13.863,0-25.101-11.232-25.101-25.097  c0-13.859,11.239-25.099,25.101-25.099C45.53,2.66,56.761,13.899,56.761,27.759z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2162.3384" x2="-2162.3384" y1="3654.5078" y2="3603.9641">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#A6CDC2"/>
 </linearGradient>
 <path d="M31.663,2.66c-13.863,0-25.101,11.239-25.101,25.099  c0,13.864,11.239,25.097,25.101,25.097c13.864,0,25.099-11.232,25.099-25.097C56.761,13.899,45.53,2.66,31.663,2.66z M31.663,50.659  c-13.033,0-23.638-10.598-23.638-23.63c0-13.034,10.603-23.637,23.638-23.637c13.033,0,23.634,10.603,23.634,23.637  C55.296,40.06,44.696,50.659,31.663,50.659z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2187.0283" x2="-2183.0366" y1="3625.7734" y2="3625.7734">
-<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="0" style="stop-color:#59595A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M8.918,27.351c-0.268-0.357-0.871-0.357-1.137-0.357  c-0.525,0-0.804,0.376-0.809,0.742v0.023l0.001,0.038c-0.001,0.646,0.035,1.37,0.113,2.251c0.016,0.164,0.036,0.331,0.057,0.498  l0.028,0.241c0.067,0.521,0.145,1.033,0.235,1.531l0.041,0.218c0.038,0.198,0.075,0.391,0.117,0.583  c0.107,0.488,0.238,0.993,0.399,1.552c0.023,0.08,0.044,0.159,0.065,0.239c0.036,0.132,0.07,0.261,0.11,0.388l0.006,0.017  l0.014,0.04c-0.003-0.012-0.009-0.028-0.012-0.045l1.44-0.097c0.022-0.227,0.028-0.46,0.022-0.691  c-0.012-0.364-0.025-0.813-0.129-1.191l1.337-1.796l0.145-0.194v-0.244v-1.4v-0.303l-0.215-0.215L8.918,27.351z" fill="url(#SVGID_4_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2179.3354" x2="-2137.5874" y1="3633.083" y2="3633.083">
-<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="0" style="stop-color:#59595A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M56.406,22.84c-0.019-0.094-0.034-0.161-0.052-0.229  c-0.013-0.051-0.024-0.101-0.034-0.15c-0.128-0.595-0.285-1.208-0.472-1.832l-0.02-0.071c-0.041-0.14-0.082-0.281-0.127-0.42  c-0.227-0.706-0.473-1.38-0.732-2.003c-0.031-0.078-0.066-0.149-0.1-0.226l-0.055-0.119c-0.246-0.57-0.523-1.139-0.813-1.688  l-0.036-0.071c-0.057-0.107-0.111-0.216-0.17-0.321c-0.354-0.642-0.728-1.251-1.103-1.819c-0.04-0.06-0.085-0.122-0.13-0.184  c-0.027-0.038-0.054-0.075-0.078-0.111c-0.363-0.525-0.743-1.037-1.138-1.525l-0.076-0.099c-0.053-0.065-0.106-0.133-0.161-0.199  c-0.459-0.55-0.941-1.08-1.441-1.583c-0.068-0.067-0.139-0.138-0.211-0.209l-0.061-0.057c-0.45-0.44-0.93-0.878-1.422-1.289  l-0.097-0.083c-0.05-0.046-0.101-0.087-0.15-0.128c-0.536-0.441-1.118-0.875-1.725-1.291c-0.075-0.052-0.153-0.101-0.229-0.15  l-0.092-0.061c-0.546-0.362-1.115-0.709-1.688-1.023l-0.085-0.052c-0.049-0.028-0.096-0.054-0.144-0.082  c-0.636-0.341-1.3-0.66-1.976-0.951l-0.17-0.068l-0.186-0.077c-0.177-0.073-0.355-0.136-0.531-0.197  c-0.093-0.03-0.182-0.063-0.275-0.097l-0.339-0.127l-0.308,0.195c-0.203,0.129-1.01,0.589-1.484,0.859  c-0.526-0.07-1.801-0.23-3.089-0.355c0.396-0.036,0.946-0.082,1.719-0.133l0.108-1.446l-0.059-0.017  c-0.047-0.012-0.092-0.024-0.139-0.035l-0.111-0.021l-0.088-0.017c-0.789-0.159-1.529-0.273-2.264-0.351L34.57,2.925l-0.103-0.011  c-0.84-0.083-1.693-0.127-2.539-0.127c-0.744,0-1.517,0.04-2.361,0.122c-0.13,0.013-0.256,0.025-0.385,0.038  C28.35,3.041,27.62,3.151,26.93,3.292l-0.024,0.002l-0.017,0.003c-0.727,0.149-1.457,0.338-2.232,0.573  c-0.068,0.022-0.139,0.044-0.207,0.067l-0.156,0.052c-0.658,0.212-1.303,0.444-1.92,0.7c-0.051,0.021-0.086,0.032-0.121,0.046  l-0.094,0.038c-0.678,0.288-1.354,0.615-2.028,0.977c-0.073,0.037-0.142,0.079-0.212,0.118l-0.084,0.054  c-0.189,0.103-0.381,0.223-0.569,0.34l-0.244,0.153l-1.345,0.821l1.494,0.499c0.223,0.076,0.463,0.111,0.711,0.111  c0.805,0,1.582-0.395,2.209-0.713c0.252-0.125,0.627-0.317,0.779-0.346c0.182,0.054,0.369,0.082,0.55,0.082  c0.685,0,1.244-0.368,1.739-0.694l0.135-0.087c0.16-0.052,0.434-0.154,0.98-0.359c0.561-0.209,1.58-0.593,1.854-0.658  c0.527-0.005,1.16-0.079,1.609-0.359c0.422,0.07,1.174,0.188,1.945,0.289c-0.057,0.034-0.112,0.07-0.158,0.115  c-0.251,0.232-1.605,0.642-2.02,0.695c-0.779,0.098-1.092,0.49-1.217,0.801c-0.163,0.403-0.064,0.808,0.094,1.139  c-0.295,0.194-0.656,0.41-0.966,0.575c0,0,0.003-0.015,0.005-0.023c0.111-0.622,0.191-1.071-0.11-1.431  c-0.153-0.184-0.38-0.289-0.624-0.289c-0.354,0-0.631,0.22-0.854,0.436c-0.626,0.604-1.004,1.356-1.145,1.641l-0.026,0.052  l-0.023,0.042c-0.271,0.519-0.382,0.887-0.231,2.028c-0.064,0.05-0.264,0.124-0.534,0.124c-0.036,0-0.07-0.001-0.095-0.004  c-0.176-0.189-0.42-0.298-0.693-0.298l0,0c-0.63,0-1.488,0.709-2.551,2.107l-0.342,0.451l0.347,0.446l0.323,0.411  c-5.066,3.918-5.104,4.14-5.157,4.468c-0.009,0.03-0.054,0.165-0.115,0.352c-0.754,2.348-1.174,4.104-0.765,5.044  c0.942,2.179,2.006,4.212,3.383,4.325c0.122,0.01,0.256,0.015,0.398,0.015c1.265,0,3.311-0.382,4.295-0.584  c0.182,0.341,0.402,0.738,0.527,0.956l0.217,0.39l0.445-0.015c0.004,0,0.239-0.009,0.539-0.009c0.342,0,0.573,0.011,0.723,0.021  c0.536,1.571,1.563,5.189,1.373,5.943l-0.004,0.002c-1.732,2.597,0.368,5.982,1.377,7.607c0.078,0.129,0.15,0.244,0.213,0.345  c0.389,1.108,0.861,1.841,1.856,1.841c0.075,0,0.149-0.004,0.227-0.01c0.058-0.002,0.115-0.004,0.175-0.004  c0.109,0,0.189,0.012,0.271,0.042l0.09,0.032l0.097,0.008c0.187,0.016,0.368,0.042,0.544,0.068c0.309,0.042,0.625,0.084,0.947,0.084  c0.868,0,1.555-0.327,2.148-1.028c0.023-0.003,0.044-0.005,0.067-0.008c0.622-0.086,0.854-0.398,0.935-0.678  c0.045-0.047,0.107-0.104,0.157-0.15c0.245-0.226,0.538-0.493,0.739-0.811c0.091-0.054,0.193-0.114,0.311-0.183  c0.2-0.124,0.428-0.26,0.605-0.352c0.157-0.05,0.297-0.142,0.401-0.271c0.251-0.31,0.2-0.659,0.157-0.941  c-0.041-0.291-0.084-0.592,0.072-0.911c0.889-0.428,2.466-1.479,2.721-1.652l-0.002,0.021c-0.016,0.141-0.057,0.517-0.119,0.757  c-0.336,0.335-0.617,0.845-0.704,1.018l-0.06,0.113l-0.018,0.125c-0.023,0.164-0.113,1.021,0.367,1.575  c0.242,0.277,0.59,0.432,0.978,0.432c0.124,0,0.253-0.016,0.384-0.047c1.234-0.279,3.426-3.249,3.604-4.888  c0.086-0.789-0.223-1.409-0.846-1.703l-0.465-0.221l-0.367,0.364l-1.352,1.353c-0.457,0.043-0.814,0.179-1.057,0.393  c0.014-0.578-0.043-1.17-0.104-1.745c-0.186-1.74-0.222-2.848,0.846-3.602l0.054-0.04l0.046-0.047  c0.387-0.392,0.813-0.734,1.264-1.099c1.059-0.85,2.152-1.729,2.804-3.315l0.027-0.067c0.209-0.543,0.524-1.361,0.097-1.984  c-0.107-0.155-0.33-0.395-0.75-0.478c0.556-0.225,0.98-0.399,1.023-0.417l0.129-0.052l0.1-0.097l2.281-2.19l0.334-0.321  l-0.146-0.441c-0.021-0.057-0.144-0.401-0.494-0.897c0.666,0.09,1.236,0.251,1.424,0.393c0.069,0.147,0.207,0.477,0.352,0.822  c2.512,5.918,2.863,6.224,3.518,6.233c0.025,0,0.045,0.002,0.061,0.005c0.055,0.002,0.101,0.004,0.145,0.004  c0.371,0,0.584-0.188,0.677-0.303c0.273-0.328,0.196-0.73,0.169-0.88l-0.01-0.052c-0.031-0.354-0.012-1.946,0.039-3.254  c0.004,0.002,0.004,0.006,0.008,0.011l1.346-0.534L56.406,22.84z M36.622,15.6c-0.104,0.004-0.217,0.009-0.338,0.014  c-0.388,0.02-0.828,0.038-1.268,0.038c-1.147,0-1.409-0.142-1.438-0.157c-0.135-0.1-0.275-0.174-0.42-0.226  c0.26-0.059,0.557-0.259,0.863-0.853c0.303,0.586,0.712,1.104,1.342,1.104c0.171,0,0.332-0.043,0.488-0.122  C36.063,15.401,36.413,15.522,36.622,15.6z M36.17,12.397c-0.086,0-0.156-0.004-0.211-0.009c0.059-0.153,0.129-0.243,0.186-0.293  c0.071,0.111,0.169,0.209,0.277,0.294C36.334,12.395,36.252,12.397,36.17,12.397z M31.6,13.933c0.394,0.771,0.686,1.103,0.916,1.246  c-0.57,0.047-1.001,0.409-1.354,0.752c-0.248-0.081-0.678-0.343-0.808-0.526c-0.075-0.106-0.165-0.199-0.265-0.279  C30.713,14.948,31.262,14.369,31.6,13.933z M29.428,13.366l-0.817-0.039l-2.737-0.134c0.332-0.275,0.65-0.534,0.837-0.686  c0.05-0.018,0.246-0.073,0.728-0.073c0.291,0,0.569,0.021,0.746,0.035L29.428,13.366z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="-2106.0845" cy="3754.9141" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="29.4754">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M7.703,27.745L7.703,27.745c0,0.009,0.001,0.014,0.001,0.022c0,0.747,0.047,1.484,0.112,2.218  c0.021,0.236,0.056,0.476,0.083,0.718c0.065,0.5,0.14,0.998,0.228,1.488c0.051,0.258,0.097,0.521,0.152,0.774  c0.114,0.508,0.244,1.008,0.386,1.501c0.06,0.204,0.107,0.411,0.169,0.61c0.009,0.023,0.019,0.04,0.023,0.061  c0.02-0.189,0.026-0.39,0.02-0.594C8.83,33.103,8.6,33.288,8.6,33.288l1.629-2.19v-1.402l-1.91-1.908  C8.319,27.787,7.704,27.69,7.703,27.745z" fill="url(#SVGID_6_)"/>
 <radialGradient cx="-2106.0928" cy="3754.918" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="29.4765">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M23.042,6.076c0.706,0.233,1.282-0.24,1.939-0.66c0.231-0.049,2.81-1.076,3.089-1.076  s1.216-0.036,1.448-0.409c0,0,4.035,0.702,4.644,0.468c0.33-0.13,1.723-0.24,2.914-0.317c-0.066-0.014-0.127-0.036-0.195-0.05  c-0.064-0.015-0.125-0.023-0.191-0.035c-0.75-0.152-1.505-0.272-2.277-0.35c-0.008,0-0.012,0-0.02-0.003  c-0.81-0.082-1.633-0.124-2.467-0.124c-0.773,0-1.535,0.045-2.291,0.117c-0.133,0.015-0.266,0.025-0.397,0.043  c-0.731,0.079-1.456,0.186-2.165,0.328c-0.013,0.005-0.025,0.005-0.037,0.008c-0.736,0.152-1.459,0.34-2.168,0.559  c-0.121,0.035-0.238,0.077-0.362,0.115c-0.626,0.202-1.248,0.427-1.856,0.678c-0.071,0.031-0.145,0.057-0.215,0.087  c-0.67,0.286-1.322,0.602-1.96,0.941c-0.097,0.053-0.188,0.108-0.282,0.163c-0.271,0.149-0.527,0.32-0.793,0.481  C20.713,7.479,22.349,5.842,23.042,6.076z" fill="url(#SVGID_7_)"/>
 <radialGradient cx="-2106.0928" cy="3754.9209" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="29.4743">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.3152" style="stop-color:#B7CC97"/>
+<stop offset="0.7273" style="stop-color:#568E4C"/>
+<stop offset="1" style="stop-color:#255541"/>
 </radialGradient>
 <path d="M55.685,22.962c-0.026-0.122-0.06-0.237-0.083-0.356c-0.127-0.601-0.28-1.19-0.455-1.773  c-0.045-0.154-0.092-0.316-0.143-0.474c-0.211-0.659-0.445-1.31-0.709-1.941c-0.047-0.112-0.1-0.223-0.15-0.331  c-0.242-0.56-0.504-1.104-0.789-1.639c-0.066-0.128-0.131-0.259-0.199-0.383c-0.336-0.604-0.691-1.194-1.074-1.768  c-0.064-0.1-0.137-0.192-0.203-0.292c-0.35-0.507-0.717-0.997-1.102-1.477c-0.078-0.094-0.152-0.192-0.233-0.287  c-0.442-0.532-0.909-1.044-1.396-1.534c-0.082-0.085-0.172-0.17-0.259-0.252c-0.444-0.437-0.907-0.857-1.387-1.258  c-0.079-0.069-0.157-0.139-0.237-0.206c-0.537-0.439-1.1-0.857-1.678-1.254c-0.1-0.069-0.203-0.135-0.307-0.2  c-0.531-0.354-1.079-0.686-1.643-0.998c-0.074-0.042-0.148-0.087-0.225-0.129c-0.625-0.336-1.262-0.642-1.916-0.924  c-0.117-0.049-0.232-0.096-0.348-0.145c-0.254-0.104-0.521-0.188-0.777-0.282c-0.306,0.195-1.729,1.001-1.729,1.001  s-6.18-0.846-6.602-0.426c-0.423,0.426-2.068,0.854-2.441,0.903c-0.376,0.049-1.151,0.247-0.221,1.396  c-0.139,0.141-2.795,1.99-2.795,1.15s0.594-2.348-0.24-1.54c-0.599,0.577-0.957,1.364-1.034,1.51  c-0.195,0.375-0.315,0.554-0.174,1.632c0.142,1.077-1.719,1.07-1.845,0.791c-0.332-0.746-2.174,1.676-2.174,1.676l0.776,0.996  c0,0-5.421,4.177-5.468,4.456c-0.048,0.282-1.399,3.907-0.93,4.984c0.468,1.079,1.652,3.797,2.771,3.888  c1.47,0.12,5.032-0.673,5.032-0.673c0.097,0.236,0.768,1.43,0.768,1.43s1.747-0.058,1.843,0.133  c0.033,0.063,2.104,6.157,1.422,6.965c-1.632,2.444,0.932,6.024,1.645,7.235c0.715,2.08,1.176,1.148,2.115,1.489  c1.155,0.101,2.129,0.528,3.111-0.735c0.285-0.235,0.77-0.049,0.77-0.376c0-0.183,0.84-0.718,1.057-1.223  c0.226-0.105,0.811-0.498,1.205-0.688c0.36-0.023-0.34-0.986,0.372-2.002c0.769-0.303,2.842-1.7,2.842-1.7  c0.095-2.05-1.01-4.581,1.05-6.033c1.326-1.355,3.068-2.126,3.912-4.183c0.232-0.61,0.756-1.854-0.744-1.48  c-1.41,0.354-2.981,0.435-2.236-0.187c-0.086-0.761-1.022-1.12-1.863-1.863c-0.436-1.028-1.118-2.86-1.118-2.86l-1.491-2.266  l0.186-0.468l1.773,2.609l1.771,2.142c0.65,2.143,1.209,2.33,1.209,2.33c0.98-0.345,3.311-1.305,3.311-1.305l2.281-2.19  c0,0-0.233-0.697-1.16-1.583l-0.703-0.418c-0.152,0.43-0.965,0.59-0.965,0.59l-1.973-2.361l0.733-0.147l0.565,1.076l1.356,0.47  c0,0,0.377-0.274,1.073,0.446c0.568-0.047,2.788,0.108,3.306,0.765c0.102,0.13,2.748,6.739,3.271,6.749  c0.229,0.002,0.395,0.091,0.32-0.309c-0.094-0.188,0-4.338,0.14-5.229c0.354-0.753,0.412-0.002,1.25,1.428  C55.696,23.033,55.692,22.997,55.685,22.962z M32.397,6.947c0.184-0.552,1.258-0.739,1.258-0.739s-0.308,0.568-0.236,0.859  c0.072,0.298-0.49,0.483-0.554,1.182c-0.061,0.694-1.343,0.287-1.447,0.043C31.311,8.049,32.208,7.497,32.397,6.947z M36.993,16.324  c-0.795,0-3.18,0.235-3.834-0.234c-0.658-0.467-1.168,0.05-1.639,0.52c-0.311,0.303-1.434-0.314-1.765-0.782  c-0.325-0.467-1.429-0.434-1.429-0.434l0.251-1.335l-3.171-0.154l-1.802,0.528l-1.694,0.05l0.95-0.454l1.181-0.278  c0,0,1.721-1.414,2.235-1.834c0.435-0.356,2.177-0.155,2.177-0.155l1.91,1.378c0,0-0.424,1.08-0.611,1.312  c0.701-0.047,1.525-1.321,1.525-1.321c-1.488-1.368-1.428-1.832-1.428-1.832l1.963,1.377l0.02,0.012c0,0,0.795,1.874,1.127,1.874  c0.326,0,0.744-1.289,0.744-1.289l0.559-0.142c0.248,0.593,0.715,1.929,1.272,1.614c0.323-0.177,0.854-0.015,1.462,0.218  c0.611,0.235,1.025-0.124,1.521,0.31C38.452,17.195,37.321,16.419,36.993,16.324z M38.239,13.102  c-0.818-0.311-3.587,0.704-2.969-0.957c0.33-0.896,1.179-1.083,1.469-0.487c0.076,0.247,0.998,0.625,0.99,0.108  c-0.006-0.518,0.928-0.791,1.063-0.406C38.293,11.716,40.737,13.58,38.239,13.102z M43.454,14.675  c-0.453-0.364,0.205-0.679-0.465-1.252c-0.959-0.822-1.708-1.176-0.401-1.841c1.612-0.202,0.263,0.515,0.529,0.943  c0.144,0.23,0.956,0.996,1.593,1.938C45.238,15.244,43.905,15.038,43.454,14.675z" fill="url(#SVGID_8_)"/>
 <radialGradient cx="-2106.0933" cy="3754.916" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="29.4698">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M44.104,36.019l-1.555,1.552c0,0-0.934,0-0.979,0.378c-0.021,0.159-0.075,0.853-0.23,1.209  c-0.311,0.217-0.684,0.931-0.684,0.931s-0.191,1.382,0.839,1.146C42.526,41.001,45.698,36.77,44.104,36.019z" fill="url(#SVGID_9_)"/>
 <path d="M32.02,52.439c1.859,0,3.664-0.209,5.408-0.589  c-0.047-0.059-0.086-0.12-0.137-0.174l-9.057-9.324c-0.522-0.537-1.239-0.847-1.97-0.847c-0.685,0-1.324,0.265-1.804,0.751  l-1.373,1.418l-0.568,0.573l-0.524,0.537c-1.987-1.927-3.765-4.139-5.697-7.06c-1.067-1.62-1.986-3.592-2.57-4.956l-0.213-0.51  c0,0-0.291-0.718-0.39-0.975l-0.032-0.082c-0.081-0.211-0.153-0.408-0.221-0.601l-0.031-0.083l2.215-0.77  c1.222-0.414,1.915-1.688,1.638-3.071l-0.009-0.045l-1.386-4.235l-2.734-8.158c-0.193-0.582-0.564-1.064-1.032-1.394  c-2.904,4.096-4.617,9.095-4.617,14.496C6.917,41.205,18.155,52.439,32.02,52.439z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
 <path d="M32.02,52.439c1.563,0,3.09-0.15,4.576-0.422l-8.889-9.153  c-0.386-0.396-0.912-0.624-1.442-0.624c-0.485,0-0.936,0.188-1.274,0.531l-1.381,1.42l-0.561,0.568l-0.51,0.523l0.004,0.005  l-0.523,0.535c-2.243-2.087-4.219-4.489-6.334-7.693c-1.095-1.661-2.036-3.678-2.634-5.074l-0.19-0.45l-0.029-0.071  c0,0-0.292-0.723-0.393-0.981l-0.035-0.087c-0.082-0.216-0.156-0.415-0.229-0.614c0,0-0.144-0.406-0.174-0.493l0.085-0.354  l2.731-0.951c0.866-0.294,1.355-1.214,1.161-2.187l-0.008-0.044l-1.373-4.188l-2.734-8.161c-0.144-0.43-0.412-0.781-0.752-1.024  c-2.648,3.98-4.198,8.756-4.198,13.893C6.917,41.205,18.155,52.439,32.02,52.439z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <radialGradient cx="-2983.5728" cy="4023.543" gradientTransform="matrix(0.9654 -0.0107 -0.0107 -0.9654 2968.4299 3872.1846)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="42.6078">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.8364" style="stop-color:#E9F0F2"/>
-<stop offset="0.8909" style="stop-color:#AAB1B5"/>
-<stop offset="0.9515" style="stop-color:#7C878C"/>
-<stop offset="1" style="stop-color:#838F94"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.8364" style="stop-color:#ECEFED"/>
+<stop offset="0.8909" style="stop-color:#ADB2B1"/>
+<stop offset="0.9515" style="stop-color:#818587"/>
+<stop offset="1" style="stop-color:#888E8F"/>
 </radialGradient>
 <path d="M22.051,46.847c-2.873-2.563-5.037-5.372-6.979-8.311c-1.865-2.832-3.556-7.079-4.079-8.93  l-7.54-10.621c-0.429,0.711-1.107,3.264-0.794,6.717c0.316,3.454,3.534,11.814,7.313,17.545c3.782,5.731,9.389,11.118,11.269,12.311  c2.959,1.878,6.523,2.493,7.608,2.439c0,0,1.002-0.118,2.367-0.597C31.803,57.196,22.051,46.847,22.051,46.847z" fill="url(#SVGID_10_)"/>
 <path d="M12.413,33.434c-0.661-1.542-1.174-2.953-1.418-3.827L3.658,19.27  c-0.077,0.108-0.12,0.173-0.12,0.173c-0.126,0.207-0.266,0.55-0.406,0.977c-0.142,0.722-0.214,1.466-0.202,2.229  C3.002,28.046,7.083,32.497,12.413,33.434z" fill-opacity="0.05" stroke-opacity="0.05"/>
 <path d="M12.099,32.685c-0.507-1.242-0.899-2.348-1.104-3.078l-7.363-10.37  C3.548,19.356,3.5,19.429,3.5,19.429c-0.118,0.195-0.25,0.522-0.383,0.925c-0.134,0.682-0.202,1.383-0.19,2.105  C2.997,27.635,6.961,31.889,12.099,32.685z" fill-opacity="0.05" stroke-opacity="0.05"/>
 <path d="M3.443,19.407c-0.105,0.177-0.226,0.472-0.348,0.839  c-0.123,0.617-0.183,1.256-0.172,1.911c0.064,4.82,3.858,8.755,8.702,9.323c-0.278-0.742-0.495-1.39-0.632-1.874L3.596,19.185  C3.496,19.325,3.443,19.407,3.443,19.407z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <radialGradient cx="-3022.0488" cy="4026.5146" gradientTransform="matrix(0.9664 -0.0083 -0.013 -0.9569 2980.2107 3844.9014)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="14.7389">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0424" style="stop-color:#D3D7D5"/>
+<stop offset="0.4" style="stop-color:#BDC0BF"/>
+<stop offset="0.7333" style="stop-color:#82898B"/>
+<stop offset="1" style="stop-color:#ACB2B1"/>
 </radialGradient>
 <path d="M10.993,29.606l1.577-0.554c0,0-3.343-14.954-4.669-14.266c-0.667,0.348-0.66,0.538-1.335,1.026  c-2.014,1.464-3.112,3.174-3.112,3.174c-0.092,0.155-0.197,0.415-0.303,0.737c-0.105,0.54-0.161,1.102-0.153,1.672  c0.06,4.353,3.581,7.891,8.007,8.225C11,29.616,10.995,29.611,10.993,29.606z" fill="url(#SVGID_11_)"/>
 <path d="M21.933,48.33c-0.311,0.874-0.481,1.802-0.47,2.769  c0.031,2.291,1.062,4.354,2.695,5.889c2.064,0.771,3.951,1.047,4.689,1.01c0,0,1.002-0.118,2.367-0.597  c0.492-0.171-6.277-7.469-8.48-9.823L21.933,48.33z" fill-opacity="0.05" stroke-opacity="0.05"/>
 <path d="M22.125,47.537c-0.313,0.871-0.481,1.799-0.47,2.766  c0.043,3.142,1.947,5.86,4.748,7.363c0.927,0.218,1.705,0.318,2.198,0.331c0.013,0,0.032,0.002,0.045,0c0,0,1-0.115,2.37-0.594  c0.508-0.179-6.761-7.982-8.693-10.055L22.125,47.537z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <radialGradient cx="-3005.0166" cy="3996.4961" gradientTransform="matrix(0.9664 -0.0083 -0.013 -0.9569 2980.2107 3844.9014)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="14.9991">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0424" style="stop-color:#D3D7D5"/>
+<stop offset="0.4" style="stop-color:#BDC0BF"/>
+<stop offset="0.7333" style="stop-color:#82898B"/>
+<stop offset="1" style="stop-color:#ACB2B1"/>
 </radialGradient>
 <path d="M33.125,56.564c0.785-0.42,0.984-0.408,1.625-0.887c1.178-0.891-10.615-10.968-10.615-10.968  l-2.057,2.111c-0.277,0.833-0.428,1.724-0.415,2.648c0.062,4.526,3.869,8.17,8.542,8.24C30.997,57.499,32.036,57.146,33.125,56.564z  " fill="url(#SVGID_12_)"/>
 <path d="M11.808,29.311l0.762-0.258c0,0-3.343-14.954-4.669-14.266  c-0.35,0.181-0.515,0.322-0.688,0.481L11.808,29.311z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientTransform="matrix(0.9999 -0.0111 -0.0111 -0.9999 3135.2356 3906.9067)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-3082.8984" x2="-3077.6428" y1="3928.3984" y2="3911.7034">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.4" style="stop-color:#D4D9DB"/>
-<stop offset="0.7333" style="stop-color:#98AAAD"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.0424" style="stop-color:#ECEFED"/>
+<stop offset="0.4" style="stop-color:#D6D9D7"/>
+<stop offset="0.7333" style="stop-color:#9EA7A5"/>
+<stop offset="1" style="stop-color:#D4DAD7"/>
 </linearGradient>
 <path d="M12.57,29.056l2.016-0.703c0.523-0.176,0.792-0.756,0.676-1.346l-1.356-4.141l-2.734-8.162  c-0.214-0.641-0.854-1.006-1.43-0.813c0,0-0.515,0.211-1.837,0.898L12.57,29.056z" fill="url(#SVGID_13_)"/>
 <path d="M24.135,44.708l-0.563,0.568l10.516,10.866  c0.227-0.158,0.457-0.313,0.662-0.468C35.928,54.784,24.135,44.708,24.135,44.708z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientTransform="matrix(0.9999 -0.0111 -0.0111 -0.9999 3135.2356 3906.9067)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-3066.7827" x2="-3055.8347" y1="3897.6836" y2="3885.627">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.4" style="stop-color:#D4D9DB"/>
-<stop offset="0.7333" style="stop-color:#98AAAD"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.0424" style="stop-color:#ECEFED"/>
+<stop offset="0.4" style="stop-color:#D6D9D7"/>
+<stop offset="0.7333" style="stop-color:#9EA7A5"/>
+<stop offset="1" style="stop-color:#D4DAD7"/>
 </linearGradient>
 <path d="M34.749,55.673c1.176-0.889,1.558-1.273,1.558-1.273c0.438-0.448,0.407-1.204-0.071-1.697  l-9.057-9.322c-0.478-0.496-1.222-0.544-1.66-0.097l-1.383,1.425L34.749,55.673z" fill="url(#SVGID_14_)"/>
 </g>
@@ -114,37 +114,37 @@
 <path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962  c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706  l-2.747,2.749v12.253H2.749z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.415" x2="15.415" y1="28.6694" y2="12.5688">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+<stop offset="0.6606" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#BABCBB"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="27.081,28.823 3.749,28.823 3.749,14.473 15.414,5.489 27.081,14.473 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.415" x2="15.415" y1="17.313" y2="28.6013">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+<stop offset="0.6606" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#BABCBB"/>
 </linearGradient>
 <path d="M15.414,6.668l10.736,8.264V27.89H4.682V14.932L15.414,6.668 M15.414,5.489L3.749,14.473v14.351  h23.333V14.473L15.414,5.489L15.414,5.489z" fill="url(#SVGID_2__)"/>
 <polygon fill-opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 " stroke-opacity="0.2"/>
 <polygon fill="#727272" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,6.655 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15.416" x2="15.416" y1="17.9946" y2="29.1519">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <rect fill="url(#SVGID_3__)" height="10.501" width="7.001" x="11.916" y="18.322"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15.416" x2="15.416" y1="28.7466" y2="18.3602">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <path d="M17.98,19.257v8.633h-5.133v-8.633H17.98 M18.917,18.322h-7.001v10.501h7.001V18.322L18.917,18.322z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15.4136" x2="15.4136" y1="0.0352" y2="17.7271">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<stop offset="0" style="stop-color:#A8835F"/>
+<stop offset="0.2606" style="stop-color:#A86F5F"/>
+<stop offset="1" style="stop-color:#9A5047"/>
 </linearGradient>
 <path d="M15.414,5.489l11.667,11.667l2.333-2.333c0,0-12.586-12.554-13.171-13.175  c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14l2.335,2.333L15.414,5.489z" fill="url(#SVGID_5__)"/>
 <radialGradient cx="15.2969" cy="1.7559" gradientUnits="userSpaceOnUse" id="SVGID_6__" r="18.6679">
-<stop offset="0" style="stop-color:#F7D481"/>
-<stop offset="1" style="stop-color:#F5340A"/>
+<stop offset="0" style="stop-color:#D4C9A4"/>
+<stop offset="1" style="stop-color:#AF6151"/>
 </radialGradient>
 <path d="M14.553,2.616c0.724-0.688,1.102-0.653,1.689-0.034c0.516,0.549,10.433,10.442,12.705,12.709  l0.467-0.468c0,0-12.586-12.554-13.171-13.175c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14  l0.467,0.465C4.134,13.029,13.917,3.225,14.553,2.616z" fill="url(#SVGID_6__)"/>
 <rect fill-opacity="0.2" height="1.168" stroke-opacity="0.2" width="7.001" x="11.916" y="18.322"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_work.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_work.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_work.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,107 +5,107 @@
 <rect fill="none" height="60" width="60"/>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2162.3384" x2="-2162.3384" y1="3603.7246" y2="3654.8755">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#2A3662"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <circle cx="31.662" cy="27.76" fill="url(#SVGID_1_)" r="25.76"/>
 <radialGradient cx="-2106.918" cy="3745.7734" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="32.2687">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <path d="M56.761,27.759c0,13.864-11.234,25.097-25.099,25.097c-13.863,0-25.101-11.232-25.101-25.097  c0-13.859,11.239-25.099,25.101-25.099C45.53,2.66,56.761,13.899,56.761,27.759z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2162.3384" x2="-2162.3384" y1="3654.5078" y2="3603.9641">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#A6CDC2"/>
 </linearGradient>
 <path d="M31.663,2.66c-13.863,0-25.101,11.239-25.101,25.099  c0,13.864,11.239,25.097,25.101,25.097c13.864,0,25.099-11.232,25.099-25.097C56.761,13.899,45.53,2.66,31.663,2.66z M31.663,50.659  c-13.033,0-23.638-10.598-23.638-23.63c0-13.034,10.603-23.637,23.638-23.637c13.033,0,23.634,10.603,23.634,23.637  C55.296,40.06,44.696,50.659,31.663,50.659z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2187.0283" x2="-2183.0366" y1="3625.7734" y2="3625.7734">
-<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="0" style="stop-color:#59595A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M8.918,27.351c-0.268-0.357-0.871-0.357-1.137-0.357  c-0.525,0-0.804,0.376-0.809,0.742v0.023l0.001,0.038c-0.001,0.646,0.035,1.37,0.113,2.251c0.016,0.164,0.036,0.331,0.057,0.498  l0.028,0.241c0.067,0.521,0.145,1.033,0.235,1.531l0.041,0.218c0.038,0.198,0.075,0.391,0.117,0.583  c0.107,0.488,0.238,0.993,0.399,1.552c0.023,0.08,0.044,0.159,0.065,0.239c0.036,0.132,0.07,0.261,0.11,0.388l0.006,0.017  l0.014,0.04c-0.003-0.012-0.009-0.028-0.012-0.045l1.44-0.097c0.022-0.227,0.028-0.46,0.022-0.691  c-0.012-0.364-0.025-0.813-0.129-1.191l1.337-1.796l0.145-0.194v-0.244v-1.4v-0.303l-0.215-0.215L8.918,27.351z" fill="url(#SVGID_4_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2179.3354" x2="-2137.5874" y1="3633.083" y2="3633.083">
-<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="0" style="stop-color:#59595A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M56.406,22.84c-0.019-0.094-0.034-0.161-0.052-0.229  c-0.013-0.051-0.024-0.101-0.034-0.15c-0.128-0.595-0.285-1.208-0.472-1.832l-0.02-0.071c-0.041-0.14-0.082-0.281-0.127-0.42  c-0.227-0.706-0.473-1.38-0.732-2.003c-0.031-0.078-0.066-0.149-0.1-0.226l-0.055-0.119c-0.246-0.57-0.523-1.139-0.813-1.688  l-0.036-0.071c-0.057-0.107-0.111-0.216-0.17-0.321c-0.354-0.642-0.728-1.251-1.103-1.819c-0.04-0.06-0.085-0.122-0.13-0.184  c-0.027-0.038-0.054-0.075-0.078-0.111c-0.363-0.525-0.743-1.037-1.138-1.525l-0.076-0.099c-0.053-0.065-0.106-0.133-0.161-0.199  c-0.459-0.55-0.941-1.08-1.441-1.583c-0.068-0.067-0.139-0.138-0.211-0.209l-0.061-0.057c-0.45-0.44-0.93-0.878-1.422-1.289  l-0.097-0.083c-0.05-0.046-0.101-0.087-0.15-0.128c-0.536-0.441-1.118-0.875-1.725-1.291c-0.075-0.052-0.153-0.101-0.229-0.15  l-0.092-0.061c-0.546-0.362-1.115-0.709-1.688-1.023l-0.085-0.052c-0.049-0.028-0.096-0.054-0.144-0.082  c-0.636-0.341-1.3-0.66-1.976-0.951l-0.17-0.068l-0.186-0.077c-0.177-0.073-0.355-0.136-0.531-0.197  c-0.093-0.03-0.182-0.063-0.275-0.097l-0.339-0.127l-0.308,0.195c-0.203,0.129-1.01,0.589-1.484,0.859  c-0.526-0.07-1.801-0.23-3.089-0.355c0.396-0.036,0.946-0.082,1.719-0.133l0.108-1.446l-0.059-0.017  c-0.047-0.012-0.092-0.024-0.139-0.035l-0.111-0.021l-0.088-0.017c-0.789-0.159-1.529-0.273-2.264-0.351L34.57,2.925l-0.103-0.011  c-0.84-0.083-1.693-0.127-2.539-0.127c-0.744,0-1.517,0.04-2.361,0.122c-0.13,0.013-0.256,0.025-0.385,0.038  C28.35,3.041,27.62,3.151,26.93,3.292l-0.024,0.002l-0.017,0.003c-0.727,0.149-1.457,0.338-2.232,0.573  c-0.068,0.022-0.139,0.044-0.207,0.067l-0.156,0.052c-0.658,0.212-1.303,0.444-1.92,0.7c-0.051,0.021-0.086,0.032-0.121,0.046  l-0.094,0.038c-0.678,0.288-1.354,0.615-2.028,0.977c-0.073,0.037-0.142,0.079-0.212,0.118l-0.084,0.054  c-0.189,0.103-0.381,0.223-0.569,0.34l-0.244,0.153l-1.345,0.821l1.494,0.499c0.223,0.076,0.463,0.111,0.711,0.111  c0.805,0,1.582-0.395,2.209-0.713c0.252-0.125,0.627-0.317,0.779-0.346c0.182,0.054,0.369,0.082,0.55,0.082  c0.685,0,1.244-0.368,1.739-0.694l0.135-0.087c0.16-0.052,0.434-0.154,0.98-0.359c0.561-0.209,1.58-0.593,1.854-0.658  c0.527-0.005,1.16-0.079,1.609-0.359c0.422,0.07,1.174,0.188,1.945,0.289c-0.057,0.034-0.112,0.07-0.158,0.115  c-0.251,0.232-1.605,0.642-2.02,0.695c-0.779,0.098-1.092,0.49-1.217,0.801c-0.163,0.403-0.064,0.808,0.094,1.139  c-0.295,0.194-0.656,0.41-0.966,0.575c0,0,0.003-0.015,0.005-0.023c0.111-0.622,0.191-1.071-0.11-1.431  c-0.153-0.184-0.38-0.289-0.624-0.289c-0.354,0-0.631,0.22-0.854,0.436c-0.626,0.604-1.004,1.356-1.145,1.641l-0.026,0.052  l-0.023,0.042c-0.271,0.519-0.382,0.887-0.231,2.028c-0.064,0.05-0.264,0.124-0.534,0.124c-0.036,0-0.07-0.001-0.095-0.004  c-0.176-0.189-0.42-0.298-0.693-0.298l0,0c-0.63,0-1.488,0.709-2.551,2.107l-0.342,0.451l0.347,0.446l0.323,0.411  c-5.066,3.918-5.104,4.14-5.157,4.468c-0.009,0.03-0.054,0.165-0.115,0.352c-0.754,2.348-1.174,4.104-0.765,5.044  c0.942,2.179,2.006,4.212,3.383,4.325c0.122,0.01,0.256,0.015,0.398,0.015c1.265,0,3.311-0.382,4.295-0.584  c0.182,0.341,0.402,0.738,0.527,0.956l0.217,0.39l0.445-0.015c0.004,0,0.239-0.009,0.539-0.009c0.342,0,0.573,0.011,0.723,0.021  c0.536,1.571,1.563,5.189,1.373,5.943l-0.004,0.002c-1.732,2.597,0.368,5.982,1.377,7.607c0.078,0.129,0.15,0.244,0.213,0.345  c0.389,1.108,0.861,1.841,1.856,1.841c0.075,0,0.149-0.004,0.227-0.01c0.058-0.002,0.115-0.004,0.175-0.004  c0.109,0,0.189,0.012,0.271,0.042l0.09,0.032l0.097,0.008c0.187,0.016,0.368,0.042,0.544,0.068c0.309,0.042,0.625,0.084,0.947,0.084  c0.868,0,1.555-0.327,2.148-1.028c0.023-0.003,0.044-0.005,0.067-0.008c0.622-0.086,0.854-0.398,0.935-0.678  c0.045-0.047,0.107-0.104,0.157-0.15c0.245-0.226,0.538-0.493,0.739-0.811c0.091-0.054,0.193-0.114,0.311-0.183  c0.2-0.124,0.428-0.26,0.605-0.352c0.157-0.05,0.297-0.142,0.401-0.271c0.251-0.31,0.2-0.659,0.157-0.941  c-0.041-0.291-0.084-0.592,0.072-0.911c0.889-0.428,2.466-1.479,2.721-1.652l-0.002,0.021c-0.016,0.141-0.057,0.517-0.119,0.757  c-0.336,0.335-0.617,0.845-0.704,1.018l-0.06,0.113l-0.018,0.125c-0.023,0.164-0.113,1.021,0.367,1.575  c0.242,0.277,0.59,0.432,0.978,0.432c0.124,0,0.253-0.016,0.384-0.047c1.234-0.279,3.426-3.249,3.604-4.888  c0.086-0.789-0.223-1.409-0.846-1.703l-0.465-0.221l-0.367,0.364l-1.352,1.353c-0.457,0.043-0.814,0.179-1.057,0.393  c0.014-0.578-0.043-1.17-0.104-1.745c-0.186-1.74-0.222-2.848,0.846-3.602l0.054-0.04l0.046-0.047  c0.387-0.392,0.813-0.734,1.264-1.099c1.059-0.85,2.152-1.729,2.804-3.315l0.027-0.067c0.209-0.543,0.524-1.361,0.097-1.984  c-0.107-0.155-0.33-0.395-0.75-0.478c0.556-0.225,0.98-0.399,1.023-0.417l0.129-0.052l0.1-0.097l2.281-2.19l0.334-0.321  l-0.146-0.441c-0.021-0.057-0.144-0.401-0.494-0.897c0.666,0.09,1.236,0.251,1.424,0.393c0.069,0.147,0.207,0.477,0.352,0.822  c2.512,5.918,2.863,6.224,3.518,6.233c0.025,0,0.045,0.002,0.061,0.005c0.055,0.002,0.101,0.004,0.145,0.004  c0.371,0,0.584-0.188,0.677-0.303c0.273-0.328,0.196-0.73,0.169-0.88l-0.01-0.052c-0.031-0.354-0.012-1.946,0.039-3.254  c0.004,0.002,0.004,0.006,0.008,0.011l1.346-0.534L56.406,22.84z M36.622,15.6c-0.104,0.004-0.217,0.009-0.338,0.014  c-0.388,0.02-0.828,0.038-1.268,0.038c-1.147,0-1.409-0.142-1.438-0.157c-0.135-0.1-0.275-0.174-0.42-0.226  c0.26-0.059,0.557-0.259,0.863-0.853c0.303,0.586,0.712,1.104,1.342,1.104c0.171,0,0.332-0.043,0.488-0.122  C36.063,15.401,36.413,15.522,36.622,15.6z M36.17,12.397c-0.086,0-0.156-0.004-0.211-0.009c0.059-0.153,0.129-0.243,0.186-0.293  c0.071,0.111,0.169,0.209,0.277,0.294C36.334,12.395,36.252,12.397,36.17,12.397z M31.6,13.933c0.394,0.771,0.686,1.103,0.916,1.246  c-0.57,0.047-1.001,0.409-1.354,0.752c-0.248-0.081-0.678-0.343-0.808-0.526c-0.075-0.106-0.165-0.199-0.265-0.279  C30.713,14.948,31.262,14.369,31.6,13.933z M29.428,13.366l-0.817-0.039l-2.737-0.134c0.332-0.275,0.65-0.534,0.837-0.686  c0.05-0.018,0.246-0.073,0.728-0.073c0.291,0,0.569,0.021,0.746,0.035L29.428,13.366z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="-2106.0845" cy="3754.9141" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="29.4754">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M7.703,27.745L7.703,27.745c0,0.009,0.001,0.014,0.001,0.022c0,0.747,0.047,1.484,0.112,2.218  c0.021,0.236,0.056,0.476,0.083,0.718c0.065,0.5,0.14,0.998,0.228,1.488c0.051,0.258,0.097,0.521,0.152,0.774  c0.114,0.508,0.244,1.008,0.386,1.501c0.06,0.204,0.107,0.411,0.169,0.61c0.009,0.023,0.019,0.04,0.023,0.061  c0.02-0.189,0.026-0.39,0.02-0.594C8.83,33.103,8.6,33.288,8.6,33.288l1.629-2.19v-1.402l-1.91-1.908  C8.319,27.787,7.704,27.69,7.703,27.745z" fill="url(#SVGID_6_)"/>
 <radialGradient cx="-2106.0928" cy="3754.918" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="29.4765">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M23.042,6.076c0.706,0.233,1.282-0.24,1.939-0.66c0.231-0.049,2.81-1.076,3.089-1.076  s1.216-0.036,1.448-0.409c0,0,4.035,0.702,4.644,0.468c0.33-0.13,1.723-0.24,2.914-0.317c-0.066-0.014-0.127-0.036-0.195-0.05  c-0.064-0.015-0.125-0.023-0.191-0.035c-0.75-0.152-1.505-0.272-2.277-0.35c-0.008,0-0.012,0-0.02-0.003  c-0.81-0.082-1.633-0.124-2.467-0.124c-0.773,0-1.535,0.045-2.291,0.117c-0.133,0.015-0.266,0.025-0.397,0.043  c-0.731,0.079-1.456,0.186-2.165,0.328c-0.013,0.005-0.025,0.005-0.037,0.008c-0.736,0.152-1.459,0.34-2.168,0.559  c-0.121,0.035-0.238,0.077-0.362,0.115c-0.626,0.202-1.248,0.427-1.856,0.678c-0.071,0.031-0.145,0.057-0.215,0.087  c-0.67,0.286-1.322,0.602-1.96,0.941c-0.097,0.053-0.188,0.108-0.282,0.163c-0.271,0.149-0.527,0.32-0.793,0.481  C20.713,7.479,22.349,5.842,23.042,6.076z" fill="url(#SVGID_7_)"/>
 <radialGradient cx="-2106.0928" cy="3754.9209" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="29.4743">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.3152" style="stop-color:#B7CC97"/>
+<stop offset="0.7273" style="stop-color:#568E4C"/>
+<stop offset="1" style="stop-color:#255541"/>
 </radialGradient>
 <path d="M55.685,22.962c-0.026-0.122-0.06-0.237-0.083-0.356c-0.127-0.601-0.28-1.19-0.455-1.773  c-0.045-0.154-0.092-0.316-0.143-0.474c-0.211-0.659-0.445-1.31-0.709-1.941c-0.047-0.112-0.1-0.223-0.15-0.331  c-0.242-0.56-0.504-1.104-0.789-1.639c-0.066-0.128-0.131-0.259-0.199-0.383c-0.336-0.604-0.691-1.194-1.074-1.768  c-0.064-0.1-0.137-0.192-0.203-0.292c-0.35-0.507-0.717-0.997-1.102-1.477c-0.078-0.094-0.152-0.192-0.233-0.287  c-0.442-0.532-0.909-1.044-1.396-1.534c-0.082-0.085-0.172-0.17-0.259-0.252c-0.444-0.437-0.907-0.857-1.387-1.258  c-0.079-0.069-0.157-0.139-0.237-0.206c-0.537-0.439-1.1-0.857-1.678-1.254c-0.1-0.069-0.203-0.135-0.307-0.2  c-0.531-0.354-1.079-0.686-1.643-0.998c-0.074-0.042-0.148-0.087-0.225-0.129c-0.625-0.336-1.262-0.642-1.916-0.924  c-0.117-0.049-0.232-0.096-0.348-0.145c-0.254-0.104-0.521-0.188-0.777-0.282c-0.306,0.195-1.729,1.001-1.729,1.001  s-6.18-0.846-6.602-0.426c-0.423,0.426-2.068,0.854-2.441,0.903c-0.376,0.049-1.151,0.247-0.221,1.396  c-0.139,0.141-2.795,1.99-2.795,1.15s0.594-2.348-0.24-1.54c-0.599,0.577-0.957,1.364-1.034,1.51  c-0.195,0.375-0.315,0.554-0.174,1.632c0.142,1.077-1.719,1.07-1.845,0.791c-0.332-0.746-2.174,1.676-2.174,1.676l0.776,0.996  c0,0-5.421,4.177-5.468,4.456c-0.048,0.282-1.399,3.907-0.93,4.984c0.468,1.079,1.652,3.797,2.771,3.888  c1.47,0.12,5.032-0.673,5.032-0.673c0.097,0.236,0.768,1.43,0.768,1.43s1.747-0.058,1.843,0.133  c0.033,0.063,2.104,6.157,1.422,6.965c-1.632,2.444,0.932,6.024,1.645,7.235c0.715,2.08,1.176,1.148,2.115,1.489  c1.155,0.101,2.129,0.528,3.111-0.735c0.285-0.235,0.77-0.049,0.77-0.376c0-0.183,0.84-0.718,1.057-1.223  c0.226-0.105,0.811-0.498,1.205-0.688c0.36-0.023-0.34-0.986,0.372-2.002c0.769-0.303,2.842-1.7,2.842-1.7  c0.095-2.05-1.01-4.581,1.05-6.033c1.326-1.355,3.068-2.126,3.912-4.183c0.232-0.61,0.756-1.854-0.744-1.48  c-1.41,0.354-2.981,0.435-2.236-0.187c-0.086-0.761-1.022-1.12-1.863-1.863c-0.436-1.028-1.118-2.86-1.118-2.86l-1.491-2.266  l0.186-0.468l1.773,2.609l1.771,2.142c0.65,2.143,1.209,2.33,1.209,2.33c0.98-0.345,3.311-1.305,3.311-1.305l2.281-2.19  c0,0-0.233-0.697-1.16-1.583l-0.703-0.418c-0.152,0.43-0.965,0.59-0.965,0.59l-1.973-2.361l0.733-0.147l0.565,1.076l1.356,0.47  c0,0,0.377-0.274,1.073,0.446c0.568-0.047,2.788,0.108,3.306,0.765c0.102,0.13,2.748,6.739,3.271,6.749  c0.229,0.002,0.395,0.091,0.32-0.309c-0.094-0.188,0-4.338,0.14-5.229c0.354-0.753,0.412-0.002,1.25,1.428  C55.696,23.033,55.692,22.997,55.685,22.962z M32.397,6.947c0.184-0.552,1.258-0.739,1.258-0.739s-0.308,0.568-0.236,0.859  c0.072,0.298-0.49,0.483-0.554,1.182c-0.061,0.694-1.343,0.287-1.447,0.043C31.311,8.049,32.208,7.497,32.397,6.947z M36.993,16.324  c-0.795,0-3.18,0.235-3.834-0.234c-0.658-0.467-1.168,0.05-1.639,0.52c-0.311,0.303-1.434-0.314-1.765-0.782  c-0.325-0.467-1.429-0.434-1.429-0.434l0.251-1.335l-3.171-0.154l-1.802,0.528l-1.694,0.05l0.95-0.454l1.181-0.278  c0,0,1.721-1.414,2.235-1.834c0.435-0.356,2.177-0.155,2.177-0.155l1.91,1.378c0,0-0.424,1.08-0.611,1.312  c0.701-0.047,1.525-1.321,1.525-1.321c-1.488-1.368-1.428-1.832-1.428-1.832l1.963,1.377l0.02,0.012c0,0,0.795,1.874,1.127,1.874  c0.326,0,0.744-1.289,0.744-1.289l0.559-0.142c0.248,0.593,0.715,1.929,1.272,1.614c0.323-0.177,0.854-0.015,1.462,0.218  c0.611,0.235,1.025-0.124,1.521,0.31C38.452,17.195,37.321,16.419,36.993,16.324z M38.239,13.102  c-0.818-0.311-3.587,0.704-2.969-0.957c0.33-0.896,1.179-1.083,1.469-0.487c0.076,0.247,0.998,0.625,0.99,0.108  c-0.006-0.518,0.928-0.791,1.063-0.406C38.293,11.716,40.737,13.58,38.239,13.102z M43.454,14.675  c-0.453-0.364,0.205-0.679-0.465-1.252c-0.959-0.822-1.708-1.176-0.401-1.841c1.612-0.202,0.263,0.515,0.529,0.943  c0.144,0.23,0.956,0.996,1.593,1.938C45.238,15.244,43.905,15.038,43.454,14.675z" fill="url(#SVGID_8_)"/>
 <radialGradient cx="-2106.0933" cy="3754.916" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="29.4698">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M44.104,36.019l-1.555,1.552c0,0-0.934,0-0.979,0.378c-0.021,0.159-0.075,0.853-0.23,1.209  c-0.311,0.217-0.684,0.931-0.684,0.931s-0.191,1.382,0.839,1.146C42.526,41.001,45.698,36.77,44.104,36.019z" fill="url(#SVGID_9_)"/>
 <path d="M32.02,52.439c1.859,0,3.664-0.209,5.408-0.589  c-0.047-0.059-0.086-0.12-0.137-0.174l-9.057-9.324c-0.522-0.537-1.239-0.847-1.97-0.847c-0.685,0-1.324,0.265-1.804,0.751  l-1.373,1.418l-0.568,0.573l-0.524,0.537c-1.987-1.927-3.765-4.139-5.697-7.06c-1.067-1.62-1.986-3.592-2.57-4.956l-0.213-0.51  c0,0-0.291-0.718-0.39-0.975l-0.032-0.082c-0.081-0.211-0.153-0.408-0.221-0.601l-0.031-0.083l2.215-0.77  c1.222-0.414,1.915-1.688,1.638-3.071l-0.009-0.045l-1.386-4.235l-2.734-8.158c-0.193-0.582-0.564-1.064-1.032-1.394  c-2.904,4.096-4.617,9.095-4.617,14.496C6.917,41.205,18.155,52.439,32.02,52.439z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
 <path d="M32.02,52.439c1.563,0,3.09-0.15,4.576-0.422l-8.889-9.153  c-0.386-0.396-0.912-0.624-1.442-0.624c-0.485,0-0.936,0.188-1.274,0.531l-1.381,1.42l-0.561,0.568l-0.51,0.523l0.004,0.005  l-0.523,0.535c-2.243-2.087-4.219-4.489-6.334-7.693c-1.095-1.661-2.036-3.678-2.634-5.074l-0.19-0.45l-0.029-0.071  c0,0-0.292-0.723-0.393-0.981l-0.035-0.087c-0.082-0.216-0.156-0.415-0.229-0.614c0,0-0.144-0.406-0.174-0.493l0.085-0.354  l2.731-0.951c0.866-0.294,1.355-1.214,1.161-2.187l-0.008-0.044l-1.373-4.188l-2.734-8.161c-0.144-0.43-0.412-0.781-0.752-1.024  c-2.648,3.98-4.198,8.756-4.198,13.893C6.917,41.205,18.155,52.439,32.02,52.439z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <radialGradient cx="-2983.5728" cy="4023.543" gradientTransform="matrix(0.9654 -0.0107 -0.0107 -0.9654 2968.4299 3872.1846)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="42.6078">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.8364" style="stop-color:#E9F0F2"/>
-<stop offset="0.8909" style="stop-color:#AAB1B5"/>
-<stop offset="0.9515" style="stop-color:#7C878C"/>
-<stop offset="1" style="stop-color:#838F94"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.8364" style="stop-color:#ECEFED"/>
+<stop offset="0.8909" style="stop-color:#ADB2B1"/>
+<stop offset="0.9515" style="stop-color:#818587"/>
+<stop offset="1" style="stop-color:#888E8F"/>
 </radialGradient>
 <path d="M22.051,46.847c-2.873-2.563-5.037-5.372-6.979-8.311c-1.865-2.832-3.556-7.079-4.079-8.93  l-7.54-10.621c-0.429,0.711-1.107,3.264-0.794,6.717c0.316,3.454,3.534,11.814,7.313,17.545c3.782,5.731,9.389,11.118,11.269,12.311  c2.959,1.878,6.523,2.493,7.608,2.439c0,0,1.002-0.118,2.367-0.597C31.803,57.196,22.051,46.847,22.051,46.847z" fill="url(#SVGID_10_)"/>
 <path d="M12.413,33.434c-0.661-1.542-1.174-2.953-1.418-3.827L3.658,19.27  c-0.077,0.108-0.12,0.173-0.12,0.173c-0.126,0.207-0.266,0.55-0.406,0.977c-0.142,0.722-0.214,1.466-0.202,2.229  C3.002,28.046,7.083,32.497,12.413,33.434z" fill-opacity="0.05" stroke-opacity="0.05"/>
 <path d="M12.099,32.685c-0.507-1.242-0.899-2.348-1.104-3.078l-7.363-10.37  C3.548,19.356,3.5,19.429,3.5,19.429c-0.118,0.195-0.25,0.522-0.383,0.925c-0.134,0.682-0.202,1.383-0.19,2.105  C2.997,27.635,6.961,31.889,12.099,32.685z" fill-opacity="0.05" stroke-opacity="0.05"/>
 <path d="M3.443,19.407c-0.105,0.177-0.226,0.472-0.348,0.839  c-0.123,0.617-0.183,1.256-0.172,1.911c0.064,4.82,3.858,8.755,8.702,9.323c-0.278-0.742-0.495-1.39-0.632-1.874L3.596,19.185  C3.496,19.325,3.443,19.407,3.443,19.407z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <radialGradient cx="-3022.0488" cy="4026.5146" gradientTransform="matrix(0.9664 -0.0083 -0.013 -0.9569 2980.2107 3844.9014)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="14.7389">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0424" style="stop-color:#D3D7D5"/>
+<stop offset="0.4" style="stop-color:#BDC0BF"/>
+<stop offset="0.7333" style="stop-color:#82898B"/>
+<stop offset="1" style="stop-color:#ACB2B1"/>
 </radialGradient>
 <path d="M10.993,29.606l1.577-0.554c0,0-3.343-14.954-4.669-14.266c-0.667,0.348-0.66,0.538-1.335,1.026  c-2.014,1.464-3.112,3.174-3.112,3.174c-0.092,0.155-0.197,0.415-0.303,0.737c-0.105,0.54-0.161,1.102-0.153,1.672  c0.06,4.353,3.581,7.891,8.007,8.225C11,29.616,10.995,29.611,10.993,29.606z" fill="url(#SVGID_11_)"/>
 <path d="M21.933,48.33c-0.311,0.874-0.481,1.802-0.47,2.769  c0.031,2.291,1.062,4.354,2.695,5.889c2.064,0.771,3.951,1.047,4.689,1.01c0,0,1.002-0.118,2.367-0.597  c0.492-0.171-6.277-7.469-8.48-9.823L21.933,48.33z" fill-opacity="0.05" stroke-opacity="0.05"/>
 <path d="M22.125,47.537c-0.313,0.871-0.481,1.799-0.47,2.766  c0.043,3.142,1.947,5.86,4.748,7.363c0.927,0.218,1.705,0.318,2.198,0.331c0.013,0,0.032,0.002,0.045,0c0,0,1-0.115,2.37-0.594  c0.508-0.179-6.761-7.982-8.693-10.055L22.125,47.537z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <radialGradient cx="-3005.0166" cy="3996.4961" gradientTransform="matrix(0.9664 -0.0083 -0.013 -0.9569 2980.2107 3844.9014)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="14.9991">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0424" style="stop-color:#D3D7D5"/>
+<stop offset="0.4" style="stop-color:#BDC0BF"/>
+<stop offset="0.7333" style="stop-color:#82898B"/>
+<stop offset="1" style="stop-color:#ACB2B1"/>
 </radialGradient>
 <path d="M33.125,56.564c0.785-0.42,0.984-0.408,1.625-0.887c1.178-0.891-10.615-10.968-10.615-10.968  l-2.057,2.111c-0.277,0.833-0.428,1.724-0.415,2.648c0.062,4.526,3.869,8.17,8.542,8.24C30.997,57.499,32.036,57.146,33.125,56.564z  " fill="url(#SVGID_12_)"/>
 <path d="M11.808,29.311l0.762-0.258c0,0-3.343-14.954-4.669-14.266  c-0.35,0.181-0.515,0.322-0.688,0.481L11.808,29.311z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientTransform="matrix(0.9999 -0.0111 -0.0111 -0.9999 3135.2356 3906.9067)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-3082.8984" x2="-3077.6428" y1="3928.3984" y2="3911.7034">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.4" style="stop-color:#D4D9DB"/>
-<stop offset="0.7333" style="stop-color:#98AAAD"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.0424" style="stop-color:#ECEFED"/>
+<stop offset="0.4" style="stop-color:#D6D9D7"/>
+<stop offset="0.7333" style="stop-color:#9EA7A5"/>
+<stop offset="1" style="stop-color:#D4DAD7"/>
 </linearGradient>
 <path d="M12.57,29.056l2.016-0.703c0.523-0.176,0.792-0.756,0.676-1.346l-1.356-4.141l-2.734-8.162  c-0.214-0.641-0.854-1.006-1.43-0.813c0,0-0.515,0.211-1.837,0.898L12.57,29.056z" fill="url(#SVGID_13_)"/>
 <path d="M24.135,44.708l-0.563,0.568l10.516,10.866  c0.227-0.158,0.457-0.313,0.662-0.468C35.928,54.784,24.135,44.708,24.135,44.708z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientTransform="matrix(0.9999 -0.0111 -0.0111 -0.9999 3135.2356 3906.9067)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-3066.7827" x2="-3055.8347" y1="3897.6836" y2="3885.627">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.4" style="stop-color:#D4D9DB"/>
-<stop offset="0.7333" style="stop-color:#98AAAD"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.0424" style="stop-color:#ECEFED"/>
+<stop offset="0.4" style="stop-color:#D6D9D7"/>
+<stop offset="0.7333" style="stop-color:#9EA7A5"/>
+<stop offset="1" style="stop-color:#D4DAD7"/>
 </linearGradient>
 <path d="M34.749,55.673c1.176-0.889,1.558-1.273,1.558-1.273c0.438-0.448,0.407-1.204-0.071-1.697  l-9.057-9.322c-0.478-0.496-1.222-0.544-1.66-0.097l-1.383,1.425L34.749,55.673z" fill="url(#SVGID_14_)"/>
 </g>
@@ -113,93 +113,93 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill="none" height="30" width="30"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="654.6" x2="654.6" y1="-558.3" y2="-601.7">
-<stop offset="0" stop-color="#DFE1E6"/>
-<stop offset="1" stop-color="#BDBEC3"/>
+<stop offset="0" stop-color="#E1E4E3"/>
+<stop offset="1" stop-color="#BFC1C1"/>
 </linearGradient>
 <rect fill="url(#SVGID_1__)" height="21.5" width="17.33" x="5.158" y="3.499"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="654.6" x2="654.6" y1="-558.9" y2="-602.2">
-<stop offset="0" stop-color="#E7E9EF"/>
-<stop offset="1" stop-color="#C8C9CE"/>
+<stop offset="0" stop-color="#E9EDEB"/>
+<stop offset="1" stop-color="#CACCCC"/>
 </linearGradient>
 <path d="M21.99,3.999v20.5h-16.33v-20.5h16.33m0.5-0.501h-17.33v21.5h17.33v-21.5z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="642.6" x2="642.6" y1="-567.9" y2="-562.2">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_3__)" height="3" width="3" x="6.324" y="5.146"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="650.6" x2="650.6" y1="-567.9" y2="-562.2">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_4__)" height="3" width="3" x="10.32" y="5.146"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="666.6" x2="666.6" y1="-567.9" y2="-562.2">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_5__)" height="3" width="3" x="18.32" y="5.146"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="658.6" x2="658.6" y1="-567.9" y2="-562.2">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_6__)" height="3" width="3" x="14.32" y="5.146"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_7__" x1="642.6" x2="642.6" y1="-576.5" y2="-570.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_7__)" height="3" width="3" x="6.324" y="9.458"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_8__" x1="650.6" x2="650.6" y1="-576.5" y2="-570.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_8__)" height="3" width="3" x="10.32" y="9.458"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_9__" x1="666.6" x2="666.6" y1="-576.5" y2="-570.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_9__)" height="3" width="3" x="18.32" y="9.458"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_10__" x1="658.6" x2="658.6" y1="-576.5" y2="-570.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_10__)" height="3" width="3" x="14.32" y="9.458"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_11__" x1="642.6" x2="642.6" y1="-594.5" y2="-588.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_11__)" height="3" width="3" x="6.324" y="18.46"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_12__" x1="650.6" x2="650.6" y1="-594.5" y2="-588.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_12__)" height="3" width="3" x="10.32" y="18.46"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_13__" x1="666.6" x2="666.6" y1="-594.5" y2="-588.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_13__)" height="3" width="3" x="18.32" y="18.46"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_14__" x1="658.6" x2="658.6" y1="-594.5" y2="-588.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_14__)" height="3" width="3" x="14.32" y="18.46"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="642.6" x2="642.6" y1="-585.5" y2="-579.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_15_)" height="3" width="3" x="6.324" y="13.96"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="650.6" x2="650.6" y1="-585.5" y2="-579.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_16_)" height="3" width="3" x="10.32" y="13.96"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="666.6" x2="666.6" y1="-585.5" y2="-579.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_17_)" height="3" width="3" x="18.32" y="13.96"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="658.6" x2="658.6" y1="-585.5" y2="-579.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_18_)" height="3" width="3" x="14.32" y="13.96"/>
 <polygon fill-opacity="0.3" points="22.49,25,22.49,14.85,12.51,11.92,12.51,25" stroke-opacity="0.3" style="enable-background:new;"/>
@@ -209,8 +209,8 @@
 </linearGradient>
 <polygon fill="url(#SVGID_19_)" points="24.84,16.25,13.51,12.92,13.51,26.5,24.84,26.5"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="665.4" x2="665.4" y1="-582" y2="-605.1">
-<stop offset="0" stop-color="#DBDDE2"/>
-<stop offset="1" stop-color="#B5B6BA"/>
+<stop offset="0" stop-color="#DDE0DF"/>
+<stop offset="1" stop-color="#B7B8B9"/>
 </linearGradient>
 <path d="M14.01,13.58l10.33,3.039v9.38h-10.33v-12.42m-0.5-0.665v13.58h11.33v-10.25l-11.33-3.33z" fill="url(#SVGID_20_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_camera.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_camera.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_camera.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,7 +6,7 @@
 <g>
 <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-95.8955" x2="-86.1685" y1="26.209" y2="26.209">
 <stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="0.4788" style="stop-color:#7C8284"/>
+<stop offset="0.4788" style="stop-color:#7E8182"/>
 <stop offset="1" style="stop-color:#E6E6E6"/>
 </linearGradient>
 <path d="M16.419,15.417v-3.748c0-0.885-0.653-1.544-1.453-1.544H8.124c-0.799,0-1.456,0.659-1.456,1.544   v3.748H16.419z" fill="url(#SVGID_1_)"/>
@@ -16,15 +16,15 @@
 </radialGradient>
 <path d="M14.967,10.125H8.124c-0.799,0-1.456,0.659-1.456,1.544v0.756c0-0.885,0.657-1.544,1.456-1.544   h6.843c0.8,0,1.453,0.659,1.453,1.544v-0.756C16.419,10.785,15.766,10.125,14.967,10.125z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-72.52" x2="-72.52" y1="28.4741" y2="-10.9595">
-<stop offset="0" style="stop-color:#D0D4D5"/>
-<stop offset="0.1212" style="stop-color:#D0D4D5"/>
-<stop offset="0.4182" style="stop-color:#B0B6B8"/>
-<stop offset="0.4182" style="stop-color:#9FA6A8"/>
-<stop offset="0.6606" style="stop-color:#7D8588"/>
-<stop offset="0.9697" style="stop-color:#ADB3B5"/>
-<stop offset="0.9697" style="stop-color:#595C5E"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D2D3D2"/>
+<stop offset="0.1212" style="stop-color:#D2D3D2"/>
+<stop offset="0.4182" style="stop-color:#B2B6B5"/>
+<stop offset="0.4182" style="stop-color:#A2A5A5"/>
+<stop offset="0.6606" style="stop-color:#808485"/>
+<stop offset="0.9697" style="stop-color:#AFB3B2"/>
+<stop offset="0.9697" style="stop-color:#5B5B5D"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M55.499,10.563H20.561c-0.824,0-1.499,0.687-1.499,1.528v1.896H4.5C3.676,13.986,3,14.674,3,15.514   v32.833c0,0.841,0.676,1.528,1.499,1.528h51c0.824,0,1.501-0.688,1.501-1.528V12.09C57,11.248,56.323,10.563,55.499,10.563z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-53.6201" x2="-53.6201" y1="25.9531" y2="19.4839">
@@ -37,7 +37,7 @@
 <stop offset="1" style="stop-color:#3B3B3B"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="5.401" width="8.838" x="44.481" y="13.544"/>
-<path d="M45.764,31.913c-0.004,8.315-6.746,16.519-15.062,16.514   c-8.314-0.003-15.053-8.207-15.053-16.522c0.004-8.318,6.746-15.053,15.063-15.052C39.028,16.856,45.766,23.597,45.764,31.913z" fill="#231F20" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M45.764,31.913c-0.004,8.315-6.746,16.519-15.062,16.514   c-8.314-0.003-15.053-8.207-15.053-16.522c0.004-8.318,6.746-15.053,15.063-15.052C39.028,16.856,45.766,23.597,45.764,31.913z" fill="#222021" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-71.814" x2="-71.814" y1="22.7822" y2="-7.386">
 <stop offset="0" style="stop-color:#CFCFCF"/>
 <stop offset="0.1091" style="stop-color:#CFCFCF"/>
@@ -47,7 +47,7 @@
 <path d="M45.706,31.304c-0.001,8.285-6.718,14.998-15.004,14.994c-8.283-0.002-14.997-6.721-14.996-15.003   c0.004-8.286,6.722-14.998,15.007-14.996C38.996,16.304,45.708,23.02,45.706,31.304z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-71.813" x2="-71.813" y1="22.1294" y2="-6.4378">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#606769"/>
+<stop offset="1" style="stop-color:#636566"/>
 </linearGradient>
 <path d="M44.956,31.308c-0.003,7.868-6.385,14.245-14.254,14.241c-7.874-0.003-14.252-6.382-14.245-14.254   c0-7.87,6.381-14.248,14.253-14.246C38.583,17.054,44.96,23.437,44.956,31.308z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientTransform="matrix(1 3.000000e-004 3.000000e-004 -1 101.8093 38.1828)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-79.3252" x2="-62.8855" y1="15.0825" y2="-1.3573">
@@ -74,15 +74,15 @@
 </radialGradient>
 <circle cx="30.706" cy="31.299" fill="url(#SVGID_10_)" r="9"/>
 <radialGradient cx="-77.0063" cy="63.8779" gradientTransform="matrix(0.911 2.793056e-004 2.793056e-004 -0.9111 98.5755 77.6866)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="23.6394">
-<stop offset="0" style="stop-color:#A700F5"/>
-<stop offset="0.3091" style="stop-color:#A700F5"/>
-<stop offset="0.4364" style="stop-color:#5E008A"/>
-<stop offset="0.8061" style="stop-color:#0E1402"/>
-<stop offset="1" style="stop-color:#0E1402"/>
+<stop offset="0" style="stop-color:#8D4AAB"/>
+<stop offset="0.3091" style="stop-color:#8D4AAB"/>
+<stop offset="0.4364" style="stop-color:#532961"/>
+<stop offset="0.8061" style="stop-color:#070F0F"/>
+<stop offset="1" style="stop-color:#070F0F"/>
 </radialGradient>
 <path d="M38.581,31.3c-0.001,4.35-3.529,7.876-7.879,7.874c-4.345-0.002-7.872-3.529-7.872-7.877   c0.005-4.351,3.531-7.872,7.875-7.872C35.059,23.427,38.583,26.952,38.581,31.3z" fill="url(#SVGID_11_)"/>
 <radialGradient cx="-74.5239" cy="146.7813" gradientTransform="matrix(0.911 2.793056e-004 2.793056e-004 -0.8674 98.575 165.1664)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="9.5976">
-<stop offset="0" style="stop-color:#48630C"/>
+<stop offset="0" style="stop-color:#264932"/>
 <stop offset="0.7879" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </radialGradient>
@@ -98,9 +98,9 @@
 </linearGradient>
 <circle cx="11.824" cy="21.428" fill="url(#SVGID_14_)" r="2.25"/>
 <path d="M11.825,21.659c0.774,0,1.459-0.348,1.931-0.889   c-0.285-0.796-1.038-1.37-1.931-1.37c-0.894,0-1.647,0.573-1.933,1.37C10.364,21.311,11.05,21.659,11.825,21.659z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
-<polygon fill="#F1F1F2" fill-opacity="0.2" points="44.699,15.053 53.168,15.085 53.168,13.772    44.699,13.772  " stroke-opacity="0.2"/>
+<polygon fill="#F1F2F2" fill-opacity="0.2" points="44.699,15.053 53.168,15.085 53.168,13.772    44.699,13.772  " stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="-71.854" x2="-71.854" y1="17.3643" y2="7.7548">
-<stop offset="0" style="stop-color:#F8FBFF"/>
+<stop offset="0" style="stop-color:#FAFDFB"/>
 <stop offset="1" style="stop-color:#808080"/>
 </linearGradient>
 <path d="M30.668,31.179c3.489,0,6.777-0.529,9.679-1.461   c-0.823-4.604-4.839-8.102-9.679-8.102c-4.843,0-8.856,3.498-9.682,8.101C23.889,30.649,27.178,31.179,30.668,31.179z" fill="url(#SVGID_15_)" fill-opacity="0.35" stroke-opacity="0.35"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_car.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_car.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_car.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -19,22 +19,22 @@
 </linearGradient>
 <path d="M51.21,48.77c0,0.746-0.604,1.352-1.352,1.352h-5.063c-0.746,0-1.351-0.605-1.351-1.352v-12.07c0-0.746,0.604-1.352,1.351-1.352h5.063c0.747,0,1.352,0.605,1.352,1.352v12.07z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="9.878" y2="33.23">
-<stop offset="0" stop-color="#FEE377"/>
-<stop offset="0.511" stop-color="#FFC501"/>
-<stop offset="1" stop-color="#FF8800"/>
+<stop offset="0" stop-color="#D6CDA0"/>
+<stop offset="0.511" stop-color="#B39C4D"/>
+<stop offset="1" stop-color="#B3834D"/>
 </linearGradient>
 <path d="M45.96,12.92c-0.27-0.631-0.71-1.577-2.432-1.892-1.956-0.358-5.486-1.15-13.37-1.15-7.882,0-11.74,0.76-13.69,1.15-1.576,0.314-2.163,1.261-2.433,1.892-0.271,0.631-4.412,9.908-4.774,14.77l2.342,5.314h36.79l2.342-5.314c-0.36-4.86-4.51-14.14-4.78-14.77z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="7.499" x2="52.5" y1="35.35" y2="35.35">
-<stop offset="0" stop-color="#DA8C00"/>
-<stop offset="0.25" stop-color="#F7B901"/>
-<stop offset="0.75" stop-color="#FFC501"/>
-<stop offset="1" stop-color="#DA8C00"/>
+<stop offset="0" stop-color="#996F41"/>
+<stop offset="0.25" stop-color="#AD924B"/>
+<stop offset="0.75" stop-color="#B39C4D"/>
+<stop offset="1" stop-color="#996F41"/>
 </linearGradient>
 <path d="M52.45,30.84c-0.067-0.902-0.405-3.941-4.505-4.662-4.098-0.721-4.746,2.434-7.296,4.527-2.938,2.414-6.791,2.117-10.48,2.117-3.692,0-7.869,0.297-10.81-2.117-2.55-2.094-3.198-5.248-7.296-4.527-4.099,0.721-4.438,3.76-4.504,4.662-0.361,4.863,1.222,10.61,1.892,12.43,0.444,1.211,2.161,1.352,2.161,1.352h36.79s1.675-0.006,2.161-1.352c0.66-1.82,2.26-7.56,1.9-12.43z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="12.06" x2="47.95" y1="21.09" y2="21.09">
-<stop offset="0" stop-color="#FF9000"/>
-<stop offset="0.511" stop-color="#FFC501"/>
-<stop offset="1" stop-color="#FF8800"/>
+<stop offset="0" stop-color="#B3864D"/>
+<stop offset="0.511" stop-color="#B39C4D"/>
+<stop offset="1" stop-color="#B3834D"/>
 </linearGradient>
 <path d="M43.53,11.03c-1.956-0.358-5.486-1.15-13.37-1.15-7.882,0-11.74,0.76-13.69,1.15-0.256,0.051-0.48,0.119-0.687,0.199-1.815,3.072-4.801,14.6-3.728,14.42,4.098-0.721,4.746,2.432,7.296,4.525,2.94,2.414,7.117,2.117,10.81,2.117s7.546,0.297,10.48-2.117c2.55-2.094,3.198-5.246,7.296-4.525,1.073,0.188-1.803-11.35-3.688-14.42-0.21-0.09-0.45-0.16-0.72-0.21z" fill="url(#SVGID_5_)"/>
 <path d="M12.06,26.18c4.098-0.721,4.746,2.434,7.296,4.527,2.94,2.414,7.117,2.117,10.81,2.117s7.546,0.297,10.48-2.117c2.55-2.094,3.198-5.248,7.296-4.527,1.225,0.216,2.107,0.64,2.753,1.149-0.04-0.358-0.093-0.73-0.163-1.121-0.631-0.454-1.465-0.83-2.59-1.028-4.098-0.721-4.746,2.434-7.296,4.527-2.938,2.414-6.791,2.287-10.48,2.287-3.692,0-7.869,0.127-10.81-2.287-2.55-2.094-3.198-5.248-7.296-4.527-1.125,0.198-1.959,0.574-2.589,1.028-0.07,0.391-0.124,0.763-0.164,1.12,0.642-0.51,1.523-0.93,2.753-1.15z" fill="#191919" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -55,7 +55,7 @@
 <path d="M9.063,32.08c0.47,1.688,2.374,2.631,4.255,2.109,1.882-0.523,3.026-2.314,2.558-4.004-0.47-1.688-2.375-2.631-4.256-2.107-1.883,0.52-3.028,2.31-2.557,4z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="12.2" x2="12.2" y1="28.05" y2="32.98">
 <stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="1" stop-color="#949DA1"/>
+<stop offset="1" stop-color="#989D9D"/>
 </linearGradient>
 <path d="M12,32.98c-1.176,0-2.15-0.668-2.427-1.66-0.165-0.592-0.059-1.225,0.299-1.785,0.376-0.588,0.977-1.02,1.693-1.219,0.274-0.076,0.554-0.115,0.83-0.115,1.177,0,2.151,0.668,2.428,1.66,0.349,1.254-0.546,2.602-1.994,3.004-0.27,0.08-0.55,0.12-0.83,0.12z" fill="url(#SVGID_8_)"/>
 <ellipse cx="47.4" cy="31.72" fill="#191919" fill-opacity="0.2" rx="3.535" ry="3.172" stroke-opacity="0.2" transform="matrix(0.9635 0.2678 -0.2678 0.9635 10.2266 -11.5377)"/>
@@ -67,7 +67,7 @@
 <path d="M50.94,32.08c-0.469,1.688-2.374,2.631-4.254,2.109-1.882-0.523-3.027-2.314-2.558-4.004,0.47-1.688,2.375-2.631,4.255-2.107,1.88,0.52,3.02,2.31,2.56,4z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="47.8" x2="47.8" y1="28.09" y2="33.05">
 <stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="1" stop-color="#949DA1"/>
+<stop offset="1" stop-color="#989D9D"/>
 </linearGradient>
 <path d="M48,32.98c-0.279,0-0.558-0.039-0.83-0.115-1.448-0.402-2.343-1.75-1.994-3.004,0.276-0.992,1.251-1.66,2.428-1.66,0.277,0,0.557,0.039,0.83,0.115,0.717,0.199,1.318,0.633,1.693,1.219,0.358,0.561,0.464,1.193,0.299,1.785-0.28,0.99-1.26,1.66-2.43,1.66z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="30" x2="30" y1="12.81" y2="24.63">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_cellinfo.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_cellinfo.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_cellinfo.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,93 +3,93 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g transform="matrix(1 0 0 1 -0.001 0)">
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="42.8398" x2="42.8398" y1="14.1646" y2="45.8403">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </linearGradient>
 <path d="M36.798,40.658l0.643-0.473c3.23-2.377,5.16-6.169,5.16-10.144c0-4.03-1.969-7.854-5.27-10.226  l-0.652-0.472l3.785-5.18l0.645,0.466c4.941,3.569,7.893,9.329,7.893,15.412c0,6.022-2.906,11.752-7.771,15.324l-0.646,0.474  L36.798,40.658z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="43" x2="43" y1="15.2793" y2="44.7212">
-<stop offset="0" style="stop-color:#F3FFA8"/>
-<stop offset="0.7455" style="stop-color:#529E24"/>
-<stop offset="1" style="stop-color:#B2D872"/>
+<stop offset="0" style="stop-color:#E2E5C2"/>
+<stop offset="0.7455" style="stop-color:#49794A"/>
+<stop offset="1" style="stop-color:#ACB991"/>
 </linearGradient>
 <path d="M43.399,30.042c0,4.425-2.166,8.347-5.486,10.788l2.844,3.891c4.512-3.313,7.443-8.652,7.443-14.679  c0-6.079-2.982-11.459-7.561-14.763l-2.84,3.887C41.185,21.601,43.399,25.563,43.399,30.042z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="43.1543" x2="43.1543" y1="16.4082" y2="43.5854">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </linearGradient>
 <path d="M39.017,40.984c3.26-2.692,5.184-6.725,5.184-10.942c0-4.278-1.965-8.344-5.293-11.036l1.898-2.598  c4.145,3.291,6.596,8.328,6.596,13.634c0,5.25-2.41,10.253-6.482,13.543L39.017,40.984z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="17.1611" x2="17.1611" y1="14.1646" y2="45.8403">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </linearGradient>
 <path d="M18.77,45.366C13.904,41.794,11,36.064,11,30.042c0-6.083,2.95-11.843,7.892-15.412l0.646-0.466  l3.785,5.18l-0.655,0.472c-3.298,2.372-5.267,6.195-5.267,10.226c0,3.975,1.929,7.767,5.16,10.144l0.642,0.473l-3.785,5.182  L18.77,45.366z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="17.0005" x2="17.0005" y1="15.2793" y2="44.7212">
-<stop offset="0" style="stop-color:#F3FFA8"/>
-<stop offset="0.7455" style="stop-color:#529E24"/>
-<stop offset="1" style="stop-color:#B2D872"/>
+<stop offset="0" style="stop-color:#E2E5C2"/>
+<stop offset="0.7455" style="stop-color:#49794A"/>
+<stop offset="1" style="stop-color:#ACB991"/>
 </linearGradient>
 <path d="M19.243,44.721l2.842-3.891c-3.318-2.441-5.485-6.363-5.485-10.788c0-4.479,2.216-8.441,5.601-10.876  l-2.84-3.887c-4.579,3.304-7.561,8.684-7.561,14.763C11.8,36.068,14.731,41.408,19.243,44.721z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="16.8462" x2="16.8462" y1="16.4082" y2="43.5854">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </linearGradient>
 <path d="M19.081,43.585c-4.072-3.29-6.481-8.293-6.481-13.543c0-5.306,2.451-10.343,6.595-13.634l1.898,2.598  c-3.328,2.691-5.293,6.758-5.293,11.036c0,4.218,1.923,8.25,5.183,10.942L19.081,43.585z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="49.9961" x2="49.9961" y1="6.896" y2="53.105">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </linearGradient>
 <path d="M42.112,47.93l0.643-0.472c5.539-4.067,8.846-10.577,8.846-17.417c0-6.893-3.35-13.435-8.959-17.499  l-0.65-0.47l3.781-5.176l0.645,0.468c7.254,5.261,11.584,13.737,11.584,22.677c0,8.881-4.285,17.326-11.463,22.59l-0.646,0.474  L42.112,47.93z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="50.1563" x2="50.1562" y1="8.0127" y2="51.9849">
-<stop offset="0" style="stop-color:#F3FFA8"/>
-<stop offset="0.7455" style="stop-color:#529E24"/>
-<stop offset="1" style="stop-color:#B2D872"/>
+<stop offset="0" style="stop-color:#E2E5C2"/>
+<stop offset="0.7455" style="stop-color:#49794A"/>
+<stop offset="1" style="stop-color:#ACB991"/>
 </linearGradient>
 <path d="M52.399,30.041c0,7.406-3.615,13.98-9.172,18.063l2.838,3.881C52.815,47.035,57.2,39.051,57.2,30.041  c0-9.063-4.436-17.086-11.252-22.028l-2.836,3.883C48.733,15.969,52.399,22.583,52.399,30.041z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="50.3115" x2="50.3115" y1="9.1377" y2="50.856">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </linearGradient>
 <path d="M44.337,48.264c5.564-4.389,8.863-11.143,8.863-18.223c0-7.138-3.342-13.922-8.977-18.312  l1.893-2.592c6.455,4.986,10.283,12.739,10.283,20.903c0,8.107-3.785,15.828-10.168,20.814L44.337,48.264z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="10.0039" x2="10.0039" y1="6.896" y2="53.105">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </linearGradient>
 <path d="M13.461,52.631C6.285,47.367,2,38.922,2,30.041c0-8.94,4.33-17.416,11.582-22.677l0.646-0.468  l3.781,5.176l-0.65,0.47C11.749,16.606,8.4,23.148,8.4,30.041c0,6.84,3.307,13.35,8.845,17.417l0.643,0.472l-3.781,5.175  L13.461,52.631z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="9.8442" x2="9.8442" y1="8.0127" y2="51.9849">
-<stop offset="0" style="stop-color:#F3FFA8"/>
-<stop offset="0.7455" style="stop-color:#529E24"/>
-<stop offset="1" style="stop-color:#B2D872"/>
+<stop offset="0" style="stop-color:#E2E5C2"/>
+<stop offset="0.7455" style="stop-color:#49794A"/>
+<stop offset="1" style="stop-color:#ACB991"/>
 </linearGradient>
 <path d="M13.935,51.984l2.836-3.881C11.215,44.021,7.6,37.447,7.6,30.041c0-7.458,3.667-14.072,9.289-18.145  l-2.837-3.883C7.236,12.955,2.8,20.979,2.8,30.041C2.8,39.051,7.185,47.035,13.935,51.984z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="9.688" x2="9.688" y1="9.1377" y2="50.856">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </linearGradient>
 <path d="M13.769,50.855C7.386,45.869,3.6,38.148,3.6,30.041c0-8.164,3.83-15.917,10.283-20.903l1.894,2.592  C10.141,16.119,6.8,22.903,6.8,30.041c0,7.08,3.299,13.834,8.863,18.223L13.769,50.855z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="29.9995" x2="29.9995" y1="21.2617" y2="38.6788">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </linearGradient>
 <path d="M29.999,38.799c-4.852,0-8.799-3.947-8.799-8.799c0-4.854,3.948-8.801,8.799-8.801  c4.854,0,8.801,3.947,8.801,8.801C38.8,34.852,34.853,38.799,29.999,38.799L29.999,38.799z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="30" x2="30" y1="22.0557" y2="37.8893">
-<stop offset="0" style="stop-color:#F3FFA8"/>
-<stop offset="0.7455" style="stop-color:#529E24"/>
-<stop offset="1" style="stop-color:#B2D872"/>
+<stop offset="0" style="stop-color:#E2E5C2"/>
+<stop offset="0.7455" style="stop-color:#49794A"/>
+<stop offset="1" style="stop-color:#ACB991"/>
 </linearGradient>
 <path d="M29.999,37.998c-4.411,0-8-3.588-8-7.998c0-4.414,3.588-8.001,8-8.001  c4.412,0,8.002,3.587,8.002,8.001C38.001,34.41,34.411,37.998,29.999,37.998L29.999,37.998z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="29.9995" x2="29.9995" y1="22.8486" y2="37.1012">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </linearGradient>
 <path d="M29.999,37.199c-3.969,0-7.2-3.23-7.2-7.199c0-3.971,3.23-7.203,7.2-7.203  c3.971,0,7.201,3.232,7.201,7.203C37.2,33.969,33.97,37.199,29.999,37.199L29.999,37.199z" fill="url(#SVGID_15_)"/>
 <rect fill="none" height="60" width="60.001"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,33 +4,33 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.3896" y2="57.7417">
-<stop offset="0" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#454B4D"/>
+<stop offset="0" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#47494B"/>
 </linearGradient>
 <path d="M29.999,58C14.56,58,2,45.44,2,30C2,14.562,14.56,2,29.999,2C45.44,2,58,14.562,58,30  C58,45.44,45.44,58,29.999,58L29.999,58z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="3.1675" y2="57.1007">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.2364" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#697173"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.2364" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#6C6F70"/>
 </linearGradient>
 <circle cx="29.999" cy="30" fill="url(#SVGID_2_)" r="27.222"/>
-<path d="M30.948,30.95c9.117,0,17.921-0.57,26.256-1.616C56.849,14.609,44.81,2.778,29.999,2.778  C15.274,2.778,3.286,14.472,2.8,29.08C11.691,30.286,21.138,30.95,30.948,30.95z" fill="#F1F1F2" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M30.948,30.95c9.117,0,17.921-0.57,26.256-1.616C56.849,14.609,44.81,2.778,29.999,2.778  C15.274,2.778,3.286,14.472,2.8,29.08C11.691,30.286,21.138,30.95,30.948,30.95z" fill="#F1F2F2" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="3.0361" x2="57.3516" y1="16.5835" y2="16.5835">
-<stop offset="0" style="stop-color:#C0C5C7"/>
-<stop offset="0.2" style="stop-color:#F7FDFF"/>
-<stop offset="0.8" style="stop-color:#F7FDFF"/>
-<stop offset="1" style="stop-color:#CDD3D5"/>
+<stop offset="0" style="stop-color:#C2C5C4"/>
+<stop offset="0.2" style="stop-color:#F9FDFA"/>
+<stop offset="0.8" style="stop-color:#F9FDFA"/>
+<stop offset="1" style="stop-color:#CFD3D1"/>
 </linearGradient>
 <path d="M29.999,3.556c14.902,0,27.004,11.979,27.212,26.833c0.003-0.129,0.01-0.258,0.01-0.389  c0-15.034-12.188-27.222-27.222-27.222C14.964,2.778,2.776,14.966,2.776,30c0,0.131,0.009,0.26,0.01,0.389  C2.996,15.536,15.097,3.556,29.999,3.556z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="54.4995" y2="5.9818">
-<stop offset="0" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#454B4D"/>
+<stop offset="0" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#47494B"/>
 </linearGradient>
 <path d="M29.999,54.111C16.704,54.111,5.888,43.295,5.888,30S16.704,5.89,29.999,5.89  S54.109,16.705,54.109,30S43.294,54.111,29.999,54.111L29.999,54.111z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="52.6606" y2="6.0737">
 <stop offset="0" style="stop-color:#FAF9F9"/>
 <stop offset="0.4" style="stop-color:#FAF9F9"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M29.999,53.333C17.133,53.333,6.667,42.867,6.667,30c0-12.865,10.466-23.333,23.332-23.333  c12.865,0,23.334,10.468,23.334,23.333C53.333,42.867,42.864,53.333,29.999,53.333L29.999,53.333z" fill="url(#SVGID_5_)"/>
 <path d="M29.999,31.667c7.696,0,15.042-0.647,21.777-1.814c-0.084-11.94-9.816-21.63-21.777-21.63  c-11.959,0-21.694,9.69-21.773,21.63C14.959,31.02,22.304,31.667,29.999,31.667z" fill="#FFFFFF" fill-opacity="0.7" stroke-opacity="0.7"/>
@@ -46,25 +46,25 @@
 <rect fill="#404041" height="3.766" transform="matrix(0.8661 -0.4999 0.4999 0.8661 -18.3816 26.2067)" width="1.256" x="39.095" y="45.529"/>
 <rect fill="#404041" height="3.767" transform="matrix(0.4993 -0.8664 0.8664 0.4993 -11.4765 21.8413)" width="1.256" x="12.532" y="18.967"/>
 <rect fill="#404041" height="3.765" transform="matrix(0.4992 -0.8665 0.8665 0.4992 -11.4567 60.7682)" width="1.256" x="46.211" y="38.412"/>
-<path d="M31.904,31.103c-0.075-0.374-0.265-0.705-0.521-0.966l2.68-8.833l-2.232-0.678l-2.783,9.17  c-0.484,0.274-0.84,0.745-0.953,1.307h-5.096v0.777h5.096c0.021,0.103,0.052,0.203,0.088,0.298L16.18,44.181l1.011,1.011  l11.957-11.959c0.257,0.126,0.545,0.204,0.853,0.204c0.94,0,1.725-0.667,1.904-1.556h18.317v-0.777H31.904z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M31.904,31.103c-0.075-0.374-0.265-0.705-0.521-0.966l2.68-8.833l-2.232-0.678l-2.783,9.17  c-0.484,0.274-0.84,0.745-0.953,1.307h-5.096v0.777h5.096c0.021,0.103,0.052,0.203,0.088,0.298L16.18,44.181l1.011,1.011  l11.957-11.959c0.257,0.126,0.545,0.204,0.853,0.204c0.94,0,1.725-0.667,1.904-1.556h18.317v-0.777H31.904z" fill="#222021" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(0.9569 0.2903 -0.2903 0.9569 665.0903 147.1071)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-641.8813" x2="-641.8813" y1="61.4336" y2="73.4297">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<stop offset="0" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#222021"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="34.063,20.202 31.831,19.525 28.442,30.688 30.677,31.366 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="16.7598" x2="30.4403" y1="43.5093" y2="29.8287">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<stop offset="0" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#222021"/>
 </linearGradient>
 <polygon fill="url(#SVGID_7_)" points="30.958,30.321 29.948,29.311 16.18,43.078 17.19,44.088 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="36.6104" x2="36.6104" y1="29.8896" y2="31.0254">
-<stop offset="0" style="stop-color:#FF0000"/>
-<stop offset="1" style="stop-color:#A8000B"/>
+<stop offset="0" style="stop-color:#B34D4D"/>
+<stop offset="1" style="stop-color:#763242"/>
 </linearGradient>
 <path d="M50.222,30H31.904c-0.18-0.887-0.964-1.556-1.904-1.556c-0.942,0-1.726,0.669-1.905,1.556h-5.096  v0.778h5.096c0.18,0.889,0.963,1.556,1.905,1.556c0.94,0,1.725-0.667,1.904-1.556h18.317V30z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.999" x2="29.999" y1="29.1577" y2="31.5575">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="1" style="stop-color:#F23D3D"/>
+<stop offset="0" style="stop-color:#F4EDE4"/>
+<stop offset="1" style="stop-color:#BC7A73"/>
 </linearGradient>
 <circle cx="30" cy="30.389" fill="url(#SVGID_9_)" r="1.167"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_home.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,33 +4,33 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.3896" y2="57.7417">
-<stop offset="0" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#454B4D"/>
+<stop offset="0" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#47494B"/>
 </linearGradient>
 <path d="M29.999,58C14.56,58,2,45.44,2,30C2,14.562,14.56,2,29.999,2C45.44,2,58,14.562,58,30  C58,45.44,45.44,58,29.999,58L29.999,58z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="3.1675" y2="57.1007">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.2364" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#697173"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.2364" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#6C6F70"/>
 </linearGradient>
 <circle cx="29.999" cy="30" fill="url(#SVGID_2_)" r="27.222"/>
-<path d="M30.948,30.95c9.117,0,17.921-0.57,26.256-1.616C56.849,14.609,44.81,2.778,29.999,2.778  C15.274,2.778,3.286,14.472,2.8,29.08C11.691,30.286,21.138,30.95,30.948,30.95z" fill="#F1F1F2" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M30.948,30.95c9.117,0,17.921-0.57,26.256-1.616C56.849,14.609,44.81,2.778,29.999,2.778  C15.274,2.778,3.286,14.472,2.8,29.08C11.691,30.286,21.138,30.95,30.948,30.95z" fill="#F1F2F2" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="3.0361" x2="57.3516" y1="16.5835" y2="16.5835">
-<stop offset="0" style="stop-color:#C0C5C7"/>
-<stop offset="0.2" style="stop-color:#F7FDFF"/>
-<stop offset="0.8" style="stop-color:#F7FDFF"/>
-<stop offset="1" style="stop-color:#CDD3D5"/>
+<stop offset="0" style="stop-color:#C2C5C4"/>
+<stop offset="0.2" style="stop-color:#F9FDFA"/>
+<stop offset="0.8" style="stop-color:#F9FDFA"/>
+<stop offset="1" style="stop-color:#CFD3D1"/>
 </linearGradient>
 <path d="M29.999,3.556c14.902,0,27.004,11.979,27.212,26.833c0.003-0.129,0.01-0.258,0.01-0.389  c0-15.034-12.188-27.222-27.222-27.222C14.964,2.778,2.776,14.966,2.776,30c0,0.131,0.009,0.26,0.01,0.389  C2.996,15.536,15.097,3.556,29.999,3.556z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="54.4995" y2="5.9818">
-<stop offset="0" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#454B4D"/>
+<stop offset="0" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#47494B"/>
 </linearGradient>
 <path d="M29.999,54.111C16.704,54.111,5.888,43.295,5.888,30S16.704,5.89,29.999,5.89  S54.109,16.705,54.109,30S43.294,54.111,29.999,54.111L29.999,54.111z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="52.6606" y2="6.0737">
 <stop offset="0" style="stop-color:#FAF9F9"/>
 <stop offset="0.4" style="stop-color:#FAF9F9"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M29.999,53.333C17.133,53.333,6.667,42.867,6.667,30c0-12.865,10.466-23.333,23.332-23.333  c12.865,0,23.334,10.468,23.334,23.333C53.333,42.867,42.864,53.333,29.999,53.333L29.999,53.333z" fill="url(#SVGID_5_)"/>
 <path d="M29.999,31.667c7.696,0,15.042-0.647,21.777-1.814c-0.084-11.94-9.816-21.63-21.777-21.63  c-11.959,0-21.694,9.69-21.773,21.63C14.959,31.02,22.304,31.667,29.999,31.667z" fill="#FFFFFF" fill-opacity="0.7" stroke-opacity="0.7"/>
@@ -46,25 +46,25 @@
 <rect fill="#404041" height="3.766" transform="matrix(0.8661 -0.4999 0.4999 0.8661 -18.3816 26.2067)" width="1.256" x="39.095" y="45.529"/>
 <rect fill="#404041" height="3.767" transform="matrix(0.4993 -0.8664 0.8664 0.4993 -11.4765 21.8413)" width="1.256" x="12.532" y="18.967"/>
 <rect fill="#404041" height="3.765" transform="matrix(0.4992 -0.8665 0.8665 0.4992 -11.4567 60.7682)" width="1.256" x="46.211" y="38.412"/>
-<path d="M31.904,31.103c-0.075-0.374-0.265-0.705-0.521-0.966l2.68-8.833l-2.232-0.678l-2.783,9.17  c-0.484,0.274-0.84,0.745-0.953,1.307h-5.096v0.777h5.096c0.021,0.103,0.052,0.203,0.088,0.298L16.18,44.181l1.011,1.011  l11.957-11.959c0.257,0.126,0.545,0.204,0.853,0.204c0.94,0,1.725-0.667,1.904-1.556h18.317v-0.777H31.904z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M31.904,31.103c-0.075-0.374-0.265-0.705-0.521-0.966l2.68-8.833l-2.232-0.678l-2.783,9.17  c-0.484,0.274-0.84,0.745-0.953,1.307h-5.096v0.777h5.096c0.021,0.103,0.052,0.203,0.088,0.298L16.18,44.181l1.011,1.011  l11.957-11.959c0.257,0.126,0.545,0.204,0.853,0.204c0.94,0,1.725-0.667,1.904-1.556h18.317v-0.777H31.904z" fill="#222021" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(0.9569 0.2903 -0.2903 0.9569 665.0903 147.1071)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-641.8813" x2="-641.8813" y1="61.4336" y2="73.4297">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<stop offset="0" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#222021"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="34.063,20.202 31.831,19.525 28.442,30.688 30.677,31.366 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="16.7598" x2="30.4403" y1="43.5093" y2="29.8287">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<stop offset="0" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#222021"/>
 </linearGradient>
 <polygon fill="url(#SVGID_7_)" points="30.958,30.321 29.948,29.311 16.18,43.078 17.19,44.088 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="36.6104" x2="36.6104" y1="29.8896" y2="31.0254">
-<stop offset="0" style="stop-color:#FF0000"/>
-<stop offset="1" style="stop-color:#A8000B"/>
+<stop offset="0" style="stop-color:#B34D4D"/>
+<stop offset="1" style="stop-color:#763242"/>
 </linearGradient>
 <path d="M50.222,30H31.904c-0.18-0.887-0.964-1.556-1.904-1.556c-0.942,0-1.726,0.669-1.905,1.556h-5.096  v0.778h5.096c0.18,0.889,0.963,1.556,1.905,1.556c0.94,0,1.725-0.667,1.904-1.556h18.317V30z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.999" x2="29.999" y1="29.1577" y2="31.5575">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="1" style="stop-color:#F23D3D"/>
+<stop offset="0" style="stop-color:#F4EDE4"/>
+<stop offset="1" style="stop-color:#BC7A73"/>
 </linearGradient>
 <circle cx="30" cy="30.389" fill="url(#SVGID_9_)" r="1.167"/>
 <rect fill="none" height="60" width="60"/>
@@ -74,37 +74,37 @@
 <path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962  c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706  l-2.747,2.749v12.253H2.749z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.415" x2="15.415" y1="28.6694" y2="12.5688">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+<stop offset="0.6606" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#BABCBB"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="27.081,28.823 3.749,28.823 3.749,14.473 15.414,5.489 27.081,14.473 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.415" x2="15.415" y1="17.313" y2="28.6013">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+<stop offset="0.6606" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#BABCBB"/>
 </linearGradient>
 <path d="M15.414,6.668l10.736,8.264V27.89H4.682V14.932L15.414,6.668 M15.414,5.489L3.749,14.473v14.351  h23.333V14.473L15.414,5.489L15.414,5.489z" fill="url(#SVGID_2__)"/>
 <polygon fill-opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 " stroke-opacity="0.2"/>
 <polygon fill="#727272" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,6.655 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15.416" x2="15.416" y1="17.9946" y2="29.1519">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <rect fill="url(#SVGID_3__)" height="10.501" width="7.001" x="11.916" y="18.322"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15.416" x2="15.416" y1="28.7466" y2="18.3602">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <path d="M17.98,19.257v8.633h-5.133v-8.633H17.98 M18.917,18.322h-7.001v10.501h7.001V18.322L18.917,18.322z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15.4136" x2="15.4136" y1="0.0352" y2="17.7271">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<stop offset="0" style="stop-color:#A8835F"/>
+<stop offset="0.2606" style="stop-color:#A86F5F"/>
+<stop offset="1" style="stop-color:#9A5047"/>
 </linearGradient>
 <path d="M15.414,5.489l11.667,11.667l2.333-2.333c0,0-12.586-12.554-13.171-13.175  c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14l2.335,2.333L15.414,5.489z" fill="url(#SVGID_5__)"/>
 <radialGradient cx="15.2969" cy="1.7559" gradientUnits="userSpaceOnUse" id="SVGID_6__" r="18.6679">
-<stop offset="0" style="stop-color:#F7D481"/>
-<stop offset="1" style="stop-color:#F5340A"/>
+<stop offset="0" style="stop-color:#D4C9A4"/>
+<stop offset="1" style="stop-color:#AF6151"/>
 </radialGradient>
 <path d="M14.553,2.616c0.724-0.688,1.102-0.653,1.689-0.034c0.516,0.549,10.433,10.442,12.705,12.709  l0.467-0.468c0,0-12.586-12.554-13.171-13.175c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14  l0.467,0.465C4.134,13.029,13.917,3.225,14.553,2.616z" fill="url(#SVGID_6__)"/>
 <rect fill-opacity="0.2" height="1.168" stroke-opacity="0.2" width="7.001" x="11.916" y="18.322"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,7 +3,7 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <rect fill="none" height="60" width="59.999"/>
-<path d="M29.998,57.387c-15.439,0-28.001-12.561-28.001-28c0-15.438,12.562-28.001,28.001-28.001  c15.44,0,27.999,12.561,27.999,28.001C57.997,44.826,45.438,57.387,29.998,57.387L29.998,57.387z" fill="#343433"/>
+<path d="M29.998,57.387c-15.439,0-28.001-12.561-28.001-28c0-15.438,12.562-28.001,28.001-28.001  c15.44,0,27.999,12.561,27.999,28.001C57.997,44.826,45.438,57.387,29.998,57.387L29.998,57.387z" fill="#343333"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="174.0137" x2="174.0137" y1="218.3223" y2="272.2545">
 <stop offset="0" style="stop-color:#989897"/>
 <stop offset="0.24" style="stop-color:#676767"/>
@@ -13,13 +13,13 @@
 <path d="M30.948,30.335c9.117,0,17.92-0.568,26.256-1.615  C56.847,13.996,44.81,2.165,29.998,2.165c-14.724,0-26.712,11.695-27.2,26.301C11.689,29.67,21.137,30.335,30.948,30.335z" fill="#4E4E4E" fill-opacity="0.35" stroke-opacity="0.35"/>
 <path d="M29.998,2.941c14.903,0,27.005,11.98,27.212,26.833c0-0.129,0.01-0.258,0.01-0.388  c0-15.035-12.188-27.222-27.222-27.222S2.776,14.352,2.776,29.386c0,0.131,0.008,0.259,0.009,0.388  C2.995,14.92,15.095,2.941,29.998,2.941z" fill="#B3B2B3"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="174.0137" x2="174.0137" y1="269.6514" y2="221.1329">
-<stop offset="0" style="stop-color:#BCC1C2"/>
-<stop offset="1" style="stop-color:#474C4D"/>
+<stop offset="0" style="stop-color:#BEC0BF"/>
+<stop offset="1" style="stop-color:#494A4B"/>
 </linearGradient>
 <path d="M29.998,53.496c-13.295,0-24.111-10.816-24.111-24.111c0-13.296,10.815-24.113,24.111-24.113  c13.294,0,24.114,10.817,24.114,24.113C54.112,42.68,43.292,53.496,29.998,53.496L29.998,53.496z" fill="url(#SVGID_2_)"/>
 <radialGradient cx="174.0127" cy="287.1436" gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="84.7752">
-<stop offset="0" style="stop-color:#343433"/>
-<stop offset="0.4" style="stop-color:#343433"/>
+<stop offset="0" style="stop-color:#343333"/>
+<stop offset="0.4" style="stop-color:#343333"/>
 <stop offset="1" style="stop-color:#4E4E4E"/>
 </radialGradient>
 <path d="M29.998,52.719c-12.864,0-23.332-10.466-23.332-23.333c0-12.865,10.468-23.333,23.332-23.333  c12.866,0,23.331,10.469,23.331,23.333C53.329,42.253,42.864,52.719,29.998,52.719L29.998,52.719z" fill="url(#SVGID_3_)"/>
@@ -36,7 +36,7 @@
 <rect fill="#F3F2F2" height="3.763" transform="matrix(-0.8665 0.4992 -0.4992 -0.8665 97.4898 67.514)" width="1.258" x="39.087" y="44.913"/>
 <rect fill="#F3F2F2" height="3.765" transform="matrix(-0.5002 0.8659 -0.8659 -0.5002 37.2642 18.9665)" width="1.255" x="12.531" y="18.355"/>
 <rect fill="#F3F2F2" height="3.765" transform="matrix(-0.5008 0.8656 -0.8656 -0.5008 104.6477 19.0248)" width="1.256" x="46.21" y="37.806"/>
-<path d="M31.903,30.489c-0.078-0.374-0.264-0.705-0.521-0.967l2.68-8.833  l-2.234-0.677l-2.781,9.17c-0.484,0.275-0.84,0.744-0.954,1.307h-5.095v0.779h5.096c0.023,0.102,0.052,0.201,0.088,0.298  L16.178,43.564l1.008,1.01l11.961-11.957c0.257,0.127,0.543,0.203,0.851,0.203c0.941,0,1.725-0.667,1.906-1.558h18.318v-0.775  L31.903,30.489L31.903,30.489z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M31.903,30.489c-0.078-0.374-0.264-0.705-0.521-0.967l2.68-8.833  l-2.234-0.677l-2.781,9.17c-0.484,0.275-0.84,0.744-0.954,1.307h-5.095v0.779h5.096c0.023,0.102,0.052,0.201,0.088,0.298  L16.178,43.564l1.008,1.01l11.961-11.957c0.257,0.127,0.543,0.203,0.851,0.203c0.941,0,1.725-0.667,1.906-1.558h18.318v-0.775  L31.903,30.489L31.903,30.489z" fill="#222021" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="177.0596" x2="173.5786" y1="234.6855" y2="246.1574">
 <stop offset="0" style="stop-color:#E5E5E5"/>
 <stop offset="1" style="stop-color:#989897"/>
@@ -48,13 +48,13 @@
 </linearGradient>
 <polygon fill="url(#SVGID_5_)" points="30.956,29.708 29.947,28.696 16.179,42.464 17.188,43.474 "/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="180.625" x2="180.625" y1="245.041" y2="246.1719">
-<stop offset="0" style="stop-color:#EC2224"/>
-<stop offset="1" style="stop-color:#A71E22"/>
+<stop offset="0" style="stop-color:#AF635F"/>
+<stop offset="1" style="stop-color:#7E474F"/>
 </linearGradient>
 <path d="M50.222,29.386H31.903c-0.182-0.887-0.965-1.556-1.906-1.556c-0.942,0-1.725,0.668-1.905,1.556  h-5.096v0.777h5.096c0.181,0.888,0.963,1.556,1.905,1.556c0.941,0,1.725-0.668,1.906-1.556h18.318V29.386z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="174.0137" x2="174.0137" y1="244.3047" y2="246.7054">
-<stop offset="0" style="stop-color:#FCE1D8"/>
-<stop offset="1" style="stop-color:#EE3F3F"/>
+<stop offset="0" style="stop-color:#F1EBE3"/>
+<stop offset="1" style="stop-color:#BA7A73"/>
 </linearGradient>
 <circle cx="29.998" cy="29.774" fill="url(#SVGID_7_)" r="1.166"/>
 <rect fill="none" height="59.996" width="59.995"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night_home.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,7 +3,7 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <rect fill="none" height="60" width="59.999"/>
-<path d="M29.998,57.387c-15.439,0-28.001-12.561-28.001-28c0-15.438,12.562-28.001,28.001-28.001  c15.44,0,27.999,12.561,27.999,28.001C57.997,44.826,45.438,57.387,29.998,57.387L29.998,57.387z" fill="#343433"/>
+<path d="M29.998,57.387c-15.439,0-28.001-12.561-28.001-28c0-15.438,12.562-28.001,28.001-28.001  c15.44,0,27.999,12.561,27.999,28.001C57.997,44.826,45.438,57.387,29.998,57.387L29.998,57.387z" fill="#343333"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="174.0137" x2="174.0137" y1="218.3223" y2="272.2545">
 <stop offset="0" style="stop-color:#989897"/>
 <stop offset="0.24" style="stop-color:#676767"/>
@@ -13,13 +13,13 @@
 <path d="M30.948,30.335c9.117,0,17.92-0.568,26.256-1.615  C56.847,13.996,44.81,2.165,29.998,2.165c-14.724,0-26.712,11.695-27.2,26.301C11.689,29.67,21.137,30.335,30.948,30.335z" fill="#4E4E4E" fill-opacity="0.35" stroke-opacity="0.35"/>
 <path d="M29.998,2.941c14.903,0,27.005,11.98,27.212,26.833c0-0.129,0.01-0.258,0.01-0.388  c0-15.035-12.188-27.222-27.222-27.222S2.776,14.352,2.776,29.386c0,0.131,0.008,0.259,0.009,0.388  C2.995,14.92,15.095,2.941,29.998,2.941z" fill="#B3B2B3"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="174.0137" x2="174.0137" y1="269.6514" y2="221.1329">
-<stop offset="0" style="stop-color:#BCC1C2"/>
-<stop offset="1" style="stop-color:#474C4D"/>
+<stop offset="0" style="stop-color:#BEC0BF"/>
+<stop offset="1" style="stop-color:#494A4B"/>
 </linearGradient>
 <path d="M29.998,53.496c-13.295,0-24.111-10.816-24.111-24.111c0-13.296,10.815-24.113,24.111-24.113  c13.294,0,24.114,10.817,24.114,24.113C54.112,42.68,43.292,53.496,29.998,53.496L29.998,53.496z" fill="url(#SVGID_2_)"/>
 <radialGradient cx="174.0127" cy="287.1436" gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="84.7752">
-<stop offset="0" style="stop-color:#343433"/>
-<stop offset="0.4" style="stop-color:#343433"/>
+<stop offset="0" style="stop-color:#343333"/>
+<stop offset="0.4" style="stop-color:#343333"/>
 <stop offset="1" style="stop-color:#4E4E4E"/>
 </radialGradient>
 <path d="M29.998,52.719c-12.864,0-23.332-10.466-23.332-23.333c0-12.865,10.468-23.333,23.332-23.333  c12.866,0,23.331,10.469,23.331,23.333C53.329,42.253,42.864,52.719,29.998,52.719L29.998,52.719z" fill="url(#SVGID_3_)"/>
@@ -36,7 +36,7 @@
 <rect fill="#F3F2F2" height="3.763" transform="matrix(-0.8665 0.4992 -0.4992 -0.8665 97.4898 67.514)" width="1.258" x="39.087" y="44.913"/>
 <rect fill="#F3F2F2" height="3.765" transform="matrix(-0.5002 0.8659 -0.8659 -0.5002 37.2642 18.9665)" width="1.255" x="12.531" y="18.355"/>
 <rect fill="#F3F2F2" height="3.765" transform="matrix(-0.5008 0.8656 -0.8656 -0.5008 104.6477 19.0248)" width="1.256" x="46.21" y="37.806"/>
-<path d="M31.903,30.489c-0.078-0.374-0.264-0.705-0.521-0.967l2.68-8.833  l-2.234-0.677l-2.781,9.17c-0.484,0.275-0.84,0.744-0.954,1.307h-5.095v0.779h5.096c0.023,0.102,0.052,0.201,0.088,0.298  L16.178,43.564l1.008,1.01l11.961-11.957c0.257,0.127,0.543,0.203,0.851,0.203c0.941,0,1.725-0.667,1.906-1.558h18.318v-0.775  L31.903,30.489L31.903,30.489z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M31.903,30.489c-0.078-0.374-0.264-0.705-0.521-0.967l2.68-8.833  l-2.234-0.677l-2.781,9.17c-0.484,0.275-0.84,0.744-0.954,1.307h-5.095v0.779h5.096c0.023,0.102,0.052,0.201,0.088,0.298  L16.178,43.564l1.008,1.01l11.961-11.957c0.257,0.127,0.543,0.203,0.851,0.203c0.941,0,1.725-0.667,1.906-1.558h18.318v-0.775  L31.903,30.489L31.903,30.489z" fill="#222021" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="177.0596" x2="173.5786" y1="234.6855" y2="246.1574">
 <stop offset="0" style="stop-color:#E5E5E5"/>
 <stop offset="1" style="stop-color:#989897"/>
@@ -48,13 +48,13 @@
 </linearGradient>
 <polygon fill="url(#SVGID_5_)" points="30.956,29.708 29.947,28.696 16.179,42.464 17.188,43.474 "/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="180.625" x2="180.625" y1="245.041" y2="246.1719">
-<stop offset="0" style="stop-color:#EC2224"/>
-<stop offset="1" style="stop-color:#A71E22"/>
+<stop offset="0" style="stop-color:#AF635F"/>
+<stop offset="1" style="stop-color:#7E474F"/>
 </linearGradient>
 <path d="M50.222,29.386H31.903c-0.182-0.887-0.965-1.556-1.906-1.556c-0.942,0-1.725,0.668-1.905,1.556  h-5.096v0.777h5.096c0.181,0.888,0.963,1.556,1.905,1.556c0.941,0,1.725-0.668,1.906-1.556h18.318V29.386z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="174.0137" x2="174.0137" y1="244.3047" y2="246.7054">
-<stop offset="0" style="stop-color:#FCE1D8"/>
-<stop offset="1" style="stop-color:#EE3F3F"/>
+<stop offset="0" style="stop-color:#F1EBE3"/>
+<stop offset="1" style="stop-color:#BA7A73"/>
 </linearGradient>
 <circle cx="29.998" cy="29.774" fill="url(#SVGID_7_)" r="1.166"/>
 <rect fill="none" height="59.996" width="59.995"/>
@@ -64,37 +64,37 @@
 <path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962  c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706  l-2.747,2.749v12.253H2.749z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.415" x2="15.415" y1="28.6694" y2="12.5688">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+<stop offset="0.6606" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#BABCBB"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="27.081,28.823 3.749,28.823 3.749,14.473 15.414,5.489 27.081,14.473 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.415" x2="15.415" y1="17.313" y2="28.6013">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+<stop offset="0.6606" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#BABCBB"/>
 </linearGradient>
 <path d="M15.414,6.668l10.736,8.264V27.89H4.682V14.932L15.414,6.668 M15.414,5.489L3.749,14.473v14.351  h23.333V14.473L15.414,5.489L15.414,5.489z" fill="url(#SVGID_2__)"/>
 <polygon fill-opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 " stroke-opacity="0.2"/>
 <polygon fill="#727272" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,6.655 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15.416" x2="15.416" y1="17.9946" y2="29.1519">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <rect fill="url(#SVGID_3__)" height="10.501" width="7.001" x="11.916" y="18.322"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15.416" x2="15.416" y1="28.7466" y2="18.3602">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <path d="M17.98,19.257v8.633h-5.133v-8.633H17.98 M18.917,18.322h-7.001v10.501h7.001V18.322L18.917,18.322z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15.4136" x2="15.4136" y1="0.0352" y2="17.7271">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<stop offset="0" style="stop-color:#A8835F"/>
+<stop offset="0.2606" style="stop-color:#A86F5F"/>
+<stop offset="1" style="stop-color:#9A5047"/>
 </linearGradient>
 <path d="M15.414,5.489l11.667,11.667l2.333-2.333c0,0-12.586-12.554-13.171-13.175  c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14l2.335,2.333L15.414,5.489z" fill="url(#SVGID_5__)"/>
 <radialGradient cx="15.2969" cy="1.7559" gradientUnits="userSpaceOnUse" id="SVGID_6__" r="18.6679">
-<stop offset="0" style="stop-color:#F7D481"/>
-<stop offset="1" style="stop-color:#F5340A"/>
+<stop offset="0" style="stop-color:#D4C9A4"/>
+<stop offset="1" style="stop-color:#AF6151"/>
 </radialGradient>
 <path d="M14.553,2.616c0.724-0.688,1.102-0.653,1.689-0.034c0.516,0.549,10.433,10.442,12.705,12.709  l0.467-0.468c0,0-12.586-12.554-13.171-13.175c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14  l0.467,0.465C4.134,13.029,13.917,3.225,14.553,2.616z" fill="url(#SVGID_6__)"/>
 <rect fill-opacity="0.2" height="1.168" stroke-opacity="0.2" width="7.001" x="11.916" y="18.322"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_computer.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_computer.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_computer.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,10 +4,10 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="9.9121" x2="50.0859" y1="30" y2="30">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+<stop offset="0" style="stop-color:#B7BCBA"/>
+<stop offset="0.2667" style="stop-color:#E7EBE8"/>
+<stop offset="0.703" style="stop-color:#919595"/>
+<stop offset="1" style="stop-color:#B9BDBC"/>
 </linearGradient>
 <path d="M48.539,2H11.463c-0.854,0-1.551,0.69-1.551,1.536V58h40.174V3.536C50.086,2.69,49.39,2,48.539,2z" fill="url(#SVGID_1_)"/>
 <path d="M48.539,2c0.851,0,1.547,0.69,1.547,1.536V58H9.912V3.536C9.912,2.69,10.609,2,11.463,2  H48.539 M48.539,3.218H11.463c-0.181,0-0.333,0.146-0.333,0.318v53.246h37.739V3.536C48.869,3.364,48.717,3.218,48.539,3.218  L48.539,3.218z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
@@ -28,20 +28,20 @@
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="4.869" width="28.397" x="15.802" y="11.787"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="20.0391" x2="20.0391" y1="12.8813" y2="15.4384">
-<stop offset="0" style="stop-color:#17BFFF"/>
-<stop offset="1" style="stop-color:#0D5186"/>
+<stop offset="0" style="stop-color:#5DA9B9"/>
+<stop offset="1" style="stop-color:#313C62"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="2.435" width="6.125" x="16.977" y="13.004"/>
 <rect fill="#FFFFFF" fill-opacity="0.25" height="1.218" stroke-opacity="0.25" width="6.125" x="16.977" y="13.004"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="42.9824" x2="42.9824" y1="25.0635" y2="32.5999">
-<stop offset="0" style="stop-color:#576266"/>
+<stop offset="0" style="stop-color:#5C5F62"/>
 <stop offset="1" style="stop-color:#C4C4C4"/>
 </linearGradient>
 <path d="M42.981,32.482c-2.014,0-3.651-1.638-3.651-3.652c0-2.014,1.638-3.652,3.651-3.652  c2.015,0,3.652,1.639,3.652,3.652C46.634,30.845,44.996,32.482,42.981,32.482L42.981,32.482z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="42.9814" x2="42.9814" y1="26.3193" y2="31.3429">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <circle cx="42.981" cy="28.83" fill="url(#SVGID_7_)" r="2.435"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30" x2="30" y1="53.2866" y2="48.5696">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_corrupted.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_corrupted.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_corrupted.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,35 +3,35 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="301.21" x2="291.3099" y1="-352.2012" y2="-361.051">
-<stop offset="0" style="stop-color:#6B3720"/>
-<stop offset="0.4909" style="stop-color:#6B3720"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#553737"/>
+<stop offset="0.4909" style="stop-color:#553737"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="54.751,6.15 32.141,6.15 43.029,45.005 31.788,54.724 31.402,55.649 54.751,55.649 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="18.7417" x2="18.7417" y1="54.6143" y2="3.2317">
-<stop offset="0" style="stop-color:#6B3720"/>
-<stop offset="0.4909" style="stop-color:#6B3720"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#553737"/>
+<stop offset="0.4909" style="stop-color:#553737"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <path d="M32.23,43.204l-7.049-8.898l7.051-11.1v-1l-7.051-8.3l3.358-8.555v-1L5.25,37.751  c0,0.988,0.571,2.373,1.273,3.072l11.854,11.854c0.699,0.699,2.081,1.271,3.072,1.271h6.728l4.054-9.744V43.204z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="294.7412" x2="294.7412" y1="-308.9053" y2="-357.6842">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#AF2B1C"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="1" style="stop-color:#834849"/>
 </linearGradient>
 <path d="M25.181,33.306l7.051-11.1l-7.051-9.3l3.358-8.555H5.25v32.4c0,0.988,0.571,2.373,1.273,3.072  l11.854,11.854c0.699,0.699,2.081,1.271,3.072,1.271h6.728l4.054-9.744L25.181,33.306z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="317.7656" x2="317.7656" y1="-310.7061" y2="-359.4865">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#AF2B1C"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="1" style="stop-color:#834849"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4_)" points="54.751,6.15 32.141,6.15 28.781,14.706 35.831,24.007 28.781,35.105 35.831,45.005   31.777,54.751 54.751,54.751 "/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="292.9004" x2="292.9004" y1="-309.3506" y2="-357.7997">
-<stop offset="0" style="stop-color:#F0AD93"/>
-<stop offset="1" style="stop-color:#B6593F"/>
+<stop offset="0" style="stop-color:#D4C0AF"/>
+<stop offset="1" style="stop-color:#926C63"/>
 </linearGradient>
 <path d="M21.45,52.05c-0.747,0-1.91-0.479-2.437-1.008L7.159,39.187C6.63,38.659,6.15,37.497,6.15,36.751  V5.25h22.036l0.354-0.9H5.25v32.4c0,0.988,0.571,2.373,1.273,3.072l11.854,11.854c0.699,0.699,2.081,1.271,3.072,1.271h6.728  l0.375-0.899L21.45,52.05L21.45,52.05z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="319.2637" x2="319.2637" y1="-311.0068" y2="-359.3975">
-<stop offset="0" style="stop-color:#F0AD93"/>
-<stop offset="1" style="stop-color:#B6593F"/>
+<stop offset="0" style="stop-color:#D4C0AF"/>
+<stop offset="1" style="stop-color:#926C63"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="54.751,6.15 32.141,6.15 31.786,7.051 53.852,7.051 53.852,53.851 32.152,53.851   31.777,54.751 54.751,54.751 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="18.916" x2="12.6232" y1="39.7666" y2="46.0594">
@@ -43,13 +43,13 @@
 </linearGradient>
 <path d="M6.909,40.21c-0.373-0.414-1.068-0.83-1.547-2.609c0,0,0.788,3.648,11.588,0.05  c0,15.3,4.5,15.3,4.5,15.3c-0.992,0-2.373-0.572-3.072-1.271L6.909,40.21z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="308.7559" x2="308.7559" y1="-310.7061" y2="-359.4865">
-<stop offset="0" style="stop-color:#F0AD93"/>
-<stop offset="1" style="stop-color:#B6593F"/>
+<stop offset="0" style="stop-color:#D4C0AF"/>
+<stop offset="1" style="stop-color:#926C63"/>
 </linearGradient>
 <polygon fill="url(#SVGID_8_)" points="29.682,35.105 36.73,24.007 29.682,14.706 33.038,6.15 32.141,6.15 28.781,14.706   35.831,24.007 28.781,35.105 35.831,45.005 31.777,54.751 32.68,54.751 36.73,45.005 "/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="304.2559" x2="304.2559" y1="-308.9053" y2="-357.6842">
-<stop offset="0" style="stop-color:#F0AD93"/>
-<stop offset="1" style="stop-color:#B6593F"/>
+<stop offset="0" style="stop-color:#D4C0AF"/>
+<stop offset="1" style="stop-color:#926C63"/>
 </linearGradient>
 <polygon fill="url(#SVGID_9_)" points="32.23,22.206 25.181,12.907 28.539,4.351 27.639,4.351 24.281,12.907 31.331,22.206   24.281,33.306 31.331,43.206 27.277,52.95 28.178,52.95 32.23,43.206 25.181,33.306 "/>
 <rect fill="none" height="60" width="60.001"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_custom.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_custom.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_custom.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,35 +4,35 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="24.88" x2="24.88" y1="7.58" y2="43.1">
-<stop offset="0" stop-color="#FFE6DE"/>
-<stop offset="1" stop-color="#DB7250"/>
+<stop offset="0" stop-color="#F5EFE8"/>
+<stop offset="1" stop-color="#B18B7A"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1)" points="30.74,19.22,42.88,25.07,30.74,30.93,24.88,43.07,19.03,30.93,6.883,25.07,19.03,19.22,24.88,7.074"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="24.88" x2="24.88" y1="10.64" y2="39.11">
-<stop offset="0" stop-color="#FF7236"/>
-<stop offset="0.79" stop-color="#D11414"/>
-<stop offset="1" stop-color="#E8522A"/>
+<stop offset="0" stop-color="#C39072"/>
+<stop offset="0.79" stop-color="#984D51"/>
+<stop offset="1" stop-color="#AF7563"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2)" points="39.82,25.07,29.74,29.93,24.88,40.01,20.02,29.93,9.949,25.07,20.02,20.22,24.88,10.14,29.74,20.22"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="24.88" x2="24.88" y1="4.76" y2="45.29">
-<stop offset="0" stop-color="#FF3030"/>
-<stop offset="1" stop-color="#9C2D31"/>
+<stop offset="0" stop-color="#C1766E"/>
+<stop offset="1" stop-color="#7B4E54"/>
 </linearGradient>
 <path d="M24.88,7.474l5.549,11.51,0.176,0.364,0.363,0.177,11.51,5.549-11.51,5.548-0.363,0.177-0.176,0.364-5.549,11.51-5.551-11.51-0.176-0.364-0.363-0.177-11.51-5.55,11.51-5.549,0.363-0.177,0.176-0.364,5.55-11.51m0-2.666l-6.59,13.67-13.68,6.59,13.68,6.591,6.592,13.68,6.592-13.68,13.67-6.591-13.67-6.59-6.6-13.67z" fill="url(#SVGID_3)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="42.73" x2="42.73" y1="31.3" y2="53.78">
-<stop offset="0" stop-color="#FFE6DE"/>
-<stop offset="1" stop-color="#DB7250"/>
+<stop offset="0" stop-color="#F5EFE8"/>
+<stop offset="1" stop-color="#B18B7A"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4)" points="46.38,38.88,53.97,42.54,46.38,46.19,42.73,53.78,39.07,46.19,31.49,42.54,39.07,38.88,42.73,31.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="42.73" x2="42.73" y1="33.21" y2="51.86">
-<stop offset="0" stop-color="#FF7236"/>
-<stop offset="0.79" stop-color="#D11414"/>
-<stop offset="1" stop-color="#E8522A"/>
+<stop offset="0" stop-color="#C39072"/>
+<stop offset="0.79" stop-color="#984D51"/>
+<stop offset="1" stop-color="#AF7563"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5)" points="52.06,42.54,45.76,45.57,42.73,51.86,39.7,45.57,33.4,42.54,39.7,39.5,42.73,33.21,45.76,39.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="42.73" x2="42.73" y1="29.85" y2="55.16">
-<stop offset="0" stop-color="#FF3030"/>
-<stop offset="1" stop-color="#9C2D31"/>
+<stop offset="0" stop-color="#C1766E"/>
+<stop offset="1" stop-color="#7B4E54"/>
 </linearGradient>
 <path d="M42.73,31.54l3.465,7.188,0.109,0.227,0.229,0.11,7.188,3.466-7.2,3.46-0.229,0.11-0.109,0.227-3.465,7.187-3.465-7.187-0.109-0.227-0.22-0.11-7.188-3.465,7.188-3.466,0.229-0.11,0.109-0.227,3.46-7.19m0-1.66l-4.117,8.54-8.539,4.116,8.539,4.115,4.117,8.541,4.115-8.541,8.539-4.115-8.539-4.116-4.11-8.54z" fill="url(#SVGID_6)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_data_import.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_data_import.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_data_import.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,23 +4,23 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="18.98" x2="18.98" y1="7.81" y2="45.46">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.07" stop-color="#D1D7D9"/>
-<stop offset="0.26" stop-color="#BDC2C4"/>
-<stop offset="0.66" stop-color="#949DA1"/>
-<stop offset="0.96" stop-color="#ADB3B5"/>
-<stop offset="1" stop-color="#595C5E"/>
+<stop offset="0" stop-color="#D3D7D5"/>
+<stop offset="0.07" stop-color="#D3D7D5"/>
+<stop offset="0.26" stop-color="#BFC2C1"/>
+<stop offset="0.66" stop-color="#989D9D"/>
+<stop offset="0.96" stop-color="#AFB3B2"/>
+<stop offset="1" stop-color="#5B5B5D"/>
 </linearGradient>
 <path d="M31.22,42.85c0,1.354-1.097,2.449-2.449,2.449h-19.59c-1.353,0-2.449-1.096-2.449-2.449v-33.06c0-1.353,1.096-2.449,2.449-2.449h19.59c1.353,0,2.449,1.097,2.449,2.449v33.06z" fill="url(#SVGID_1)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="18.98" x2="18.98" y1="7.35" y2="44.44">
-<stop offset="0" stop-color="#D5D7DB"/>
-<stop offset="0.67" stop-color="#85878A"/>
-<stop offset="1" stop-color="#808184"/>
+<stop offset="0" stop-color="#D7D9D9"/>
+<stop offset="0.67" stop-color="#878789"/>
+<stop offset="1" stop-color="#818283"/>
 </linearGradient>
 <path d="M28.77,7.346h-19.59c-1.353,0-2.449,1.097-2.449,2.449v33.06c0,0.654,0.26,1.244,0.677,1.684-0.038-0.147-0.065-0.299-0.065-0.459v-34.26c0-1.013,0.824-1.837,1.837-1.837h19.59c1.013,0,1.836,0.824,1.836,1.837v34.28c0,0.16-0.026,0.312-0.064,0.459,0.417-0.439,0.678-1.029,0.678-1.684v-33.06c-0.01-1.352-1.1-2.449-2.46-2.449z" fill="url(#SVGID_2)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="18.98" x2="18.98" y1="10.44" y2="34.29">
-<stop offset="0" stop-color="#878B8C"/>
-<stop offset="1" stop-color="#B1BABD"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="1" stop-color="#B5B9B8"/>
 </linearGradient>
 <rect fill="url(#SVGID_3)" fill-opacity="0.6" height="23.88" stroke-opacity="0.6" width="20.82" x="8.571" y="10.41"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="18.98" x2="18.98" y1="11.05" y2="33.67">
@@ -29,96 +29,96 @@
 </linearGradient>
 <rect fill="url(#SVGID_4)" height="22.65" width="19.59" x="9.183" y="11.02"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="18.98" x2="18.98" y1="11.66" y2="33.06">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="0.39" stop-color="#2D9BD2"/>
-<stop offset="0.89" stop-color="#1347BA"/>
-<stop offset="1" stop-color="#1347BA"/>
+<stop offset="0" stop-color="#70B4B6"/>
+<stop offset="0.39" stop-color="#5F8BA1"/>
+<stop offset="0.89" stop-color="#455188"/>
+<stop offset="1" stop-color="#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5)" height="21.43" width="18.37" x="9.795" y="11.63"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="18.98" x2="18.98" y1="12.14" y2="20.78">
-<stop offset="0" stop-color="#85EFFF"/>
-<stop offset="1" stop-color="#3BA1D9"/>
+<stop offset="0" stop-color="#AADAC6"/>
+<stop offset="1" stop-color="#6A99AA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6)" points="28.16,18.98,9.795,21.43,9.795,12.24,28.16,12.24"/>
-<rect fill="#9FE4FF" height="0.612" width="18.37" x="9.795" y="11.63"/>
+<rect fill="#BCE2D2" height="0.612" width="18.37" x="9.795" y="11.63"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="19.3" x2="19.3" y1="10.44" y2="7.99">
 <stop offset="0" stop-color="#CFCFCF"/>
-<stop offset="1" stop-color="#808385"/>
+<stop offset="1" stop-color="#828384"/>
 </linearGradient>
 <path d="M17.11,10.41c-0.686,0-1.224-0.448-1.224-1.021v-0.41c0-0.572,0.538-1.021,1.224-1.021h4.37c0.686,0,1.224,0.448,1.224,1.021v0.408c0,0.573-0.538,1.021-1.224,1.021h-4.367z" fill="url(#SVGID_7)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="19.3" x2="19.3" y1="8.32" y2="9.9">
-<stop offset="0" stop-color="#343838"/>
-<stop offset="1" stop-color="#7D8182"/>
+<stop offset="0" stop-color="#353637"/>
+<stop offset="1" stop-color="#7F8081"/>
 </linearGradient>
 <path d="M22.1,9.387c0,0.226-0.273,0.409-0.612,0.409h-4.37c-0.338,0-0.612-0.183-0.612-0.409v-0.408c0-0.226,0.274-0.408,0.612-0.408h4.37c0.338,0,0.612,0.183,0.612,0.408v0.408z" fill="url(#SVGID_8)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="18.98" x2="18.98" y1="34.92" y2="43.41">
-<stop offset="0" stop-color="#878B8C"/>
-<stop offset="1" stop-color="#B1BABD"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="1" stop-color="#B5B9B8"/>
 </linearGradient>
 <path d="M17.07,43.47c-1.312,0-2.379-1.057-2.379-2.355v-3.87c0-1.298,1.067-2.354,2.379-2.354h3.813c1.311,0,2.378,1.057,2.378,2.354v3.862c0,1.298-1.067,2.354-2.379,2.354h-3.808z" fill="url(#SVGID_9)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M17.07,42.85c-0.972,0-1.763-0.781-1.763-1.742v-3.86c0-0.961,0.791-1.742,1.763-1.742h3.82c0.972,0,1.763,0.781,1.763,1.742v3.862c0,0.96-0.791,1.741-1.763,1.741h-3.822z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="18.98" x2="18.98" y1="36.09" y2="42.25">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.07" stop-color="#D1D7D9"/>
-<stop offset="0.26" stop-color="#BDC2C4"/>
-<stop offset="0.66" stop-color="#949DA1"/>
-<stop offset="0.96" stop-color="#ADB3B5"/>
-<stop offset="1" stop-color="#595C5E"/>
+<stop offset="0" stop-color="#D3D7D5"/>
+<stop offset="0.07" stop-color="#D3D7D5"/>
+<stop offset="0.26" stop-color="#BFC2C1"/>
+<stop offset="0.66" stop-color="#989D9D"/>
+<stop offset="0.96" stop-color="#AFB3B2"/>
+<stop offset="1" stop-color="#5B5B5D"/>
 </linearGradient>
 <path d="M22.04,41.11c0,0.625-0.514,1.131-1.146,1.131h-3.83c-0.633,0-1.146-0.506-1.146-1.131v-3.86c0-0.625,0.514-1.131,1.146-1.131h3.83c0.632,0,1.146,0.506,1.146,1.131v3.861z" fill="url(#SVGID_10)"/>
 <path d="M18.37,41.02c-0.675,0-1.225-0.549-1.225-1.225v-1.225c0-0.676,0.549-1.225,1.225-1.225h1.224c0.675,0,1.225,0.549,1.225,1.225v1.225c0,0.676-0.549,1.225-1.225,1.225h-1.214z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="18.98" x2="18.98" y1="37.95" y2="40.41">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="0.7" stop-color="#58595B"/>
-<stop offset="1" stop-color="#808184"/>
+<stop offset="0" stop-color="#A8A9AA"/>
+<stop offset="0.7" stop-color="#59595A"/>
+<stop offset="1" stop-color="#818283"/>
 </linearGradient>
 <path d="M18.37,40.4c-0.337,0-0.612-0.275-0.612-0.612v-1.225c0-0.336,0.275-0.611,0.612-0.611h1.224c0.337,0,0.612,0.275,0.612,0.611v1.225c0,0.337-0.275,0.612-0.612,0.612h-1.224z" fill="url(#SVGID_11)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="11.02" x2="11.02" y1="35.48" y2="42.25">
-<stop offset="0" stop-color="#878B8C"/>
-<stop offset="1" stop-color="#B1BABD"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="1" stop-color="#B5B9B8"/>
 </linearGradient>
 <path d="M11.02,42.24c-1.35,0-2.449-1.057-2.449-2.355v-2.025c0-1.297,1.099-2.354,2.449-2.354s2.449,1.057,2.449,2.354v2.025c0,1.31-1.1,2.36-2.45,2.36z" fill="url(#SVGID_12)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="11.02" x2="11.02" y1="36.09" y2="41.64">
-<stop offset="0" stop-color="#231F20"/>
-<stop offset="1" stop-color="#6D6E70"/>
+<stop offset="0" stop-color="#222021"/>
+<stop offset="1" stop-color="#6E6E6F"/>
 </linearGradient>
 <path d="M11.02,41.63c-1,0-1.812-0.78-1.812-1.742v-2.025c0-0.961,0.813-1.742,1.812-1.742,1,0,1.812,0.781,1.812,1.743v2.025c0,0.97-0.81,1.75-1.81,1.75z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="11.02" x2="11.02" y1="36.71" y2="41.02">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<stop offset="0" stop-color="#B3C77D"/>
+<stop offset="0.73" stop-color="#3C743A"/>
+<stop offset="1" stop-color="#235138"/>
 </linearGradient>
 <path d="M12.2,39.89c0,0.625-0.526,1.131-1.175,1.131s-1.175-0.506-1.175-1.131v-2.025c0-0.623,0.526-1.129,1.175-1.129s1.175,0.506,1.175,1.13v2.027z" fill="url(#SVGID_14)"/>
 <path d="M26.98,42.24c-1.374,0-2.493-1.057-2.493-2.355v-2.025c0-1.297,1.119-2.354,2.493-2.354h-0.089c1.375,0,2.494,1.057,2.494,2.354v2.025c0,1.298-1.119,2.354-2.493,2.354h0.091z" fill="url(#SVGID_12)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M26.98,41.63c-1.018,0-1.845-0.78-1.845-1.742v-2.025c0-0.961,0.828-1.742,1.845-1.742h-0.089c1.018,0,1.845,0.781,1.845,1.742v2.025c0,0.961-0.828,1.742-1.845,1.742h0.081z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="26.94" x2="26.94" y1="36.71" y2="41.02">
-<stop offset="0" stop-color="#FFC142"/>
-<stop offset="0.75" stop-color="#CF4E18"/>
-<stop offset="1" stop-color="#B52100"/>
+<stop offset="0" stop-color="#C6B17B"/>
+<stop offset="0.75" stop-color="#98604F"/>
+<stop offset="1" stop-color="#7F3736"/>
 </linearGradient>
 <path d="M28.09,39.89c0,0.625-0.536,1.131-1.196,1.131h0.089c-0.66,0-1.196-0.506-1.196-1.131v-2.025c0-0.624,0.536-1.13,1.196-1.13h-0.089c0.66,0,1.196,0.506,1.196,1.13v2.027z" fill="url(#SVGID_17)"/>
 <rect fill="#020202" fill-opacity="0.2" height="37.96" stroke-opacity="0.2" width="1.225" x="21.43" y="7.346"/>
 <rect fill="#020202" fill-opacity="0.1" height="37.96" stroke-opacity="0.1" width="2.449" x="22.04" y="7.346"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18" x1="37.04" x2="37.04" y1="7.35" y2="51.31">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.07" stop-color="#D1D7D9"/>
-<stop offset="0.26" stop-color="#BDC2C4"/>
-<stop offset="0.66" stop-color="#949DA1"/>
-<stop offset="0.96" stop-color="#ADB3B5"/>
-<stop offset="1" stop-color="#595C5E"/>
+<stop offset="0" stop-color="#D3D7D5"/>
+<stop offset="0.07" stop-color="#D3D7D5"/>
+<stop offset="0.26" stop-color="#BFC2C1"/>
+<stop offset="0.66" stop-color="#989D9D"/>
+<stop offset="0.96" stop-color="#AFB3B2"/>
+<stop offset="1" stop-color="#5B5B5D"/>
 </linearGradient>
 <path d="M51.42,48.98c0,1.352-1.097,2.448-2.448,2.448h-23.87c-1.352,0-2.449-1.097-2.449-2.448v-39.18c0-1.353,1.097-2.449,2.449-2.449h23.88c1.352,0,2.448,1.097,2.448,2.449v39.18z" fill="url(#SVGID_18)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19" x1="37.04" x2="37.04" y1="7.35" y2="50.55">
-<stop offset="0" stop-color="#E4EBED"/>
-<stop offset="0.07" stop-color="#E4EBED"/>
-<stop offset="0.26" stop-color="#D6DCDE"/>
-<stop offset="0.66" stop-color="#B2BEC2"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<stop offset="0" stop-color="#E7EAE8"/>
+<stop offset="0.07" stop-color="#E7EAE8"/>
+<stop offset="0.26" stop-color="#D8DCDA"/>
+<stop offset="0.66" stop-color="#B7BDBB"/>
+<stop offset="1" stop-color="#AFB3B2"/>
 </linearGradient>
 <path d="M48.98,7.346h-23.88c-1.352,0-2.449,1.097-2.449,2.449v39.18c0,0.652,0.26,1.242,0.677,1.683-0.038-0.147-0.065-0.3-0.065-0.459v-40.4c0-1.013,0.824-1.837,1.836-1.837h23.88c1.012,0,1.836,0.824,1.836,1.837v40.4c0,0.159-0.027,0.312-0.064,0.459,0.416-0.44,0.677-1.03,0.677-1.683v-39.18c-0.02-1.352-1.11-2.449-2.46-2.449z" fill="url(#SVGID_19)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20" x1="37.04" x2="37.04" y1="10.45" y2="39.8">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<stop offset="0" stop-color="#B8BBBA"/>
+<stop offset="1" stop-color="#F4FBF6"/>
 </linearGradient>
 <rect fill="url(#SVGID_20)" fill-opacity="0.6" height="29.39" stroke-opacity="0.6" width="25.1" x="24.49" y="10.41"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21" x1="37.04" x2="37.04" y1="11.06" y2="39.18">
@@ -127,71 +127,71 @@
 </linearGradient>
 <rect fill="url(#SVGID_21)" height="28.16" width="23.88" x="25.1" y="11.02"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22" x1="37.04" x2="37.04" y1="11.67" y2="38.57">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="0.39" stop-color="#2D9BD2"/>
-<stop offset="0.89" stop-color="#1347BA"/>
-<stop offset="1" stop-color="#1347BA"/>
+<stop offset="0" stop-color="#70B4B6"/>
+<stop offset="0.39" stop-color="#5F8BA1"/>
+<stop offset="0.89" stop-color="#455188"/>
+<stop offset="1" stop-color="#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_22)" height="26.94" width="22.65" x="25.71" y="11.63"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23" x1="37.04" x2="37.04" y1="12.12" y2="22.49">
-<stop offset="0" stop-color="#85EFFF"/>
-<stop offset="1" stop-color="#3BA1D9"/>
+<stop offset="0" stop-color="#AADAC6"/>
+<stop offset="1" stop-color="#6A99AA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_23)" points="48.36,20.82,25.71,23.26,25.71,12.24,48.36,12.24"/>
-<rect fill="#9FE4FF" height="0.612" width="22.65" x="25.71" y="11.63"/>
+<rect fill="#BCE2D2" height="0.612" width="22.65" x="25.71" y="11.63"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24" x1="36.94" x2="36.94" y1="40.43" y2="49.53">
-<stop offset="0" stop-color="#B6BBBD"/>
+<stop offset="0" stop-color="#B8BBBA"/>
 <stop offset="1" stop-color="#FFFFFF"/>
 </linearGradient>
 <path d="M34.73,49.59c-1.312,0-2.379-1.057-2.379-2.354v-4.48c0-1.299,1.067-2.355,2.379-2.355h4.426c1.313,0,2.379,1.057,2.379,2.355v4.475c0,1.297-1.066,2.354-2.379,2.354h-4.43z" fill="url(#SVGID_24)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M34.73,48.98c-0.972,0-1.763-0.781-1.763-1.742v-4.48c0-0.961,0.791-1.743,1.763-1.743h4.433c0.973,0,1.764,0.781,1.764,1.743v4.475c0,0.96-0.791,1.742-1.764,1.742h-4.432z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25" x1="36.94" x2="36.94" y1="41.6" y2="48.37">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="0.7" stop-color="#58595B"/>
-<stop offset="1" stop-color="#808184"/>
+<stop offset="0" stop-color="#A8A9AA"/>
+<stop offset="0.7" stop-color="#59595A"/>
+<stop offset="1" stop-color="#818283"/>
 </linearGradient>
 <path d="M40.31,47.23c0,0.623-0.514,1.129-1.146,1.129h-4.442c-0.633,0-1.146-0.506-1.146-1.129v-4.47c0-0.625,0.514-1.131,1.146-1.131h4.442c0.632,0,1.146,0.506,1.146,1.131v4.474z" fill="url(#SVGID_25)"/>
 <path d="M36.02,47.14c-0.676,0-1.225-0.549-1.225-1.225v-1.837c0-0.676,0.549-1.225,1.225-1.225h1.837c0.675,0,1.224,0.549,1.224,1.225v1.837c0,0.676-0.549,1.225-1.224,1.225h-1.835z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26" x1="36.94" x2="36.94" y1="43.45" y2="46.53">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.07" stop-color="#D1D7D9"/>
-<stop offset="0.26" stop-color="#BDC2C4"/>
-<stop offset="0.66" stop-color="#949DA1"/>
-<stop offset="0.96" stop-color="#ADB3B5"/>
-<stop offset="1" stop-color="#595C5E"/>
+<stop offset="0" stop-color="#D3D7D5"/>
+<stop offset="0.07" stop-color="#D3D7D5"/>
+<stop offset="0.26" stop-color="#BFC2C1"/>
+<stop offset="0.66" stop-color="#989D9D"/>
+<stop offset="0.96" stop-color="#AFB3B2"/>
+<stop offset="1" stop-color="#5B5B5D"/>
 </linearGradient>
 <path d="M36.02,46.53c-0.336,0-0.612-0.275-0.612-0.612v-1.837c0-0.336,0.276-0.611,0.612-0.611h1.837c0.337,0,0.612,0.275,0.612,0.611v1.837c0,0.337-0.275,0.612-0.612,0.612h-1.835z" fill="url(#SVGID_26)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27" x1="27.2" x2="27.2" y1="40.98" y2="48.38">
-<stop offset="0" stop-color="#B6BBBD"/>
-<stop offset="1" stop-color="#F0FBFF"/>
+<stop offset="0" stop-color="#B8BBBA"/>
+<stop offset="1" stop-color="#F4FBF6"/>
 </linearGradient>
 <path d="M26.84,48.36c-1.298,0-2.355-1.057-2.355-2.354v-2.639c0-1.297,1.057-2.354,2.355-2.354h0.706c1.298,0,2.354,1.057,2.354,2.354v2.638c0,1.297-1.057,2.354-2.354,2.354h-0.707z" fill="url(#SVGID_27)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28" x1="27.2" x2="27.2" y1="41.6" y2="47.76">
-<stop offset="0" stop-color="#231F20"/>
-<stop offset="1" stop-color="#6D6E70"/>
+<stop offset="0" stop-color="#222021"/>
+<stop offset="1" stop-color="#6E6E6F"/>
 </linearGradient>
 <path d="M26.84,47.75c-0.961,0-1.743-0.781-1.743-1.742v-2.639c0-0.961,0.781-1.742,1.743-1.742h0.706c0.961,0,1.743,0.781,1.743,1.743v2.638c0,0.961-0.782,1.742-1.743,1.742h-0.707z" fill="url(#SVGID_28)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29" x1="27.2" x2="27.2" y1="42.22" y2="47.15">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<stop offset="0" stop-color="#B3C77D"/>
+<stop offset="0.73" stop-color="#3C743A"/>
+<stop offset="1" stop-color="#235138"/>
 </linearGradient>
 <path d="M28.68,46.01c0,0.624-0.506,1.13-1.13,1.13h-0.706c-0.624,0-1.13-0.506-1.13-1.13v-2.639c0-0.623,0.506-1.129,1.13-1.129h0.706c0.624,0,1.13,0.506,1.13,1.13v2.64z" fill="url(#SVGID_29)"/>
 <path d="M46,48.36c-1.299,0-2.355-1.057-2.355-2.354v-2.639c0-1.298,1.057-2.354,2.355-2.354h0.706c1.298,0,2.354,1.057,2.354,2.354v2.639c0,1.297-1.057,2.354-2.354,2.354h-0.71z" fill="url(#SVGID_27)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M46,47.75c-0.961,0-1.742-0.781-1.742-1.742v-2.639c0-0.961,0.78-1.742,1.742-1.742h0.706c0.96,0,1.742,0.781,1.742,1.742v2.639c0,0.96-0.781,1.742-1.742,1.742h-0.71z" fill="url(#SVGID_28)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32" x1="46.35" x2="46.35" y1="42.22" y2="47.15">
-<stop offset="0" stop-color="#FFC142"/>
-<stop offset="0.75" stop-color="#CF4E18"/>
-<stop offset="1" stop-color="#B52100"/>
+<stop offset="0" stop-color="#C6B17B"/>
+<stop offset="0.75" stop-color="#98604F"/>
+<stop offset="1" stop-color="#7F3736"/>
 </linearGradient>
 <path d="M47.84,46.01c0,0.624-0.506,1.13-1.13,1.13h-0.71c-0.625,0-1.131-0.506-1.131-1.13v-2.639c0-0.624,0.506-1.13,1.131-1.13h0.706c0.624,0,1.13,0.506,1.13,1.13v2.64z" fill="url(#SVGID_32)"/>
 <rect fill="none" height="60" width="60"/>
 <polygon fill-opacity="0.1" points="24.28,35.94,16.11,35.94,16.11,26.48,24.28,26.48,24.28,20.36,35.76,31.51,24.28,41.94" stroke-opacity="0.1"/>
 <polygon fill-opacity="0.2" points="24.89,35.32,16.72,35.32,16.73,27.09,24.89,27.09,24.89,21.8,34.88,31.51,24.9,40.5" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33" x1="25.67" x2="25.67" y1="22.7" y2="38.5">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.73" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
+<stop offset="0" stop-color="#B3C77D"/>
+<stop offset="0.73" stop-color="#3C743A"/>
+<stop offset="1" stop-color="#235138"/>
 </linearGradient>
 <polygon fill="url(#SVGID_33)" points="25.51,39.07,34,30.89,25.5,22.64,25.5,27.09,17.34,27.09,17.34,34.71,25.5,34.71"/>
 <polygon fill="#FFFFFF" points="34,30.89,25.5,22.64,25.5,23.25,33.68,31.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_default_server.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_default_server.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_default_server.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,17 +3,17 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.3877" x2="29.3877" y1="52.6611" y2="57.6064">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+<stop offset="0.7091" style="stop-color:#6A6C6E"/>
+<stop offset="1" style="stop-color:#AAAFAE"/>
 </linearGradient>
 <path d="M52.041,56.938c0,0.339-0.274,0.612-0.612,0.612H7.347c-0.338,0-0.612-0.273-0.612-0.612v-3.673  c0-0.339,0.274-0.612,0.612-0.612h44.082c0.338,0,0.612,0.273,0.612,0.612V56.938z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="10.4082" x2="49.5918" y1="22.6533" y2="22.6533">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+<stop offset="0" style="stop-color:#B7BCBA"/>
+<stop offset="0.2667" style="stop-color:#E7EBE8"/>
+<stop offset="0.703" style="stop-color:#919595"/>
+<stop offset="1" style="stop-color:#B9BDBC"/>
 </linearGradient>
 <path d="M48.113,2.449H11.889c-0.815,0-1.48,0.668-1.48,1.485v38.923h39.184V3.935  C49.592,3.117,48.926,2.449,48.113,2.449z" fill="url(#SVGID_2_)"/>
 <path d="M48.113,2.449c0.813,0,1.479,0.668,1.479,1.485v38.923H10.408V3.935c0-0.817,0.666-1.485,1.48-1.485H48.113   M48.113,3.626H11.889c-0.173,0-0.318,0.142-0.318,0.309v37.747H48.43V3.935C48.43,3.768,48.285,3.626,48.113,3.626L48.113,3.626z" fill="#FFFFFF"/>
@@ -34,8 +34,8 @@
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="4.706" width="27.939" x="16.031" y="8.534"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="20.0767" x2="20.0767" y1="9.5928" y2="12.0647">
-<stop offset="0" style="stop-color:#17BFFF"/>
-<stop offset="1" style="stop-color:#0D5186"/>
+<stop offset="0" style="stop-color:#5DA9B9"/>
+<stop offset="1" style="stop-color:#313C62"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="2.354" width="5.848" x="17.153" y="9.711"/>
 <rect fill="#FFFFFF" fill-opacity="0.25" height="1.176" stroke-opacity="0.25" width="5.848" x="17.153" y="9.711"/>
@@ -160,15 +160,15 @@
 <rect fill="none" height="30" width="30"/>
 <polygon fill-opacity="0.35" points="0.175,15.934 5.351,10.756 11.164,16.568 24.647,3.086 29.824,8.264 11.154,26.914 " stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="3.0845" y2="22.1505">
-<stop offset="0" style="stop-color:#E3FFA3"/>
-<stop offset="0.7758" style="stop-color:#73B542"/>
-<stop offset="1" style="stop-color:#AFDD76"/>
+<stop offset="0" style="stop-color:#DCE3BF"/>
+<stop offset="0.7758" style="stop-color:#769365"/>
+<stop offset="1" style="stop-color:#AFBE95"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="28.41,8.264 24.647,4.5 11.164,17.982 5.351,12.17 1.589,15.934 11.154,25.5 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.999" x2="14.999" y1="4.6216" y2="21.2281">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="2.943,15.934 5.351,13.524 11.164,19.337 24.647,5.854 27.055,8.263 11.154,24.146 "/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_lock.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_lock.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_lock.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,25 +4,25 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07  c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11  c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304  v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001  z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" fill-opacity="0.6" height="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
@@ -31,80 +31,80 @@
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+<stop offset="0" style="stop-color:#AADAC6"/>
+<stop offset="1" style="stop-color:#6A99AA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
-<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
+<rect fill="#BCE2D2" height="0.767" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+<stop offset="1" style="stop-color:#D3D7D5"/>
 </linearGradient>
 <path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785  c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+<stop offset="0" style="stop-color:#6F7172"/>
+<stop offset="1" style="stop-color:#BFC2C1"/>
 </linearGradient>
 <path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51  c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951  h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183  h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606  c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
 <path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534  h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303  c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307  c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+<stop offset="0" style="stop-color:#C6B17B"/>
+<stop offset="0.7455" style="stop-color:#98604F"/>
+<stop offset="1" style="stop-color:#7F3736"/>
 </linearGradient>
 <path d="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307  c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -134,19 +134,19 @@
 </linearGradient>
 <path d="M6.945,14.102V9.979c0.063-4.44,3.731-8.055,8.177-8.055S23.234,5.542,23.3,9.99v3.541h-1.231V9.979  c-0.08-3.767-3.196-6.824-6.945-6.824c-3.75,0-6.865,3.053-6.946,6.805v4.142H6.945z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="271.1289" x2="293.832" y1="-382.0376" y2="-382.0376">
-<stop offset="0" style="stop-color:#ED8C0D"/>
-<stop offset="0.24" style="stop-color:#FFE692"/>
-<stop offset="0.75" style="stop-color:#ED8C0D"/>
-<stop offset="0.8667" style="stop-color:#FFB81F"/>
-<stop offset="1" style="stop-color:#ED8C0D"/>
+<stop offset="0" style="stop-color:#AA8250"/>
+<stop offset="0.24" style="stop-color:#DED7B3"/>
+<stop offset="0.75" style="stop-color:#AA8250"/>
+<stop offset="0.8667" style="stop-color:#BCA162"/>
+<stop offset="1" style="stop-color:#AA8250"/>
 </linearGradient>
 <path d="M26.352,28.29c0,0.392-0.317,0.71-0.709,0.71H4.358c-0.392,0-0.709-0.318-0.709-0.71V13.747  c0-0.392,0.317-0.711,0.709-0.711h21.283c0.393,0,0.709,0.319,0.709,0.711V28.29H26.352z" fill="url(#SVGID_4__)"/>
 <path d="M25.643,13.036H4.358c-0.392,0-0.709,0.319-0.709,0.711v0.709  c0-0.392,0.317-0.709,0.709-0.709h21.283c0.393,0,0.709,0.317,0.709,0.709v-0.709C26.352,13.355,26.033,13.036,25.643,13.036z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M25.643,29H4.358c-0.392,0-0.709-0.318-0.709-0.71v-0.709  c0,0.392,0.317,0.709,0.709,0.709h21.283c0.393,0,0.709-0.317,0.709-0.709v0.709C26.352,28.682,26.033,29,25.643,29z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<path d="M15,25.82c-0.689,0-1.25-0.562-1.25-1.25v-1.838  c-0.769-0.441-1.25-1.256-1.25-2.162c0-1.379,1.122-2.5,2.5-2.5c1.379,0,2.5,1.121,2.5,2.5c0,0.904-0.48,1.721-1.25,2.162v1.838  C16.25,25.26,15.689,25.82,15,25.82L15,25.82z" fill="#FFE591" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M15,25.82c-0.689,0-1.25-0.562-1.25-1.25v-1.838  c-0.769-0.441-1.25-1.256-1.25-2.162c0-1.379,1.122-2.5,2.5-2.5c1.379,0,2.5,1.121,2.5,2.5c0,0.904-0.48,1.721-1.25,2.162v1.838  C16.25,25.26,15.689,25.82,15,25.82L15,25.82z" fill="#DED7B2" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="282.4805" x2="282.4805" y1="-386.0986" y2="-379.7186">
-<stop offset="0" style="stop-color:#A67C52"/>
-<stop offset="1" style="stop-color:#603813"/>
+<stop offset="0" style="stop-color:#8D7B6B"/>
+<stop offset="1" style="stop-color:#492C2A"/>
 </linearGradient>
 <path d="M17,20.57c0-1.104-0.896-2-2-2c-1.104,0-2,0.896-2,2c0,0.839,0.518,1.555,1.25,1.852v2.148  c0,0.414,0.336,0.75,0.75,0.75s0.75-0.336,0.75-0.75v-2.148C16.482,22.125,17,21.409,17,20.57z" fill="url(#SVGID_5__)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_update.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_update.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_update.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,25 +4,25 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07  c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11  c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304  v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001  z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" fill-opacity="0.6" height="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
@@ -31,80 +31,80 @@
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+<stop offset="0" style="stop-color:#AADAC6"/>
+<stop offset="1" style="stop-color:#6A99AA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
-<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
+<rect fill="#BCE2D2" height="0.767" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+<stop offset="1" style="stop-color:#D3D7D5"/>
 </linearGradient>
 <path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785  c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+<stop offset="0" style="stop-color:#6F7172"/>
+<stop offset="1" style="stop-color:#BFC2C1"/>
 </linearGradient>
 <path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51  c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951  h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183  h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606  c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
 <path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534  h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303  c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307  c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+<stop offset="0" style="stop-color:#C6B17B"/>
+<stop offset="0.7455" style="stop-color:#98604F"/>
+<stop offset="1" style="stop-color:#7F3736"/>
 </linearGradient>
 <path d="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307  c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -113,18 +113,18 @@
 <polygon fill="none" points="30.096,0 0.096,0 0.096,14.833 0,14.833 0.096,14.933 0.096,30 14.601,30 15.021,30.438 15.447,30   30.096,30 30.096,14.963 30.215,14.841 30.096,14.841 "/>
 <polygon fill-opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841   15.021,30.438 " stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2176.5142" x2="-2176.5142" y1="2984.646" y2="2957.3247">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="2.846,15.859 15.025,28.575 27.398,15.845 20.732,15.843 20.727,1.292 9.375,1.291   9.375,15.859 "/>
 <line fill="none" x1="20.727" x2="9.375" y1="1.297" y2="1.296"/>
-<polygon fill="#E7FFB9" points="9.375,1 20.729,1.001 20.727,1.593 9.375,1.592 "/>
-<polygon fill="#E7FFB9" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
-<polygon fill="#E7FFB9" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
+<polygon fill="#E4EACE" points="9.375,1 20.729,1.001 20.727,1.593 9.375,1.592 "/>
+<polygon fill="#E4EACE" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
+<polygon fill="#E4EACE" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2165.6621" x2="-2187.9482" y1="2963.2173" y2="2963.2173">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="27.016,15.844 15.025,28.15 3.172,15.829 2.348,15.83 15.025,29 27.842,15.844 "/>
 <rect fill="none" height="30" width="30" x="0.096"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialer.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialer.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialer.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,8 +4,8 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="17.17" x2="17.17" y1="5.67" y2="54.05">
-<stop offset="0" stop-color="#96E9FA"/>
-<stop offset="1" stop-color="#0087D9"/>
+<stop offset="0" stop-color="#B4DCCA"/>
+<stop offset="1" stop-color="#416D98"/>
 </linearGradient>
 <rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="11.96" y="5.674"/>
 <rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="24.7" y="5.674"/>
@@ -18,28 +18,28 @@
 <rect fill="url(#SVGID_1)" height="10.43" width="10.42" x="24.7" y="43.9"/>
 <rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="37.61" y="30.99"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="17.17" x2="17.17" y1="5.67" y2="15.93">
-<stop offset="0" stop-color="#73E3FF"/>
-<stop offset="1" stop-color="#1347BA"/>
+<stop offset="0" stop-color="#9DD5C4"/>
+<stop offset="1" stop-color="#455188"/>
 </linearGradient>
 <path d="M21.16,6.898v7.976h-7.975v-7.972h7.981m1.229-1.224h-10.43v10.42h10.42v-10.43z" fill="url(#SVGID_11)"/>
 <path d="M33.9,6.898v7.976h-7.97v-7.972h7.975m1.225-1.224h-10.42v10.42h10.42v-10.43z" fill="url(#SVGID_11)"/>
 <path d="M46.81,6.898v7.976h-7.976v-7.972h7.98m1.22-1.224h-10.42v10.42h10.42v-10.43z" fill="url(#SVGID_11)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="17.17" x2="17.17" y1="18.38" y2="28.63">
-<stop offset="0" stop-color="#73E3FF"/>
-<stop offset="1" stop-color="#1347BA"/>
+<stop offset="0" stop-color="#9DD5C4"/>
+<stop offset="1" stop-color="#455188"/>
 </linearGradient>
 <path d="M21.16,19.48v7.977h-7.975v-7.977h7.981m1.229-1.23h-10.43v10.42h10.42v-10.43z" fill="url(#SVGID_14)"/>
 <path d="M33.9,19.48v7.977h-7.97v-7.977h7.975m1.225-1.23h-10.42v10.42h10.42v-10.43z" fill="url(#SVGID_14)"/>
 <path d="M46.81,19.48v7.977h-7.976v-7.977h7.98m1.22-1.23h-10.42v10.42h10.42v-10.43z" fill="url(#SVGID_14)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="17.17" x2="17.17" y1="31.39" y2="41.49">
-<stop offset="0" stop-color="#73E3FF"/>
-<stop offset="1" stop-color="#1347BA"/>
+<stop offset="0" stop-color="#9DD5C4"/>
+<stop offset="1" stop-color="#455188"/>
 </linearGradient>
 <path d="M21.16,32.22v7.975h-7.975v-7.975h7.981m1.229-1.23h-10.43v10.42h10.42v-10.42z" fill="url(#SVGID_17)"/>
 <path d="M33.9,32.22v7.975h-7.97v-7.975h7.975m1.225-1.23h-10.42v10.42h10.42v-10.42z" fill="url(#SVGID_17)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19" x1="29.92" x2="29.92" y1="43.94" y2="54.04">
-<stop offset="0" stop-color="#73E3FF"/>
-<stop offset="1" stop-color="#1347BA"/>
+<stop offset="0" stop-color="#9DD5C4"/>
+<stop offset="1" stop-color="#455188"/>
 </linearGradient>
 <path d="M33.9,45.12v7.978h-7.97v-7.978h7.975m1.225-1.22h-10.42v10.43h10.42v-10.43z" fill="url(#SVGID_19)"/>
 <path d="M46.81,32.22v7.975h-7.976v-7.975h7.98m1.22-1.23h-10.42v10.42h10.42v-10.42z" fill="url(#SVGID_17)"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialled_voice_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialled_voice_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialled_voice_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -43,20 +43,20 @@
 <polygon fill="none" points="30.152,0.436 15.607,0.436 15.186,0 14.762,0.436 0.152,0.436 0.152,15.436 0,15.592 0.152,15.592   0.152,30.436 30.152,30.436 30.152,15.594 30.295,15.594 30.152,15.447 "/>
 <polygon fill-opacity="0.35" points="8.484,30.434 8.48,15.594 0.4,15.594 0,15.592 15.186,0 30.295,15.594 21.907,15.594 21.915,30.436   " stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8438)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2176.5103" x2="-2176.5103" y1="2985.5796" y2="2956.2766">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#30A4D5"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#6292A3"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="27.438,14.594 15.184,1.861 2.814,14.594 9.48,14.594 9.484,29.142 20.91,29.145   20.907,14.594 "/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8438)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2176.4844" x2="-2176.4844" y1="2984.1128" y2="2970.6938">
-<stop offset="0" style="stop-color:#B3FCFF"/>
-<stop offset="0.4182" style="stop-color:#B3FCFF"/>
-<stop offset="1" style="stop-color:#5FBAD8"/>
+<stop offset="0" style="stop-color:#CAE8D4"/>
+<stop offset="0.4182" style="stop-color:#CAE8D4"/>
+<stop offset="1" style="stop-color:#83B4B4"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="3.195,14.592 15.182,2.286 27.108,14.594 27.934,14.594 15.184,1.436 2.37,14.592 "/>
 <line fill="none" x1="9.484" x2="20.91" y1="29.138" y2="29.14"/>
-<polygon fill="#33AEDB" points="20.912,29.436 9.484,29.434 9.484,28.842 20.912,28.844 "/>
+<polygon fill="#659BA9" points="20.912,29.436 9.484,29.434 9.484,28.842 20.912,28.844 "/>
 <rect fill="none" height="30" width="30" x="0.152" y="0.436"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dictionary.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dictionary.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dictionary.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -10,13 +10,13 @@
 <rect fill="#404041" fill-opacity="0.2" height="52.435" stroke-opacity="0.2" width="18" x="34.501" y="3.782"/>
 <rect fill="#404041" fill-opacity="0.2" height="52.435" stroke-opacity="0.2" width="18" x="33.718" y="3.782"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="28.2397" x2="28.2397" y1="3" y2="56.75">
-<stop offset="0" style="stop-color:#59C2FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#8BCDCA"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M50.937,55.435C50.937,56.3,50.235,57,49.37,57H7.109c-0.863,0-1.565-0.7-1.565-1.565V4.564  C5.544,3.701,6.246,3,7.109,3H49.37c0.865,0,1.566,0.701,1.566,1.564V55.435z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30.979" x2="30.979" y1="2.7393" y2="70.9575">
-<stop offset="0" style="stop-color:#73E3FF"/>
-<stop offset="1" style="stop-color:#0B2C73"/>
+<stop offset="0" style="stop-color:#9DD5C4"/>
+<stop offset="1" style="stop-color:#2B2A54"/>
 </linearGradient>
 <path d="M49.37,3.782c0.434,0,0.783,0.351,0.783,0.782v50.87c0,0.433-0.35,0.782-0.783,0.782H11.805V3.782  H49.37 M49.37,3H11.022v54H49.37c0.865,0,1.566-0.7,1.566-1.565V4.564C50.937,3.701,50.235,3,49.37,3L49.37,3z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="8.2832" x2="8.2832" y1="2.7393" y2="57.7841">
@@ -31,11 +31,11 @@
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="54" width="0.782" x="9.457" y="3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="17.0967" x2="42.3057" y1="29.3286" y2="29.3286">
-<stop offset="0" style="stop-color:#14588C"/>
-<stop offset="0.0434" style="stop-color:#13588F"/>
-<stop offset="0.3599" style="stop-color:#0D5AA3"/>
-<stop offset="0.6785" style="stop-color:#095CAF"/>
-<stop offset="1" style="stop-color:#085CB3"/>
+<stop offset="0" style="stop-color:#384568"/>
+<stop offset="0.0434" style="stop-color:#38466A"/>
+<stop offset="0.3599" style="stop-color:#3A4B76"/>
+<stop offset="0.6785" style="stop-color:#3B4E7D"/>
+<stop offset="1" style="stop-color:#3B4F80"/>
 </linearGradient>
 <path d="M17.097,21.179h11.284v-6.39h2.521v6.39h11.403v13.367h-2.402v-1.582h-9.001v10.904h-2.521V32.964  h-8.88v1.582h-2.404V21.179z M19.501,30.795h8.88v-7.446h-8.88V30.795z M39.903,23.349h-9.001v7.446h9.001V23.349z" fill="url(#SVGID_6_)"/>
 <path d="M18.096,22.18h11.286v-6.392h2.521v6.392h11.402v13.367h-2.402v-1.584h-9v10.906h-2.521V33.963h-8.883v1.584  h-2.403V22.18z M20.499,31.794h8.883v-7.445h-8.883V31.794z M40.903,24.349h-9v7.445h9V24.349z" fill="#FFFFFF"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,21 +5,21 @@
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="312.4795" x2="312.4795" y1="-347.8892" y2="-403.8838">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.25" style="stop-color:#4F88BD"/>
-<stop offset="0.73" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+<stop offset="0.25" style="stop-color:#708A9C"/>
+<stop offset="0.73" style="stop-color:#314172"/>
+<stop offset="1" style="stop-color:#91CBCE"/>
 </linearGradient>
 <path d="M30,57.997C14.562,57.997,2,45.439,2,30C2,14.564,14.562,2.002,30,2.002  c15.437,0,28,12.561,28,27.998C58,45.439,45.437,57.997,30,57.997L30,57.997z" fill="url(#SVGID_1_)"/>
 <radialGradient cx="312.2188" cy="-353.9521" gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="51.3861">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.15" style="stop-color:#96E9FA"/>
-<stop offset="0.75" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#B4DCCA"/>
+<stop offset="0.15" style="stop-color:#B4DCCA"/>
+<stop offset="0.75" style="stop-color:#3D568F"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </radialGradient>
 <path d="M57.198,30c0,15.023-12.18,27.198-27.198,27.198C14.979,57.198,2.802,45.023,2.802,30  C2.802,14.982,14.979,2.802,30,2.802C45.019,2.802,57.198,14.982,57.198,30z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="312.4805" x2="312.4805" y1="-357.0225" y2="-394.2217">
-<stop offset="0" style="stop-color:#0B81FA"/>
-<stop offset="1" style="stop-color:#47DAFA"/>
+<stop offset="0" style="stop-color:#5385B2"/>
+<stop offset="1" style="stop-color:#7DC4BD"/>
 </linearGradient>
 <path d="M29.998,48.545c-5.093,0-9.503-1.832-13.104-5.451c-3.609-3.623-5.436-8.038-5.436-13.12  c0-5.058,1.832-9.457,5.446-13.076c3.621-3.612,8.026-5.441,13.093-5.441c5.093,0,9.503,1.827,13.109,5.43  c3.604,3.604,5.436,8.005,5.436,13.087c0,2.963-0.612,5.579-1.812,7.774c-1.537,2.821-3.797,4.262-6.723,4.262  c-2.53,0-4.466-1.123-5.768-3.338c-1.409,1.153-3.133,1.736-5.143,1.736c-2.812,0-5.106-1.098-6.817-3.253  c-1.549-1.952-2.334-4.358-2.334-7.156c0-2.812,0.789-5.208,2.345-7.125c1.679-2.096,3.973-3.162,6.806-3.162  c1.447,0,2.702,0.278,3.753,0.827V20.13h5.344v13.714c0,2.966,1.27,2.966,1.813,2.966c0.39,0,1.587,0,2.543-2.438  c0.522-1.359,0.789-2.841,0.789-4.397c0-3.666-1.279-6.715-3.925-9.331c-2.603-2.575-5.772-3.881-9.419-3.881  c-3.71,0-6.776,1.26-9.374,3.85c-2.595,2.592-3.858,5.655-3.858,9.36c0,3.712,1.271,6.78,3.876,9.384  c2.57,2.581,5.713,3.884,9.355,3.884h0.798v5.305H29.998L29.998,48.545z M29.1,24.964c-1.16,0-2.03,0.509-2.665,1.547  c-0.594,0.959-0.894,2.133-0.894,3.488c0,4.619,2.029,5.152,3.558,5.152c1.513,0,3.529-0.549,3.529-5.321  C32.629,25.467,30.613,24.964,29.1,24.964L29.1,24.964z" fill="url(#SVGID_3_)"/>
 <path d="M47.741,29.974c0,2.843-0.572,5.306-1.715,7.387c-1.39,2.563-3.396,3.846-6.018,3.846  c-2.552,0-4.395-1.282-5.543-3.846c-1.383,1.496-3.175,2.247-5.366,2.247c-2.57,0-4.629-0.982-6.188-2.95  c-1.44-1.818-2.164-4.029-2.164-6.659c0-2.641,0.726-4.844,2.164-6.617c1.539-1.917,3.601-2.871,6.188-2.871  c1.929,0,3.448,0.523,4.554,1.577v-1.156h3.741v12.913c0,2.511,0.868,3.767,2.613,3.767c1.424,0,2.519-0.985,3.287-2.947  c0.562-1.462,0.847-3.022,0.847-4.691c0-3.859-1.388-7.156-4.164-9.899c-2.771-2.744-6.101-4.111-9.982-4.111  c-3.896,0-7.209,1.36-9.939,4.083c-2.726,2.726-4.091,6.03-4.091,9.928c0,3.892,1.366,7.212,4.109,9.95  c2.733,2.745,6.045,4.118,9.922,4.118v3.703c-4.892,0-9.074-1.74-12.538-5.216c-3.468-3.483-5.203-7.674-5.203-12.555  c0-4.87,1.738-9.034,5.214-12.512c3.481-3.467,7.65-5.205,12.527-5.205c4.892,0,9.075,1.728,12.542,5.199  C46.006,20.913,47.741,25.087,47.741,29.974z M33.43,29.832c0-3.78-1.444-5.665-4.33-5.665c-1.443,0-2.563,0.64-3.346,1.932  c-0.68,1.087-1.01,2.386-1.01,3.901c0,3.971,1.449,5.954,4.354,5.954C31.985,35.954,33.43,33.915,33.43,29.832z" fill="#FFFFFF"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_group.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_group.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_group.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,21 +5,21 @@
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="312.4795" x2="312.4795" y1="-347.8892" y2="-403.8838">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.25" style="stop-color:#4F88BD"/>
-<stop offset="0.73" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+<stop offset="0.25" style="stop-color:#708A9C"/>
+<stop offset="0.73" style="stop-color:#314172"/>
+<stop offset="1" style="stop-color:#91CBCE"/>
 </linearGradient>
 <path d="M30,57.997C14.562,57.997,2,45.439,2,30C2,14.564,14.562,2.002,30,2.002  c15.437,0,28,12.561,28,27.998C58,45.439,45.437,57.997,30,57.997L30,57.997z" fill="url(#SVGID_1_)"/>
 <radialGradient cx="312.2188" cy="-353.9521" gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="51.3861">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.15" style="stop-color:#96E9FA"/>
-<stop offset="0.75" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#B4DCCA"/>
+<stop offset="0.15" style="stop-color:#B4DCCA"/>
+<stop offset="0.75" style="stop-color:#3D568F"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </radialGradient>
 <path d="M57.198,30c0,15.023-12.18,27.198-27.198,27.198C14.979,57.198,2.802,45.023,2.802,30  C2.802,14.982,14.979,2.802,30,2.802C45.019,2.802,57.198,14.982,57.198,30z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="312.4805" x2="312.4805" y1="-357.0225" y2="-394.2217">
-<stop offset="0" style="stop-color:#0B81FA"/>
-<stop offset="1" style="stop-color:#47DAFA"/>
+<stop offset="0" style="stop-color:#5385B2"/>
+<stop offset="1" style="stop-color:#7DC4BD"/>
 </linearGradient>
 <path d="M29.998,48.545c-5.093,0-9.503-1.832-13.104-5.451c-3.609-3.623-5.436-8.038-5.436-13.12  c0-5.058,1.832-9.457,5.446-13.076c3.621-3.612,8.026-5.441,13.093-5.441c5.093,0,9.503,1.827,13.109,5.43  c3.604,3.604,5.436,8.005,5.436,13.087c0,2.963-0.612,5.579-1.812,7.774c-1.537,2.821-3.797,4.262-6.723,4.262  c-2.53,0-4.466-1.123-5.768-3.338c-1.409,1.153-3.133,1.736-5.143,1.736c-2.812,0-5.106-1.098-6.817-3.253  c-1.549-1.952-2.334-4.358-2.334-7.156c0-2.812,0.789-5.208,2.345-7.125c1.679-2.096,3.973-3.162,6.806-3.162  c1.447,0,2.702,0.278,3.753,0.827V20.13h5.344v13.714c0,2.966,1.27,2.966,1.813,2.966c0.39,0,1.587,0,2.543-2.438  c0.522-1.359,0.789-2.841,0.789-4.397c0-3.666-1.279-6.715-3.925-9.331c-2.603-2.575-5.772-3.881-9.419-3.881  c-3.71,0-6.776,1.26-9.374,3.85c-2.595,2.592-3.858,5.655-3.858,9.36c0,3.712,1.271,6.78,3.876,9.384  c2.57,2.581,5.713,3.884,9.355,3.884h0.798v5.305H29.998L29.998,48.545z M29.1,24.964c-1.16,0-2.03,0.509-2.665,1.547  c-0.594,0.959-0.894,2.133-0.894,3.488c0,4.619,2.029,5.152,3.558,5.152c1.513,0,3.529-0.549,3.529-5.321  C32.629,25.467,30.613,24.964,29.1,24.964L29.1,24.964z" fill="url(#SVGID_3_)"/>
 <path d="M47.741,29.974c0,2.843-0.572,5.306-1.715,7.387c-1.39,2.563-3.396,3.846-6.018,3.846  c-2.552,0-4.395-1.282-5.543-3.846c-1.383,1.496-3.175,2.247-5.366,2.247c-2.57,0-4.629-0.982-6.188-2.95  c-1.44-1.818-2.164-4.029-2.164-6.659c0-2.641,0.726-4.844,2.164-6.617c1.539-1.917,3.601-2.871,6.188-2.871  c1.929,0,3.448,0.523,4.554,1.577v-1.156h3.741v12.913c0,2.511,0.868,3.767,2.613,3.767c1.424,0,2.519-0.985,3.287-2.947  c0.562-1.462,0.847-3.022,0.847-4.691c0-3.859-1.388-7.156-4.164-9.899c-2.771-2.744-6.101-4.111-9.982-4.111  c-3.896,0-7.209,1.36-9.939,4.083c-2.726,2.726-4.091,6.03-4.091,9.928c0,3.892,1.366,7.212,4.109,9.95  c2.733,2.745,6.045,4.118,9.922,4.118v3.703c-4.892,0-9.074-1.74-12.538-5.216c-3.468-3.483-5.203-7.674-5.203-12.555  c0-4.87,1.738-9.034,5.214-12.512c3.481-3.467,7.65-5.205,12.527-5.205c4.892,0,9.075,1.728,12.542,5.199  C46.006,20.913,47.741,25.087,47.741,29.974z M33.43,29.832c0-3.78-1.444-5.665-4.33-5.665c-1.443,0-2.563,0.64-3.346,1.932  c-0.68,1.087-1.01,2.386-1.01,3.901c0,3.971,1.449,5.954,4.354,5.954C31.985,35.954,33.43,33.915,33.43,29.832z" fill="#FFFFFF"/>
@@ -27,179 +27,179 @@
 <g transform="matrix(1 0 0 1 30 30)">
 <rect fill="none" height="30" width="30"/>
 <radialGradient cx="669.4" cy="-594.3" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="11.1">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.2" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<stop offset="0" stop-color="#DDC4B0"/>
+<stop offset="0.2" stop-color="#DDC4B0"/>
+<stop offset="0.96" stop-color="#A57665"/>
+<stop offset="1" stop-color="#A57665"/>
 </radialGradient>
 <path d="M23.46,18.68c-0.521-0.226-0.506-1.339-0.291-1.675,0.038-0.059,0.072-0.117,0.107-0.176h-4.365c0.035,0.059,0.069,0.116,0.107,0.176,0.215,0.336,0.23,1.448-0.291,1.675-0.522,0.228,2.428,2.202,2.428,2.202s2.81-1.98,2.29-2.2z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="669.2" x2="669.2" y1="-588.9" y2="-598.1">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="0.39" stop-color="#2D9BD2"/>
-<stop offset="0.89" stop-color="#1347BA"/>
-<stop offset="1" stop-color="#1347BA"/>
+<stop offset="0" stop-color="#70B4B6"/>
+<stop offset="0.39" stop-color="#5F8BA1"/>
+<stop offset="0.89" stop-color="#455188"/>
+<stop offset="1" stop-color="#455188"/>
 </linearGradient>
 <path d="M26.59,19.84c-0.549-0.286-3.27-1.238-3.322-1.299l-2.078,1.729-2.233-1.795c-0.063,0.092-2.752,1.035-3.374,1.365-0.713,0.377-1.877,1.246-1.877,3.207h14.76c0-1.97-1.33-2.93-1.88-3.21z" fill="url(#SVGID_2__)"/>
 <polygon fill="#020202" fill-opacity="0.3" points="18.45,18.69,21.19,20.88,23.77,18.74,23.27,18.54,21.19,20.27,18.96,18.47" stroke-opacity="0.3" style="enable-background:new;"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="669.2" x2="669.2" y1="-594.1" y2="-589.1">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#2D9BD2"/>
+<stop offset="0" stop-color="#70B4B6"/>
+<stop offset="1" stop-color="#5F8BA1"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3__)" points="21.19,20.88,18.45,18.69,18.29,18.76,21.19,21.07,23.93,18.8,23.77,18.74"/>
 <radialGradient cx="669.9" cy="-573.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="14.9">
-<stop offset="0" stop-color="#FFE2D9"/>
-<stop offset="0.51" stop-color="#FFC6B3"/>
-<stop offset="0.76" stop-color="#FFA98E"/>
-<stop offset="1" stop-color="#E88160"/>
+<stop offset="0" stop-color="#F4EDE4"/>
+<stop offset="0.51" stop-color="#E8D9CA"/>
+<stop offset="0.76" stop-color="#DDC4B0"/>
+<stop offset="1" stop-color="#BF9C89"/>
 </radialGradient>
 <path d="M24.71,13.56c-0.019-0.008-0.04-0.009-0.06-0.015v-0.001c-0.004-0.001-0.006-0.002-0.006-0.002-0.033-0.008-0.063-0.014-0.094-0.016-3.644-0.635-5.317-2.654-5.442-2.119-0.101,0.425-1.122,1.346-1.657,1.805,0.004,0.021,0.008,0.039,0.012,0.06,0,0,0.02,0.094,0.06,0.254-0.042,0.005-0.084,0.014-0.124,0.03-0.341,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.198,0.445,0.44,0.922,0.739,1.4,0.498,0.594,1.262,1.287,2.105,1.287,1.02,0,1.645-0.559,2.072-1.121,0.012-0.023,0.022-0.047,0.034-0.064,0.317-0.497,0.575-0.996,0.785-1.46,0.333,0.115,0.761-0.194,0.974-0.719,0.23-0.53,0.14-1.09-0.2-1.25z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="666.5" x2="672.8" y1="-589.1" y2="-582.8">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<stop offset="0" stop-color="#E8D9CA"/>
+<stop offset="1" stop-color="#DDC4B0"/>
 </linearGradient>
 <path d="M20.91,17.9c-0.621,0-1.246-0.289-1.707-0.727,0.486,0.514,1.143,1.012,1.857,1.012,1.02,0,1.645-0.559,2.072-1.121,0.011-0.023,0.021-0.047,0.034-0.064,0.317-0.497,0.575-0.996,0.785-1.46-1.15,2.03-2.01,2.36-3.03,2.36z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="669.1" x2="669.1" y1="-569.1" y2="-578.4">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M20.95,8.483c-1.265,0-1.872,0.574-2.341,1.175-0.764,0.117-1.974,0.817-1.119,3.882,0.535-0.459,1.514-1.703,1.614-2.128,0.128-0.54,1.828,1.521,5.542,2.137,0.045-0.172,0.063-0.272,0.063-0.272,0.6-2.62-0.67-4.694-3.75-4.797z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="672.2" x2="663.8" y1="-578" y2="-573">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.36" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M19.11,11.16s1.818,2.389,5.512,2.384c0,0-1.73-0.27-5.51-2.38z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="663.1" x2="663.1" y1="-572" y2="-577.3">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M18.68,9.836s-1.78,0.106-1.12,3.123c0,0-0.22-2.07,1.12-3.124z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="670.2" x2="670" y1="-569.9" y2="-572.3">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<stop offset="0" stop-color="#8D7B6A"/>
+<stop offset="1" stop-color="#451F1E"/>
 </linearGradient>
 <path d="M21.82,10.25c-0.828-0.118-2.23-0.853-2.779-0.59,0,0,1.799-2.053,4.971,0.284,0,0.004-0.76,0.516-2.19,0.306z" fill="url(#SVGID_9_)"/>
 <radialGradient cx="645" cy="-594.3" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="11.1">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.2" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<stop offset="0" stop-color="#DDC4B0"/>
+<stop offset="0.2" stop-color="#DDC4B0"/>
+<stop offset="0.96" stop-color="#A57665"/>
+<stop offset="1" stop-color="#A57665"/>
 </radialGradient>
 <path d="M11.28,18.68c-0.521-0.226-0.505-1.339-0.29-1.675,0.037-0.059,0.072-0.117,0.108-0.176h-4.371c0.035,0.059,0.069,0.116,0.107,0.176,0.215,0.336,0.23,1.448-0.29,1.675-0.523,0.228,2.427,2.202,2.427,2.202s2.827-1.98,2.307-2.2z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="644.8" x2="644.8" y1="-588.9" y2="-598.1">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="0.39" stop-color="#2D9BD2"/>
-<stop offset="0.89" stop-color="#1347BA"/>
-<stop offset="1" stop-color="#1347BA"/>
+<stop offset="0" stop-color="#70B4B6"/>
+<stop offset="0.39" stop-color="#5F8BA1"/>
+<stop offset="0.89" stop-color="#455188"/>
+<stop offset="1" stop-color="#455188"/>
 </linearGradient>
 <path d="M14.42,19.84c-0.549-0.286-3.271-1.238-3.322-1.299l-2.079,1.729-2.233-1.795c-0.063,0.092-2.752,1.035-3.375,1.365-0.712,0.377-1.876,1.246-1.876,3.207h14.76c-0.01-1.97-1.34-2.93-1.88-3.21z" fill="url(#SVGID_11_)"/>
 <polygon fill="#020202" fill-opacity="0.3" points="6.272,18.69,9.015,20.88,11.59,18.74,11.09,18.54,9.015,20.27,6.781,18.47" stroke-opacity="0.3" style="enable-background:new;"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="644.9" x2="644.9" y1="-594.1" y2="-589.1">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#2D9BD2"/>
+<stop offset="0" stop-color="#70B4B6"/>
+<stop offset="1" stop-color="#5F8BA1"/>
 </linearGradient>
 <polygon fill="url(#SVGID_12_)" points="9.015,20.88,6.271,18.69,6.113,18.76,9.015,21.07,11.75,18.8,11.59,18.74"/>
 <radialGradient cx="645.6" cy="-573.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="14.9">
-<stop offset="0" stop-color="#FFE2D9"/>
-<stop offset="0.51" stop-color="#FFC6B3"/>
-<stop offset="0.76" stop-color="#FFA98E"/>
-<stop offset="1" stop-color="#E88160"/>
+<stop offset="0" stop-color="#F4EDE4"/>
+<stop offset="0.51" stop-color="#E8D9CA"/>
+<stop offset="0.76" stop-color="#DDC4B0"/>
+<stop offset="1" stop-color="#BF9C89"/>
 </radialGradient>
 <path d="M12.53,13.56c-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-3.645-0.635-5.317-2.654-5.443-2.119-0.102,0.425-1.123,1.346-1.658,1.805,0.004,0.021,0.008,0.039,0.012,0.06,0,0,0.02,0.094,0.06,0.254-0.043,0.005-0.085,0.014-0.124,0.03-0.341,0.145-0.447,0.702-0.239,1.248,0.209,0.545,0.653,0.871,0.995,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.198,0.445,0.44,0.922,0.738,1.4,0.499,0.594,1.263,1.287,2.106,1.287,1.02,0,1.645-0.559,2.073-1.121,0.011-0.023,0.022-0.047,0.034-0.064,0.318-0.497,0.576-0.996,0.785-1.46,0.334,0.115,0.761-0.194,0.973-0.719,0.23-0.53,0.14-1.09-0.2-1.25z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="642.2" x2="648.5" y1="-589.1" y2="-582.8">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<stop offset="0" stop-color="#E8D9CA"/>
+<stop offset="1" stop-color="#DDC4B0"/>
 </linearGradient>
 <path d="M8.729,17.9c-0.621,0-1.247-0.289-1.708-0.727,0.487,0.514,1.144,1.012,1.858,1.012,1.02,0,1.645-0.559,2.073-1.121,0.011-0.023,0.022-0.047,0.034-0.064,0.318-0.497,0.576-0.996,0.785-1.46-1.15,2.03-2.011,2.36-3.031,2.36z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="644.7" x2="644.7" y1="-569.1" y2="-578.4">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M8.776,8.483c-1.265,0-1.872,0.574-2.342,1.175-0.763,0.117-1.973,0.817-1.118,3.882,0.535-0.459,1.514-1.703,1.615-2.128,0.127-0.54,1.828,1.521,5.542,2.137,0.043-0.172,0.063-0.272,0.063-0.272,0.59-2.62-0.68-4.694-3.754-4.797z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="647.9" x2="639.5" y1="-578" y2="-573">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.36" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M6.936,11.16s1.818,2.389,5.513,2.384c0,0-1.74-0.27-5.514-2.38z" fill="url(#SVGID_16_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="638.7" x2="638.8" y1="-572.3" y2="-577.7">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M6.498,9.836s-1.779,0.106-1.119,3.123c0,0-0.218-2.07,1.119-3.124z" fill="url(#SVGID_17_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="645.9" x2="645.6" y1="-569.9" y2="-572.3">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<stop offset="0" stop-color="#8D7B6A"/>
+<stop offset="1" stop-color="#451F1E"/>
 </linearGradient>
 <path d="M9.639,10.25c-0.828-0.118-2.23-0.853-2.78-0.59,0,0,1.8-2.053,4.973,0.284,0,0.004-0.76,0.516-2.191,0.306z" fill="url(#SVGID_18_)"/>
-<path d="M23.32,20.43c-0.506-0.264-2.081-0.849-3.348-1.317l-0.711-0.265-0.128-0.053-0.166-0.063-0.317-0.128-0.196,0.086c-0.001,0.002-0.003,0.002-0.004,0.003h-0.001c-0.826,0.323-2.406,0.897-2.865,1.143-0.178,0.095-0.385,0.222-0.596,0.388-0.221-0.183-0.426-0.311-0.573-0.388-0.395-0.205-1.904-0.753-2.746-1.067l-0.078-0.031-0.002,0.001-0.349-0.142-0.317,0.139c-0.311,0.122-0.693,0.268-1.103,0.424l-0.038,0.014c-1.21,0.461-2.582,0.982-3.107,1.262-1.177,0.625-2.025,1.51-2.525,2.609h21.66c-0.77-1.62-2.12-2.41-2.48-2.6z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M9.052,11.44c-0.561,0.477-0.712,1.432-0.349,2.38,0.342,0.894,1.048,1.494,1.758,1.494h0.002c0.106,0.221,0.217,0.439,0.331,0.654h-0.033l0.271,0.448s0.071,0.115,0.154,0.253c0.226-0.383,0.424-0.765,0.586-1.123,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.583-2.617-0.686-4.69-3.761-4.793-0.006,0-0.01,0.001-0.017,0.001-0.072,0.839,0.021,1.822,0.3,2.962z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.165,0.371,0.364,0.766,0.599,1.163,0.263-0.441,0.512-0.897,0.736-1.369,0.646-0.077,1.279-0.639,1.605-1.444,0.371-0.919,0.253-1.873-0.272-2.37,0.235-1.062,0.272-2.073,0.117-2.993-0.015-0.001-0.028-0.003-0.043-0.003-1.26-0.001-1.87,0.574-2.34,1.174zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M23.19,20.69c-0.49-0.256-2.057-0.836-3.314-1.305l-0.719-0.266-0.123-0.051-0.172-0.065-0.484-0.194c-0.016-0.021-0.027-0.051-0.041-0.073-0.85,0.327-2.31,0.862-2.746,1.097-0.179,0.094-0.386,0.221-0.597,0.387-0.221-0.182-0.426-0.311-0.573-0.387-0.395-0.205-1.904-0.754-2.746-1.068l-0.042-0.018-0.596,0.261c-0.32,0.125-0.719,0.276-1.144,0.438-1.202,0.457-2.565,0.975-3.074,1.244-1.071,0.568-1.857,1.363-2.338,2.35h21.01c-0.76-1.46-1.98-2.18-2.3-2.35z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
-<path d="M8.979,13.71c0.298,0.78,0.894,1.304,1.481,1.304,0.062,0,0.122-0.005,0.181-0.017,0.202,0.433,0.419,0.854,0.651,1.261h-0.009l0.068,0.113c0.155-0.283,0.3-0.563,0.419-0.829,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.564-2.535-0.613-4.556-3.483-4.772-0.08,0.847,0.026,1.864,0.336,3.057-0.57,0.33-0.751,1.24-0.404,2.15z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
-<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.124,0.278,0.269,0.569,0.429,0.864,0.256-0.439,0.497-0.891,0.715-1.357,0.014,0.001,0.025,0.001,0.039,0.001,0.58,0,1.177-0.511,1.483-1.27,0.358-0.884,0.21-1.785-0.325-2.144,0.025-0.106,0.036-0.166,0.036-0.166,0.233-1.043,0.267-2.035,0.11-2.931-1.08,0.083-1.64,0.612-2.08,1.169zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
+<path d="M23.32,20.43c-0.506-0.264-2.081-0.849-3.348-1.317l-0.711-0.265-0.128-0.053-0.166-0.063-0.317-0.128-0.196,0.086c-0.001,0.002-0.003,0.002-0.004,0.003h-0.001c-0.826,0.323-2.406,0.897-2.865,1.143-0.178,0.095-0.385,0.222-0.596,0.388-0.221-0.183-0.426-0.311-0.573-0.388-0.395-0.205-1.904-0.753-2.746-1.067l-0.078-0.031-0.002,0.001-0.349-0.142-0.317,0.139c-0.311,0.122-0.693,0.268-1.103,0.424l-0.038,0.014c-1.21,0.461-2.582,0.982-3.107,1.262-1.177,0.625-2.025,1.51-2.525,2.609h21.66c-0.77-1.62-2.12-2.41-2.48-2.6z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
+<path d="M9.052,11.44c-0.561,0.477-0.712,1.432-0.349,2.38,0.342,0.894,1.048,1.494,1.758,1.494h0.002c0.106,0.221,0.217,0.439,0.331,0.654h-0.033l0.271,0.448s0.071,0.115,0.154,0.253c0.226-0.383,0.424-0.765,0.586-1.123,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.583-2.617-0.686-4.69-3.761-4.793-0.006,0-0.01,0.001-0.017,0.001-0.072,0.839,0.021,1.822,0.3,2.962z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
+<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.165,0.371,0.364,0.766,0.599,1.163,0.263-0.441,0.512-0.897,0.736-1.369,0.646-0.077,1.279-0.639,1.605-1.444,0.371-0.919,0.253-1.873-0.272-2.37,0.235-1.062,0.272-2.073,0.117-2.993-0.015-0.001-0.028-0.003-0.043-0.003-1.26-0.001-1.87,0.574-2.34,1.174zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
+<path d="M23.19,20.69c-0.49-0.256-2.057-0.836-3.314-1.305l-0.719-0.266-0.123-0.051-0.172-0.065-0.484-0.194c-0.016-0.021-0.027-0.051-0.041-0.073-0.85,0.327-2.31,0.862-2.746,1.097-0.179,0.094-0.386,0.221-0.597,0.387-0.221-0.182-0.426-0.311-0.573-0.387-0.395-0.205-1.904-0.754-2.746-1.068l-0.042-0.018-0.596,0.261c-0.32,0.125-0.719,0.276-1.144,0.438-1.202,0.457-2.565,0.975-3.074,1.244-1.071,0.568-1.857,1.363-2.338,2.35h21.01c-0.76-1.46-1.98-2.18-2.3-2.35z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
+<path d="M8.979,13.71c0.298,0.78,0.894,1.304,1.481,1.304,0.062,0,0.122-0.005,0.181-0.017,0.202,0.433,0.419,0.854,0.651,1.261h-0.009l0.068,0.113c0.155-0.283,0.3-0.563,0.419-0.829,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.564-2.535-0.613-4.556-3.483-4.772-0.08,0.847,0.026,1.864,0.336,3.057-0.57,0.33-0.751,1.24-0.404,2.15z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
+<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.124,0.278,0.269,0.569,0.429,0.864,0.256-0.439,0.497-0.891,0.715-1.357,0.014,0.001,0.025,0.001,0.039,0.001,0.58,0,1.177-0.511,1.483-1.27,0.358-0.884,0.21-1.785-0.325-2.144,0.025-0.106,0.036-0.166,0.036-0.166,0.233-1.043,0.267-2.035,0.11-2.931-1.08,0.083-1.64,0.612-2.08,1.169zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
 <radialGradient cx="657.3" cy="-597.7" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_19_" r="16.23">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.2" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<stop offset="0" stop-color="#DDC4B0"/>
+<stop offset="0.2" stop-color="#DDC4B0"/>
+<stop offset="0.96" stop-color="#A57665"/>
+<stop offset="1" stop-color="#A57665"/>
 </radialGradient>
 <path d="M18.46,19.26c-0.764-0.332-0.738-1.957-0.424-2.448,0.055-0.086,0.104-0.172,0.156-0.258h-6.385c0.053,0.086,0.103,0.172,0.157,0.258,0.315,0.491,0.34,2.116-0.424,2.448-0.764,0.331,3.549,3.219,3.549,3.219s4.11-2.89,3.35-3.22z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="657" x2="657" y1="-589.9" y2="-603.3">
-<stop offset="0" stop-color="#FF7236"/>
-<stop offset="1" stop-color="#BA1212"/>
+<stop offset="0" stop-color="#C39072"/>
+<stop offset="1" stop-color="#88444B"/>
 </linearGradient>
 <path d="M23.05,20.96c-0.803-0.418-4.781-1.811-4.857-1.896l-3.04,2.524-3.266-2.623c-0.09,0.134-4.023,1.512-4.934,1.995-1.042,0.553-2.743,1.822-2.743,4.688h21.59c0-2.87-1.94-4.28-2.74-4.69z" fill="url(#SVGID_20_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="657.1" x2="657.1" y1="-589" y2="-596.9">
-<stop offset="0" stop-color="#BC1C24"/>
-<stop offset="1" stop-color="#6B1C24"/>
+<stop offset="0" stop-color="#8C4C54"/>
+<stop offset="1" stop-color="#53343E"/>
 </linearGradient>
 <polygon fill="url(#SVGID_21_)" points="11.14,19.28,15.15,22.48,18.92,19.35,18.19,19.06,15.15,21.58,11.89,18.96"/>
-<path d="M11.33,19.79s-5.72,1.493-5.72,5.502h-0.823c0-2.46,1.922-4.38,6.543-5.5z" fill="#FF7B56"/>
-<path d="M18.6,19.7s5.72,1.494,5.72,5.502h0.824c0-2.47-1.92-4.38-6.54-5.5z" fill="#FF7B56"/>
+<path d="M11.33,19.79s-5.72,1.493-5.72,5.502h-0.823c0-2.46,1.922-4.38,6.543-5.5z" fill="#CCA089"/>
+<path d="M18.6,19.7s5.72,1.494,5.72,5.502h0.824c0-2.47-1.92-4.38-6.54-5.5z" fill="#CCA089"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="657.1" x2="657.1" y1="-597.5" y2="-590.2">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<stop offset="0" stop-color="#DDC4B0"/>
+<stop offset="0.96" stop-color="#A57665"/>
+<stop offset="1" stop-color="#A57665"/>
 </linearGradient>
 <polygon fill="url(#SVGID_22_)" points="15.15,22.48,11.14,19.28,10.91,19.39,15.15,22.77,19.15,19.44,18.92,19.35"/>
 <radialGradient cx="658.1" cy="-567.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_23_" r="21.78">
-<stop offset="0" stop-color="#FFE2D9"/>
-<stop offset="0.51" stop-color="#FFC6B3"/>
-<stop offset="0.76" stop-color="#FFA98E"/>
-<stop offset="1" stop-color="#E88160"/>
+<stop offset="0" stop-color="#F4EDE4"/>
+<stop offset="0.51" stop-color="#E8D9CA"/>
+<stop offset="0.76" stop-color="#DDC4B0"/>
+<stop offset="1" stop-color="#BF9C89"/>
 </radialGradient>
 <path d="M20.29,11.79c-0.026-0.013-0.058-0.015-0.086-0.022v-0.002c-0.005-0.001-0.01-0.002-0.017-0.003-0.041-0.011-0.084-0.021-0.127-0.022-5.331-0.928-7.775-3.88-7.959-3.099-0.147,0.622-1.641,1.968-2.424,2.639,0.007,0.03,0.01,0.057,0.018,0.087,0,0,0.027,0.138,0.086,0.372-0.062,0.007-0.123,0.02-0.182,0.045-0.498,0.21-0.654,1.026-0.349,1.823,0.305,0.798,0.956,1.274,1.454,1.065,0.03-0.014,0.057-0.035,0.085-0.054,0.289,0.65,0.645,1.348,1.079,2.047,0.729,0.866,1.846,1.883,3.079,1.883,1.49,0,2.404-0.815,3.031-1.64,0.017-0.033,0.031-0.066,0.053-0.095,0.465-0.728,0.842-1.455,1.145-2.134,0.488,0.168,1.113-0.284,1.424-1.051,0.35-0.81,0.21-1.63-0.29-1.85z" fill="url(#SVGID_23_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="653.2" x2="662.4" y1="-590.1" y2="-580.9">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<stop offset="0" stop-color="#E8D9CA"/>
+<stop offset="1" stop-color="#DDC4B0"/>
 </linearGradient>
 <path d="M14.73,18.13c-0.908,0-1.822-0.423-2.496-1.06,0.713,0.748,1.672,1.478,2.716,1.478,1.491,0,2.403-0.815,3.032-1.64,0.016-0.033,0.031-0.066,0.051-0.095,0.465-0.728,0.842-1.455,1.146-2.134-1.7,2.95-2.96,3.44-4.45,3.44z" fill="url(#SVGID_24_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="656.8" x2="656.8" y1="-560.9" y2="-574.5">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M14.8,4.357c-1.847,0-2.736,0.84-3.423,1.718-1.12,0.172-2.884,1.195-1.636,5.675,0.783-0.67,2.214-2.489,2.361-3.111,0.186-0.788,2.672,2.226,8.103,3.124,0.063-0.251,0.093-0.398,0.093-0.398,0.86-3.821-0.99-6.853-5.49-7.003z" fill="url(#SVGID_25_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="661.5" x2="649.2" y1="-573.9" y2="-566.6">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.36" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M12.11,8.272s2.658,3.492,8.059,3.485c0,0-2.54-0.4-8.06-3.488z" fill="url(#SVGID_26_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="648.1" x2="648.2" y1="-565.2" y2="-573">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M11.47,6.335s-2.603,0.155-1.637,4.566c0.003,0-0.315-3.019,1.637-4.565z" fill="url(#SVGID_27_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="658.5" x2="658.2" y1="-562.1" y2="-565.6">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<stop offset="0" stop-color="#8D7B6A"/>
+<stop offset="1" stop-color="#451F1E"/>
 </linearGradient>
 <path d="M16.06,6.946c-1.212-0.173-3.263-1.247-4.065-0.863,0,0,2.63-3,7.271,0.415,0,0-1.11,0.747-3.21,0.448z" fill="url(#SVGID_28_)"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_home.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,21 +5,21 @@
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="312.4795" x2="312.4795" y1="-347.8892" y2="-403.8838">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.25" style="stop-color:#4F88BD"/>
-<stop offset="0.73" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+<stop offset="0.25" style="stop-color:#708A9C"/>
+<stop offset="0.73" style="stop-color:#314172"/>
+<stop offset="1" style="stop-color:#91CBCE"/>
 </linearGradient>
 <path d="M30,57.997C14.562,57.997,2,45.439,2,30C2,14.564,14.562,2.002,30,2.002  c15.437,0,28,12.561,28,27.998C58,45.439,45.437,57.997,30,57.997L30,57.997z" fill="url(#SVGID_1_)"/>
 <radialGradient cx="312.2188" cy="-353.9521" gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="51.3861">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.15" style="stop-color:#96E9FA"/>
-<stop offset="0.75" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#B4DCCA"/>
+<stop offset="0.15" style="stop-color:#B4DCCA"/>
+<stop offset="0.75" style="stop-color:#3D568F"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </radialGradient>
 <path d="M57.198,30c0,15.023-12.18,27.198-27.198,27.198C14.979,57.198,2.802,45.023,2.802,30  C2.802,14.982,14.979,2.802,30,2.802C45.019,2.802,57.198,14.982,57.198,30z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="312.4805" x2="312.4805" y1="-357.0225" y2="-394.2217">
-<stop offset="0" style="stop-color:#0B81FA"/>
-<stop offset="1" style="stop-color:#47DAFA"/>
+<stop offset="0" style="stop-color:#5385B2"/>
+<stop offset="1" style="stop-color:#7DC4BD"/>
 </linearGradient>
 <path d="M29.998,48.545c-5.093,0-9.503-1.832-13.104-5.451c-3.609-3.623-5.436-8.038-5.436-13.12  c0-5.058,1.832-9.457,5.446-13.076c3.621-3.612,8.026-5.441,13.093-5.441c5.093,0,9.503,1.827,13.109,5.43  c3.604,3.604,5.436,8.005,5.436,13.087c0,2.963-0.612,5.579-1.812,7.774c-1.537,2.821-3.797,4.262-6.723,4.262  c-2.53,0-4.466-1.123-5.768-3.338c-1.409,1.153-3.133,1.736-5.143,1.736c-2.812,0-5.106-1.098-6.817-3.253  c-1.549-1.952-2.334-4.358-2.334-7.156c0-2.812,0.789-5.208,2.345-7.125c1.679-2.096,3.973-3.162,6.806-3.162  c1.447,0,2.702,0.278,3.753,0.827V20.13h5.344v13.714c0,2.966,1.27,2.966,1.813,2.966c0.39,0,1.587,0,2.543-2.438  c0.522-1.359,0.789-2.841,0.789-4.397c0-3.666-1.279-6.715-3.925-9.331c-2.603-2.575-5.772-3.881-9.419-3.881  c-3.71,0-6.776,1.26-9.374,3.85c-2.595,2.592-3.858,5.655-3.858,9.36c0,3.712,1.271,6.78,3.876,9.384  c2.57,2.581,5.713,3.884,9.355,3.884h0.798v5.305H29.998L29.998,48.545z M29.1,24.964c-1.16,0-2.03,0.509-2.665,1.547  c-0.594,0.959-0.894,2.133-0.894,3.488c0,4.619,2.029,5.152,3.558,5.152c1.513,0,3.529-0.549,3.529-5.321  C32.629,25.467,30.613,24.964,29.1,24.964L29.1,24.964z" fill="url(#SVGID_3_)"/>
 <path d="M47.741,29.974c0,2.843-0.572,5.306-1.715,7.387c-1.39,2.563-3.396,3.846-6.018,3.846  c-2.552,0-4.395-1.282-5.543-3.846c-1.383,1.496-3.175,2.247-5.366,2.247c-2.57,0-4.629-0.982-6.188-2.95  c-1.44-1.818-2.164-4.029-2.164-6.659c0-2.641,0.726-4.844,2.164-6.617c1.539-1.917,3.601-2.871,6.188-2.871  c1.929,0,3.448,0.523,4.554,1.577v-1.156h3.741v12.913c0,2.511,0.868,3.767,2.613,3.767c1.424,0,2.519-0.985,3.287-2.947  c0.562-1.462,0.847-3.022,0.847-4.691c0-3.859-1.388-7.156-4.164-9.899c-2.771-2.744-6.101-4.111-9.982-4.111  c-3.896,0-7.209,1.36-9.939,4.083c-2.726,2.726-4.091,6.03-4.091,9.928c0,3.892,1.366,7.212,4.109,9.95  c2.733,2.745,6.045,4.118,9.922,4.118v3.703c-4.892,0-9.074-1.74-12.538-5.216c-3.468-3.483-5.203-7.674-5.203-12.555  c0-4.87,1.738-9.034,5.214-12.512c3.481-3.467,7.65-5.205,12.527-5.205c4.892,0,9.075,1.728,12.542,5.199  C46.006,20.913,47.741,25.087,47.741,29.974z M33.43,29.832c0-3.78-1.444-5.665-4.33-5.665c-1.443,0-2.563,0.64-3.346,1.932  c-0.68,1.087-1.01,2.386-1.01,3.901c0,3.971,1.449,5.954,4.354,5.954C31.985,35.954,33.43,33.915,33.43,29.832z" fill="#FFFFFF"/>
@@ -29,37 +29,37 @@
 <path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962  c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706  l-2.747,2.749v12.253H2.749z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.415" x2="15.415" y1="28.6694" y2="12.5688">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+<stop offset="0.6606" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#BABCBB"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="27.081,28.823 3.749,28.823 3.749,14.473 15.414,5.489 27.081,14.473 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.415" x2="15.415" y1="17.313" y2="28.6013">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+<stop offset="0.6606" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#BABCBB"/>
 </linearGradient>
 <path d="M15.414,6.668l10.736,8.264V27.89H4.682V14.932L15.414,6.668 M15.414,5.489L3.749,14.473v14.351  h23.333V14.473L15.414,5.489L15.414,5.489z" fill="url(#SVGID_2__)"/>
 <polygon fill-opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 " stroke-opacity="0.2"/>
 <polygon fill="#727272" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,6.655 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15.416" x2="15.416" y1="17.9946" y2="29.1519">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <rect fill="url(#SVGID_3__)" height="10.501" width="7.001" x="11.916" y="18.322"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.416" x2="15.416" y1="28.7466" y2="18.3602">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <path d="M17.98,19.257v8.633h-5.133v-8.633H17.98 M18.917,18.322h-7.001v10.501h7.001V18.322L18.917,18.322z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15.4136" x2="15.4136" y1="0.0352" y2="17.7271">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<stop offset="0" style="stop-color:#A8835F"/>
+<stop offset="0.2606" style="stop-color:#A86F5F"/>
+<stop offset="1" style="stop-color:#9A5047"/>
 </linearGradient>
 <path d="M15.414,5.489l11.667,11.667l2.333-2.333c0,0-12.586-12.554-13.171-13.175  c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14l2.335,2.333L15.414,5.489z" fill="url(#SVGID_5_)"/>
 <radialGradient cx="15.2969" cy="1.7559" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="18.6679">
-<stop offset="0" style="stop-color:#F7D481"/>
-<stop offset="1" style="stop-color:#F5340A"/>
+<stop offset="0" style="stop-color:#D4C9A4"/>
+<stop offset="1" style="stop-color:#AF6151"/>
 </radialGradient>
 <path d="M14.553,2.616c0.724-0.688,1.102-0.653,1.689-0.034c0.516,0.549,10.433,10.442,12.705,12.709  l0.467-0.468c0,0-12.586-12.554-13.171-13.175c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14  l0.467,0.465C4.134,13.029,13.917,3.225,14.553,2.616z" fill="url(#SVGID_6_)"/>
 <rect fill-opacity="0.2" height="1.168" stroke-opacity="0.2" width="7.001" x="11.916" y="18.322"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_setup.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_setup.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_setup.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,21 +5,21 @@
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="312.4795" x2="312.4795" y1="-347.8892" y2="-403.8838">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.25" style="stop-color:#4F88BD"/>
-<stop offset="0.73" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+<stop offset="0.25" style="stop-color:#708A9C"/>
+<stop offset="0.73" style="stop-color:#314172"/>
+<stop offset="1" style="stop-color:#91CBCE"/>
 </linearGradient>
 <path d="M30,57.997C14.562,57.997,2,45.439,2,30C2,14.564,14.562,2.002,30,2.002  c15.437,0,28,12.561,28,27.998C58,45.439,45.437,57.997,30,57.997L30,57.997z" fill="url(#SVGID_1_)"/>
 <radialGradient cx="312.2188" cy="-353.9521" gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="51.3861">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.15" style="stop-color:#96E9FA"/>
-<stop offset="0.75" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#B4DCCA"/>
+<stop offset="0.15" style="stop-color:#B4DCCA"/>
+<stop offset="0.75" style="stop-color:#3D568F"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </radialGradient>
 <path d="M57.198,30c0,15.023-12.18,27.198-27.198,27.198C14.979,57.198,2.802,45.023,2.802,30  C2.802,14.982,14.979,2.802,30,2.802C45.019,2.802,57.198,14.982,57.198,30z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="312.4805" x2="312.4805" y1="-357.0225" y2="-394.2217">
-<stop offset="0" style="stop-color:#0B81FA"/>
-<stop offset="1" style="stop-color:#47DAFA"/>
+<stop offset="0" style="stop-color:#5385B2"/>
+<stop offset="1" style="stop-color:#7DC4BD"/>
 </linearGradient>
 <path d="M29.998,48.545c-5.093,0-9.503-1.832-13.104-5.451c-3.609-3.623-5.436-8.038-5.436-13.12  c0-5.058,1.832-9.457,5.446-13.076c3.621-3.612,8.026-5.441,13.093-5.441c5.093,0,9.503,1.827,13.109,5.43  c3.604,3.604,5.436,8.005,5.436,13.087c0,2.963-0.612,5.579-1.812,7.774c-1.537,2.821-3.797,4.262-6.723,4.262  c-2.53,0-4.466-1.123-5.768-3.338c-1.409,1.153-3.133,1.736-5.143,1.736c-2.812,0-5.106-1.098-6.817-3.253  c-1.549-1.952-2.334-4.358-2.334-7.156c0-2.812,0.789-5.208,2.345-7.125c1.679-2.096,3.973-3.162,6.806-3.162  c1.447,0,2.702,0.278,3.753,0.827V20.13h5.344v13.714c0,2.966,1.27,2.966,1.813,2.966c0.39,0,1.587,0,2.543-2.438  c0.522-1.359,0.789-2.841,0.789-4.397c0-3.666-1.279-6.715-3.925-9.331c-2.603-2.575-5.772-3.881-9.419-3.881  c-3.71,0-6.776,1.26-9.374,3.85c-2.595,2.592-3.858,5.655-3.858,9.36c0,3.712,1.271,6.78,3.876,9.384  c2.57,2.581,5.713,3.884,9.355,3.884h0.798v5.305H29.998L29.998,48.545z M29.1,24.964c-1.16,0-2.03,0.509-2.665,1.547  c-0.594,0.959-0.894,2.133-0.894,3.488c0,4.619,2.029,5.152,3.558,5.152c1.513,0,3.529-0.549,3.529-5.321  C32.629,25.467,30.613,24.964,29.1,24.964L29.1,24.964z" fill="url(#SVGID_3_)"/>
 <path d="M47.741,29.974c0,2.843-0.572,5.306-1.715,7.387c-1.39,2.563-3.396,3.846-6.018,3.846  c-2.552,0-4.395-1.282-5.543-3.846c-1.383,1.496-3.175,2.247-5.366,2.247c-2.57,0-4.629-0.982-6.188-2.95  c-1.44-1.818-2.164-4.029-2.164-6.659c0-2.641,0.726-4.844,2.164-6.617c1.539-1.917,3.601-2.871,6.188-2.871  c1.929,0,3.448,0.523,4.554,1.577v-1.156h3.741v12.913c0,2.511,0.868,3.767,2.613,3.767c1.424,0,2.519-0.985,3.287-2.947  c0.562-1.462,0.847-3.022,0.847-4.691c0-3.859-1.388-7.156-4.164-9.899c-2.771-2.744-6.101-4.111-9.982-4.111  c-3.896,0-7.209,1.36-9.939,4.083c-2.726,2.726-4.091,6.03-4.091,9.928c0,3.892,1.366,7.212,4.109,9.95  c2.733,2.745,6.045,4.118,9.922,4.118v3.703c-4.892,0-9.074-1.74-12.538-5.216c-3.468-3.483-5.203-7.674-5.203-12.555  c0-4.87,1.738-9.034,5.214-12.512c3.481-3.467,7.65-5.205,12.527-5.205c4.892,0,9.075,1.728,12.542,5.199  C46.006,20.913,47.741,25.087,47.741,29.974z M33.43,29.832c0-3.78-1.444-5.665-4.33-5.665c-1.443,0-2.563,0.64-3.346,1.932  c-0.68,1.087-1.01,2.386-1.01,3.901c0,3.971,1.449,5.954,4.354,5.954C31.985,35.954,33.43,33.915,33.43,29.832z" fill="#FFFFFF"/>
@@ -29,7 +29,7 @@
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="282.4795" x2="282.4795" y1="-361.4912" y2="-388.438">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.1" style="stop-color:#FFFFFF"/>
-<stop offset="0.74" style="stop-color:#929497"/>
+<stop offset="0.74" style="stop-color:#939595"/>
 <stop offset="1" style="stop-color:#C8C8C8"/>
 </linearGradient>
 <path d="M26.116,12.624H25.43c-0.437,0-0.906-0.339-1.042-0.754l-0.531-1.285  c-0.196-0.389-0.105-0.96,0.204-1.269l0.485-0.486c0.615-0.615,0.659-0.759,0.916-1.271l0.349-0.695  c-0.761-1.008-1.659-1.906-2.668-2.666l-0.694,0.346c-0.389,0.195-0.961,0.608-1.271,0.917l-0.485,0.486  c-0.31,0.309-0.882,0.401-1.271,0.203L18.138,5.62c-0.417-0.137-0.755-0.608-0.755-1.044V3.889c0-0.437-0.113-1.134-0.251-1.548  l-0.246-0.735C16.269,1.519,15.641,1.472,15,1.472c-0.641,0-1.27,0.047-1.886,0.133L12.869,2.34  c-0.138,0.415-0.251,1.111-0.251,1.548v0.687c0,0.436-0.339,0.906-0.754,1.042l-1.285,0.53C10.19,6.346,9.62,6.254,9.311,5.946  L8.824,5.46C8.515,5.151,7.942,4.739,7.553,4.543L6.858,4.195C5.851,4.956,4.953,5.854,4.192,6.862l0.347,0.694  c0.195,0.391,0.608,0.963,0.917,1.272l0.486,0.486c0.309,0.309,0.4,0.88,0.202,1.269l-0.531,1.286  c-0.136,0.415-0.605,0.754-1.042,0.754H3.884c-0.438,0-1.134,0.112-1.548,0.252l-0.736,0.245c-0.086,0.617-0.134,1.245-0.134,1.886  c0,0.64,0.047,1.269,0.134,1.885l0.736,0.246c0.414,0.139,1.11,0.251,1.548,0.251h0.687c0.438,0,0.906,0.34,1.042,0.755l0.53,1.284  c0.198,0.389,0.106,0.961-0.203,1.269l-0.486,0.486c-0.309,0.308-0.721,0.882-0.917,1.271L4.19,23.146  c0.761,1.008,1.659,1.905,2.667,2.665l0.694-0.345c0.391-0.196,0.963-0.608,1.271-0.917l0.486-0.485  c0.309-0.309,0.881-0.401,1.27-0.203l1.284,0.529c0.416,0.138,0.755,0.608,0.755,1.044v0.687c0,0.438,0.113,1.133,0.251,1.549  l0.245,0.734c0.617,0.086,1.245,0.134,1.886,0.134c0.64,0,1.267-0.048,1.886-0.134l0.244-0.734c0.138-0.416,0.251-1.111,0.251-1.549  v-0.687c0-0.438,0.34-0.906,0.755-1.043l1.284-0.53c0.391-0.197,0.959-0.105,1.269,0.203l0.485,0.485  c0.31,0.309,0.882,0.721,1.272,0.917l0.695,0.347c1.008-0.76,1.904-1.657,2.665-2.666l-0.347-0.693  c-0.194-0.391-0.608-0.964-0.918-1.271l-0.483-0.486c-0.31-0.309-0.4-0.88-0.204-1.27l0.529-1.284  c0.14-0.416,0.607-0.755,1.044-0.755h0.688c0.435,0,1.132-0.111,1.547-0.251l0.736-0.246c0.087-0.615,0.134-1.245,0.134-1.885  c0-0.641-0.047-1.269-0.134-1.886l-0.736-0.245C27.249,12.736,26.553,12.624,26.116,12.624z M15,19.771  c-2.632,0-4.765-2.133-4.765-4.765c0-2.631,2.132-4.765,4.765-4.765c2.63,0,4.764,2.134,4.764,4.765  C19.764,17.638,17.63,19.771,15,19.771z" fill="url(#SVGID_1__)"/>
@@ -42,7 +42,7 @@
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="282.4805" x2="282.4805" y1="-383.0635" y2="-366.7921">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.52" style="stop-color:#C8C8C8"/>
-<stop offset="1" style="stop-color:#929497"/>
+<stop offset="1" style="stop-color:#939595"/>
 </linearGradient>
 <path d="M15,6.52c-4.687,0-8.487,3.8-8.487,8.487s3.8,8.486,8.487,8.486s8.487-3.799,8.487-8.486  S19.687,6.52,15,6.52z M15,21.563c-3.621,0-6.559-2.935-6.559-6.557c0-3.622,2.937-6.558,6.559-6.558  c3.62,0,6.557,2.936,6.557,6.558C21.557,18.629,18.619,21.563,15,21.563z" fill="url(#SVGID_3__)"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_work.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_work.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_work.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,21 +5,21 @@
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="312.4795" x2="312.4795" y1="-347.8892" y2="-403.8838">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.25" style="stop-color:#4F88BD"/>
-<stop offset="0.73" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+<stop offset="0.25" style="stop-color:#708A9C"/>
+<stop offset="0.73" style="stop-color:#314172"/>
+<stop offset="1" style="stop-color:#91CBCE"/>
 </linearGradient>
 <path d="M30,57.997C14.562,57.997,2,45.439,2,30C2,14.564,14.562,2.002,30,2.002  c15.437,0,28,12.561,28,27.998C58,45.439,45.437,57.997,30,57.997L30,57.997z" fill="url(#SVGID_1_)"/>
 <radialGradient cx="312.2188" cy="-353.9521" gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="51.3861">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.15" style="stop-color:#96E9FA"/>
-<stop offset="0.75" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#B4DCCA"/>
+<stop offset="0.15" style="stop-color:#B4DCCA"/>
+<stop offset="0.75" style="stop-color:#3D568F"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </radialGradient>
 <path d="M57.198,30c0,15.023-12.18,27.198-27.198,27.198C14.979,57.198,2.802,45.023,2.802,30  C2.802,14.982,14.979,2.802,30,2.802C45.019,2.802,57.198,14.982,57.198,30z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="312.4805" x2="312.4805" y1="-357.0225" y2="-394.2217">
-<stop offset="0" style="stop-color:#0B81FA"/>
-<stop offset="1" style="stop-color:#47DAFA"/>
+<stop offset="0" style="stop-color:#5385B2"/>
+<stop offset="1" style="stop-color:#7DC4BD"/>
 </linearGradient>
 <path d="M29.998,48.545c-5.093,0-9.503-1.832-13.104-5.451c-3.609-3.623-5.436-8.038-5.436-13.12  c0-5.058,1.832-9.457,5.446-13.076c3.621-3.612,8.026-5.441,13.093-5.441c5.093,0,9.503,1.827,13.109,5.43  c3.604,3.604,5.436,8.005,5.436,13.087c0,2.963-0.612,5.579-1.812,7.774c-1.537,2.821-3.797,4.262-6.723,4.262  c-2.53,0-4.466-1.123-5.768-3.338c-1.409,1.153-3.133,1.736-5.143,1.736c-2.812,0-5.106-1.098-6.817-3.253  c-1.549-1.952-2.334-4.358-2.334-7.156c0-2.812,0.789-5.208,2.345-7.125c1.679-2.096,3.973-3.162,6.806-3.162  c1.447,0,2.702,0.278,3.753,0.827V20.13h5.344v13.714c0,2.966,1.27,2.966,1.813,2.966c0.39,0,1.587,0,2.543-2.438  c0.522-1.359,0.789-2.841,0.789-4.397c0-3.666-1.279-6.715-3.925-9.331c-2.603-2.575-5.772-3.881-9.419-3.881  c-3.71,0-6.776,1.26-9.374,3.85c-2.595,2.592-3.858,5.655-3.858,9.36c0,3.712,1.271,6.78,3.876,9.384  c2.57,2.581,5.713,3.884,9.355,3.884h0.798v5.305H29.998L29.998,48.545z M29.1,24.964c-1.16,0-2.03,0.509-2.665,1.547  c-0.594,0.959-0.894,2.133-0.894,3.488c0,4.619,2.029,5.152,3.558,5.152c1.513,0,3.529-0.549,3.529-5.321  C32.629,25.467,30.613,24.964,29.1,24.964L29.1,24.964z" fill="url(#SVGID_3_)"/>
 <path d="M47.741,29.974c0,2.843-0.572,5.306-1.715,7.387c-1.39,2.563-3.396,3.846-6.018,3.846  c-2.552,0-4.395-1.282-5.543-3.846c-1.383,1.496-3.175,2.247-5.366,2.247c-2.57,0-4.629-0.982-6.188-2.95  c-1.44-1.818-2.164-4.029-2.164-6.659c0-2.641,0.726-4.844,2.164-6.617c1.539-1.917,3.601-2.871,6.188-2.871  c1.929,0,3.448,0.523,4.554,1.577v-1.156h3.741v12.913c0,2.511,0.868,3.767,2.613,3.767c1.424,0,2.519-0.985,3.287-2.947  c0.562-1.462,0.847-3.022,0.847-4.691c0-3.859-1.388-7.156-4.164-9.899c-2.771-2.744-6.101-4.111-9.982-4.111  c-3.896,0-7.209,1.36-9.939,4.083c-2.726,2.726-4.091,6.03-4.091,9.928c0,3.892,1.366,7.212,4.109,9.95  c2.733,2.745,6.045,4.118,9.922,4.118v3.703c-4.892,0-9.074-1.74-12.538-5.216c-3.468-3.483-5.203-7.674-5.203-12.555  c0-4.87,1.738-9.034,5.214-12.512c3.481-3.467,7.65-5.205,12.527-5.205c4.892,0,9.075,1.728,12.542,5.199  C46.006,20.913,47.741,25.087,47.741,29.974z M33.43,29.832c0-3.78-1.444-5.665-4.33-5.665c-1.443,0-2.563,0.64-3.346,1.932  c-0.68,1.087-1.01,2.386-1.01,3.901c0,3.971,1.449,5.954,4.354,5.954C31.985,35.954,33.43,33.915,33.43,29.832z" fill="#FFFFFF"/>
@@ -28,93 +28,93 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill="none" height="30" width="30"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="654.6" x2="654.6" y1="-558.3" y2="-601.7">
-<stop offset="0" stop-color="#DFE1E6"/>
-<stop offset="1" stop-color="#BDBEC3"/>
+<stop offset="0" stop-color="#E1E4E3"/>
+<stop offset="1" stop-color="#BFC1C1"/>
 </linearGradient>
 <rect fill="url(#SVGID_1__)" height="21.5" width="17.33" x="5.158" y="3.499"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="654.6" x2="654.6" y1="-558.9" y2="-602.2">
-<stop offset="0" stop-color="#E7E9EF"/>
-<stop offset="1" stop-color="#C8C9CE"/>
+<stop offset="0" stop-color="#E9EDEB"/>
+<stop offset="1" stop-color="#CACCCC"/>
 </linearGradient>
 <path d="M21.99,3.999v20.5h-16.33v-20.5h16.33m0.5-0.501h-17.33v21.5h17.33v-21.5z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="642.6" x2="642.6" y1="-567.9" y2="-562.2">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_3__)" height="3" width="3" x="6.324" y="5.146"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="650.6" x2="650.6" y1="-567.9" y2="-562.2">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="3" width="3" x="10.32" y="5.146"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="666.6" x2="666.6" y1="-567.9" y2="-562.2">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="3" width="3" x="18.32" y="5.146"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="658.6" x2="658.6" y1="-567.9" y2="-562.2">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="3" width="3" x="14.32" y="5.146"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="642.6" x2="642.6" y1="-576.5" y2="-570.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="3" width="3" x="6.324" y="9.458"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="650.6" x2="650.6" y1="-576.5" y2="-570.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="3" width="3" x="10.32" y="9.458"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="666.6" x2="666.6" y1="-576.5" y2="-570.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="3" width="3" x="18.32" y="9.458"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="658.6" x2="658.6" y1="-576.5" y2="-570.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="3" width="3" x="14.32" y="9.458"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="642.6" x2="642.6" y1="-594.5" y2="-588.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_11_)" height="3" width="3" x="6.324" y="18.46"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="650.6" x2="650.6" y1="-594.5" y2="-588.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_12_)" height="3" width="3" x="10.32" y="18.46"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="666.6" x2="666.6" y1="-594.5" y2="-588.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_13_)" height="3" width="3" x="18.32" y="18.46"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="658.6" x2="658.6" y1="-594.5" y2="-588.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_14_)" height="3" width="3" x="14.32" y="18.46"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="642.6" x2="642.6" y1="-585.5" y2="-579.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_15_)" height="3" width="3" x="6.324" y="13.96"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="650.6" x2="650.6" y1="-585.5" y2="-579.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_16_)" height="3" width="3" x="10.32" y="13.96"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="666.6" x2="666.6" y1="-585.5" y2="-579.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_17_)" height="3" width="3" x="18.32" y="13.96"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="658.6" x2="658.6" y1="-585.5" y2="-579.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_18_)" height="3" width="3" x="14.32" y="13.96"/>
 <polygon fill-opacity="0.3" points="22.49,25,22.49,14.85,12.51,11.92,12.51,25" stroke-opacity="0.3" style="enable-background:new;"/>
@@ -124,8 +124,8 @@
 </linearGradient>
 <polygon fill="url(#SVGID_19_)" points="24.84,16.25,13.51,12.92,13.51,26.5,24.84,26.5"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="665.4" x2="665.4" y1="-582" y2="-605.1">
-<stop offset="0" stop-color="#DBDDE2"/>
-<stop offset="1" stop-color="#B5B6BA"/>
+<stop offset="0" stop-color="#DDE0DF"/>
+<stop offset="1" stop-color="#B7B8B9"/>
 </linearGradient>
 <path d="M14.01,13.58l10.33,3.039v9.38h-10.33v-12.42m-0.5-0.665v13.58h11.33v-10.25l-11.33-3.33z" fill="url(#SVGID_20_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_end_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_end_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_end_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,37 +5,37 @@
 <rect fill="none" height="60" width="60"/>
 <g>
 <radialGradient cx="-1374.2305" cy="2708.6123" gradientTransform="matrix(0 1 1 0 -2678.1238 1416.3748)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="36.2612">
-<stop offset="0" style="stop-color:#FDA932"/>
-<stop offset="0.297" style="stop-color:#FDA932"/>
-<stop offset="0.6667" style="stop-color:#CF170D"/>
-<stop offset="0.7939" style="stop-color:#FD6E2C"/>
-<stop offset="1" style="stop-color:#FD6E2C"/>
+<stop offset="0" style="stop-color:#C0A26F"/>
+<stop offset="0.297" style="stop-color:#C0A26F"/>
+<stop offset="0.6667" style="stop-color:#954749"/>
+<stop offset="0.7939" style="stop-color:#BE8A6B"/>
+<stop offset="1" style="stop-color:#BE8A6B"/>
 </radialGradient>
 <path d="M17.884,35.418c0.413-0.078,0.579-0.318,0.603-0.895c0.027-0.721,0.29-3.172,0.431-3.764   c0.124-0.521,0.342-0.805,0.941-0.98c0.75-0.22,3.188-1.037,10.143-1.038c6.954,0,9.393,0.807,10.141,1.038   c0.651,0.201,0.777,0.389,0.941,0.98c0.162,0.586,0.402,3.043,0.431,3.764c0.024,0.576,0.16,0.82,0.577,0.883   c0.731,0.113,13.291,2.238,14.601,2.502c0.794,0.16,1.237,0.045,1.292-0.705c0.231-3.012-2.009-7.641-3.005-9.067   c-0.887-1.274-1.687-2.667-3.82-3.557c-2.028-0.845-12.133-2.548-21.158-2.548c-9.026-0.001-19.132,1.704-21.159,2.548   c-2.133,0.889-2.935,2.282-3.82,3.555c-0.995,1.429-3.237,6.055-3.006,9.069c0.058,0.748,0.5,0.863,1.292,0.703   C4.62,37.645,17.169,35.549,17.884,35.418z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0 1 1 0 -2678.1238 1416.3748)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1383.7373" x2="-1383.3947" y1="2721.2969" y2="2718.4587">
-<stop offset="0" style="stop-color:#C8540E"/>
-<stop offset="1" style="stop-color:#990C00"/>
+<stop offset="0" style="stop-color:#905A46"/>
+<stop offset="1" style="stop-color:#6B2E36"/>
 </linearGradient>
 <path d="M40.145,29.779c0.65,0.202,0.775,0.39,0.94,0.981c0.162,0.584,0.401,3.043,0.431,3.762   c0.024,0.578,0.16,0.82,0.576,0.885c0.046,0.008,0.062,0.01,0.063,0.01c0.244,0.039,0.993,0.164,2.039,0.342   c-0.026-0.258-0.37-3.525-1.036-4.357C41.938,29.877,40.145,29.779,40.145,29.779z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0 1 -1 0 -3579.3215 1416.3782)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1383.7422" x2="-1383.3992" y1="-3596.1938" y2="-3599.0347">
-<stop offset="0" style="stop-color:#C8540E"/>
-<stop offset="1" style="stop-color:#990C00"/>
+<stop offset="0" style="stop-color:#905A46"/>
+<stop offset="1" style="stop-color:#6B2E36"/>
 </linearGradient>
 <path d="M19.841,29.779c-0.654,0.203-0.778,0.39-0.942,0.981c-0.163,0.586-0.404,3.045-0.433,3.766   c-0.021,0.574-0.158,0.818-0.574,0.883c-0.047,0.008-0.061,0.01-0.061,0.01c-0.245,0.039-0.994,0.164-2.041,0.338   c0.028-0.254,0.371-3.523,1.036-4.355C18.043,29.876,19.841,29.779,19.841,29.779z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 51.2805 -77.5527)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="78.5283" x2="43.332" y1="-72.9224" y2="-108.1187">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+<stop offset="0" style="stop-color:#D3C59A"/>
+<stop offset="1" style="stop-color:#D0BA98"/>
 </linearGradient>
 <path d="M5.021,28.75c0.887-1.275,1.688-2.668,3.819-3.555   c2.029-0.846,12.134-2.55,21.16-2.549c9.027-0.001,19.13,1.703,21.161,2.549c2.131,0.888,2.933,2.28,3.819,3.554   c0.912,1.311,2.875,5.32,3.009,8.3c0.146-3.016-2.031-7.511-3.009-8.915c-0.888-1.274-1.688-2.666-3.82-3.556   c-2.028-0.845-12.134-2.548-21.158-2.549c-9.027,0.001-19.133,1.706-21.16,2.55c-2.133,0.889-2.935,2.282-3.82,3.555   c-0.979,1.404-3.158,5.899-3.009,8.915C2.146,34.068,4.108,30.06,5.021,28.75z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 51.2805 -77.5527)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="82.8936" x2="42.849" y1="-73.0874" y2="-113.132">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+<stop offset="0" style="stop-color:#D3C59A"/>
+<stop offset="1" style="stop-color:#D0BA98"/>
 </linearGradient>
 <path d="M17.884,35.418c0.413-0.078,0.579-0.318,0.603-0.895   c0.027-0.721,0.29-3.172,0.431-3.764c0.124-0.521,0.342-0.805,0.941-0.98c0.75-0.22,3.188-1.037,10.143-1.038   c6.954,0,9.393,0.807,10.141,1.038c0.651,0.201,0.777,0.389,0.941,0.98c0.162,0.586,0.402,3.043,0.431,3.764   c0.024,0.576,0.16,0.82,0.577,0.883c0.731,0.113,13.291,2.238,14.601,2.502c0.794,0.16,1.237,0.045,1.292-0.705   c0.027-0.354,0.018-0.73-0.017-1.119c-0.094,0.643-0.526,0.748-1.276,0.594c-1.311-0.262-13.869-2.385-14.6-2.5   c-0.418-0.064-0.553-0.307-0.576-0.883c-0.029-0.719-0.27-3.177-0.433-3.765c-0.163-0.59-0.287-0.777-0.941-0.979   c-0.746-0.229-3.188-1.039-10.14-1.037c-6.954,0-9.393,0.817-10.143,1.037c-0.599,0.176-0.816,0.459-0.94,0.981   c-0.141,0.59-0.403,3.042-0.433,3.763c-0.022,0.576-0.189,0.816-0.603,0.893C17.168,34.32,4.62,36.414,3.309,36.68   c-0.751,0.15-1.183,0.049-1.275-0.596c-0.036,0.389-0.044,0.766-0.018,1.119c0.058,0.748,0.5,0.861,1.292,0.703   C4.62,37.645,17.169,35.549,17.884,35.418z" fill="url(#SVGID_5_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(0 1 1 0 -2702.5007 1379.2039)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-1353.1973" x2="-1353.1973" y1="2756.7813" y2="2707.613">
-<stop offset="0" style="stop-color:#B6661B"/>
-<stop offset="0.5" style="stop-color:#700303"/>
-<stop offset="1" style="stop-color:#B6661B"/>
+<stop offset="0" style="stop-color:#885F4A"/>
+<stop offset="0.5" style="stop-color:#4F2430"/>
+<stop offset="1" style="stop-color:#885F4A"/>
 </linearGradient>
 <path d="M6.355,27.326c2.275-0.843,14.095-2.529,23.646-2.53   c9.552,0,21.371,1.687,23.646,2.53c0.431,0.161,0.804,0.343,1.144,0.531c-0.233-0.341-0.472-0.685-0.733-1.024   c-0.069-0.028-0.127-0.056-0.196-0.082c-2.309-0.856-14.245-2.568-23.858-2.568c-9.616,0-21.553,1.71-23.862,2.566   c-0.07,0.028-0.128,0.058-0.198,0.085c-0.26,0.339-0.5,0.685-0.733,1.023C5.554,27.667,5.924,27.487,6.355,27.326z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_fail.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_fail.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_fail.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -9,15 +9,15 @@
 </linearGradient>
 <path d="M30,8.67C18.217,8.67,8.666,18.218,8.666,30c0,11.783,9.551,21.334,21.334,21.334  S51.334,41.783,51.334,30C51.334,18.218,41.783,8.67,30,8.67z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.002" y2="57.8059">
-<stop offset="0" style="stop-color:#FFA680"/>
-<stop offset="0.7939" style="stop-color:#7D1212"/>
-<stop offset="1" style="stop-color:#F18769"/>
+<stop offset="0" style="stop-color:#D9BEA6"/>
+<stop offset="0.7939" style="stop-color:#5D323C"/>
+<stop offset="1" style="stop-color:#C8A592"/>
 </linearGradient>
 <path d="M30,2.002C14.535,2.002,2,14.534,2,30s12.535,28.002,28,28.002S58,45.466,58,30  S45.465,2.002,30,2.002z M30,9.307c3.941,0,7.619,1.127,10.758,3.047L12.355,40.763C10.43,37.623,9.305,33.948,9.305,30  C9.305,18.591,18.588,9.307,30,9.307z M30,50.697c-3.943,0-7.615-1.128-10.756-3.048l28.4-28.408  c1.922,3.141,3.051,6.817,3.051,10.759C50.695,41.413,41.41,50.697,30,50.697z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="2.752" y2="57.0611">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
 </linearGradient>
 <path d="M30,57.252C14.975,57.252,2.75,45.026,2.75,30C2.75,14.976,14.975,2.752,30,2.752  S57.25,14.976,57.25,30C57.25,45.026,45.025,57.252,30,57.252L30,57.252z M18.039,47.793l0.813,0.496  c3.381,2.066,7.234,3.158,11.148,3.158c11.824,0,21.445-9.621,21.445-21.447c0-3.914-1.094-7.77-3.162-11.15l-0.496-0.812  L18.039,47.793z M30,8.557C18.174,8.557,8.555,18.176,8.555,30c0,3.923,1.094,7.781,3.16,11.155l0.498,0.811l29.748-29.754  l-0.813-0.497C37.771,9.649,33.916,8.557,30,8.557L30,8.557z" fill="url(#SVGID_3_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_favourites.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_favourites.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_favourites.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,30 +5,30 @@
 <rect fill="none" height="60" width="60"/>
 <polygon fill="url(#SVGID_1_)" points="30.299,46.857 13.109,56.171 16.172,36.861 2.002,23.39 21.313,20.336 29.746,2.696   38.617,20.121 58.002,22.689 44.172,36.51 47.719,55.738 "/>
 <radialGradient cx="-2195.2817" cy="4635.3013" gradientTransform="matrix(0.9721 0 0 -0.9721 2163.7463 4516.3262)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="45.7877">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.1394" style="stop-color:#FEE16E"/>
-<stop offset="0.5515" style="stop-color:#FFC501"/>
-<stop offset="0.7273" style="stop-color:#F6A800"/>
-<stop offset="1" style="stop-color:#FED43A"/>
+<stop offset="0" style="stop-color:#D3CA99"/>
+<stop offset="0.1394" style="stop-color:#D3CA99"/>
+<stop offset="0.5515" style="stop-color:#B39C4D"/>
+<stop offset="0.7273" style="stop-color:#AC8A4A"/>
+<stop offset="1" style="stop-color:#C3B475"/>
 </radialGradient>
 <polygon fill="url(#SVGID_2_)" points="17.67,36.354 5.021,24.329 22.26,21.604 29.787,5.86 37.705,21.411 55.006,23.705   42.662,36.041 45.828,53.201 30.281,45.274 14.936,53.589 "/>
 <radialGradient cx="-2194.7852" cy="4599.8726" gradientTransform="matrix(0.9721 0 0 -0.9721 2163.7463 4516.3262)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="16.3968">
-<stop offset="0" style="stop-color:#FED95A"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#CDC18B"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <polygon fill="url(#SVGID_3_)" points="30.281,43.875 15.18,52.056 14.936,53.589 30.281,45.274 45.828,53.201 45.543,51.656 "/>
 <radialGradient cx="-2194.771" cy="4629.7397" gradientTransform="matrix(0.9721 0 0 -0.9721 2163.7463 4516.3262)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="63.637">
-<stop offset="0" style="stop-color:#FEF4CE"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#F0EDDC"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <polygon fill="url(#SVGID_4_)" points="22.959,23.005 29.787,8.661 37.006,22.811 53.764,24.945 55.006,23.705 37.705,21.411   29.787,5.86 22.26,21.604 5.021,24.329 6.292,25.537 "/>
 <rect fill="none" height="60" width="60"/>
 <defs>
 <linearGradient gradientTransform="matrix(0.9999 -0.0125 -0.0125 -0.9999 2215.6172 4551.269)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2128.8872" x2="-2128.8872" y1="4575.7925" y2="4523.3677">
-<stop offset="0" style="stop-color:#F2C352"/>
-<stop offset="0.3576" style="stop-color:#F2C352"/>
-<stop offset="0.8909" style="stop-color:#DE7600"/>
-<stop offset="1" style="stop-color:#E79A26"/>
+<stop offset="0" style="stop-color:#C2B282"/>
+<stop offset="0.3576" style="stop-color:#C2B282"/>
+<stop offset="0.8909" style="stop-color:#9B6943"/>
+<stop offset="1" style="stop-color:#AD8F60"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_filemgr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_filemgr.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_filemgr.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,15 +4,15 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.9995" y2="57.1831">
-<stop offset="0" style="stop-color:#989C9E"/>
-<stop offset="0.8182" style="stop-color:#44454A"/>
-<stop offset="1" style="stop-color:#5D5F63"/>
+<stop offset="0" style="stop-color:#9A9C9C"/>
+<stop offset="0.8182" style="stop-color:#464648"/>
+<stop offset="1" style="stop-color:#5F5F61"/>
 </linearGradient>
 <path d="M53.578,55.479c0,0.839-0.68,1.521-1.521,1.521H7.943c-0.84,0-1.521-0.681-1.521-1.521V4.521  C6.422,3.68,7.104,3,7.943,3h44.113c0.842,0,1.521,0.681,1.521,1.521V55.479z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.9995" y2="57.1831">
-<stop offset="0" style="stop-color:#D8DDE0"/>
-<stop offset="0.8182" style="stop-color:#5F6169"/>
-<stop offset="1" style="stop-color:#7D7F85"/>
+<stop offset="0" style="stop-color:#DADEDC"/>
+<stop offset="0.8182" style="stop-color:#626266"/>
+<stop offset="1" style="stop-color:#7F8083"/>
 </linearGradient>
 <path d="M52.057,3H7.943C7.104,3,6.422,3.68,6.422,4.521v50.958C6.422,56.318,7.104,57,7.943,57h44.113  c0.842,0,1.521-0.681,1.521-1.521V4.521C53.578,3.68,52.898,3,52.057,3z M52.816,55.479c0,0.419-0.34,0.76-0.76,0.76H7.943  c-0.42,0-0.76-0.341-0.76-0.76V4.521c0-0.42,0.34-0.76,0.76-0.76h44.113c0.42,0,0.76,0.34,0.76,0.76V55.479z" fill="url(#SVGID_2_)"/>
 <path d="M49.773,26.578c0,0.839-0.68,1.521-1.52,1.521H11.746c-0.84,0-1.52-0.682-1.52-1.521V8.323  c0-0.84,0.68-1.521,1.52-1.521h36.508c0.84,0,1.52,0.68,1.52,1.521V26.578z" fill="url(#SVGID_3_)"/>
@@ -33,13 +33,13 @@
 <path d="M10.227,36.464v-15.12c0-1.757,1.346-3.133,3.066-3.133h13.936  c2.424,0,2.928,2.088,3.094,2.775l-0.025,0.006c0.133,0.336,0.297,0.863,0.549,1.69c0.023,0.003,0.049,0.005,0.074,0.005  l15.703-0.001c1.738,0,3.15,1.404,3.15,3.131v10.647H10.227z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <path d="M10.986,35.704v-14.36c0-1.331,1.012-2.373,2.307-2.373h13.936  c1.824,0,2.182,1.479,2.354,2.193c0,0,0.408,1.323,0.633,2.06c0.1,0.144,0.43,0.223,0.705,0.223l15.703-0.002  c1.318,0,2.391,1.064,2.391,2.371v9.887H10.986z" fill="#020202" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30" x2="30" y1="18.1982" y2="34.3475">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="0.3273" style="stop-color:#FEE570"/>
-<stop offset="0.6485" style="stop-color:#F0C12B"/>
-<stop offset="1" style="stop-color:#E6A501"/>
+<stop offset="0" style="stop-color:#E4E0C1"/>
+<stop offset="0.3273" style="stop-color:#D3CC9B"/>
+<stop offset="0.6485" style="stop-color:#B5A366"/>
+<stop offset="1" style="stop-color:#A18046"/>
 </linearGradient>
 <path d="M46.623,23.446H30.992c0,0-1.135,0.069-1.484-0.693c-0.221-0.728-0.666-2.17-0.666-2.17  c-0.219-0.919-0.506-1.611-1.613-1.611H13.293c-0.881,0-1.547,0.722-1.547,1.611v13.6h36.508v-9.126  C48.254,24.168,47.502,23.446,46.623,23.446z" fill="url(#SVGID_7_)"/>
-<path d="M46.623,23.446H30.992c0,0-1.135,0.069-1.484-0.693c-0.221-0.728-0.666-2.17-0.666-2.17  c-0.219-0.919-0.506-1.611-1.613-1.611H13.293c-0.881,0-1.547,0.722-1.547,1.611v0.761c0-0.89,0.666-1.612,1.547-1.612h13.936  c1.107,0,1.395,0.693,1.613,1.612c0,0,0.445,1.44,0.666,2.17c0.35,0.76,1.484,0.692,1.484,0.692h15.631  c0.879,0,1.631,0.722,1.631,1.61v-0.761C48.254,24.168,47.502,23.446,46.623,23.446z" fill="#FCF3D0" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M46.623,23.446H30.992c0,0-1.135,0.069-1.484-0.693c-0.221-0.728-0.666-2.17-0.666-2.17  c-0.219-0.919-0.506-1.611-1.613-1.611H13.293c-0.881,0-1.547,0.722-1.547,1.611v0.761c0-0.89,0.666-1.612,1.547-1.612h13.936  c1.107,0,1.395,0.693,1.613,1.612c0,0,0.445,1.44,0.666,2.17c0.35,0.76,1.484,0.692,1.484,0.692h15.631  c0.879,0,1.631,0.722,1.631,1.61v-0.761C48.254,24.168,47.502,23.446,46.623,23.446z" fill="#EFEDDD" fill-opacity="0.8" stroke-opacity="0.8"/>
 <path d="M50.535,52.436c0,0.839-0.682,1.521-1.521,1.521H10.986c-0.84,0-1.521-0.682-1.521-1.521V33.421  c0-0.84,0.682-1.52,1.521-1.52h38.027c0.84,0,1.521,0.68,1.521,1.52V52.436z" fill="url(#SVGID_8_)"/>
 <path d="M10.986,56.239c-1.678,0-3.043-1.365-3.043-3.042V34.183c0-1.678,1.365-3.042,3.043-3.042  h38.027c1.678,0,3.043,1.364,3.043,3.042v19.014c0,1.677-1.365,3.042-3.043,3.042H10.986z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <path d="M10.986,55.479c-1.26,0-2.283-1.023-2.283-2.282V34.183c0-1.258,1.023-2.281,2.283-2.281  h38.027c1.258,0,2.283,1.023,2.283,2.281v19.014c0,1.259-1.025,2.282-2.283,2.282H10.986z" fill="#020202" fill-opacity="0.3" stroke-opacity="0.3"/>
@@ -57,16 +57,16 @@
 <path d="M49.014,31.901H10.986c-0.84,0-1.521,0.68-1.521,1.52v19.015c0,0.839,0.682,1.521,1.521,1.521  h38.027c0.84,0,1.521-0.682,1.521-1.521V33.421C50.535,32.581,49.854,31.901,49.014,31.901z M49.773,52.436  c0,0.419-0.34,0.761-0.76,0.761H10.986c-0.42,0-0.76-0.341-0.76-0.761V33.421c0-0.419,0.34-0.759,0.76-0.759h38.027  c0.42,0,0.76,0.34,0.76,0.759V52.436z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <polygon fill="#FFFFFF" points="20.814,31.901 22.639,37.226 37.359,37.226 39.184,31.901 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="30" x2="30" y1="31.9014" y2="36.4799">
-<stop offset="0" style="stop-color:#989C9E"/>
-<stop offset="0.8182" style="stop-color:#44454A"/>
-<stop offset="1" style="stop-color:#5D5F63"/>
+<stop offset="0" style="stop-color:#9A9C9C"/>
+<stop offset="0.8182" style="stop-color:#464648"/>
+<stop offset="1" style="stop-color:#5F5F61"/>
 </linearGradient>
 <polygon fill="url(#SVGID_12_)" points="36.846,36.464 23.154,36.464 21.635,31.901 38.365,31.901 "/>
 <polygon fill="#FFFFFF" points="21.576,6.803 23.4,11.366 36.6,11.366 38.424,6.803 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="30" x2="30" y1="6.8027" y2="10.6184">
-<stop offset="0" style="stop-color:#989C9E"/>
-<stop offset="0.8182" style="stop-color:#44454A"/>
-<stop offset="1" style="stop-color:#5D5F63"/>
+<stop offset="0" style="stop-color:#9A9C9C"/>
+<stop offset="0.8182" style="stop-color:#464648"/>
+<stop offset="1" style="stop-color:#5F5F61"/>
 </linearGradient>
 <polygon fill="url(#SVGID_13_)" points="36.084,10.605 23.916,10.605 22.395,6.803 37.605,6.803 "/>
 <rect fill="#020202" fill-opacity="0.2" height="1.522" stroke-opacity="0.2" width="36.508" x="11.746" y="30.379"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_folder.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_folder.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_folder.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,30 +4,30 @@
 <g>
 <rect fill="none" height="59.999" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2163.8232" x2="-2163.8232" y1="4093.1855" y2="4081.4014">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="0.6182" style="stop-color:#8A4117"/>
-<stop offset="1" style="stop-color:#702200"/>
+<stop offset="0" style="stop-color:#AF987C"/>
+<stop offset="0.6182" style="stop-color:#673F3A"/>
+<stop offset="1" style="stop-color:#4E2224"/>
 </linearGradient>
 <path d="M53.646,12.358c0,0-22.377,0-22.842,0c-0.463,0-1.002-0.202-1.332-1.01  c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697c-0.824,0-1.428,0.7-1.428,1.562v14.438h49.814  v-9.968C55.084,12.989,54.473,12.358,53.646,12.358z" fill="url(#SVGID_1_)"/>
-<path d="M53.646,12.358c0,0-22.377,0-22.842,0  c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697  c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236  c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489  v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" fill="#FFF7F5" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M53.646,12.358c0,0-22.377,0-22.842,0  c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697  c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236  c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489  v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" fill="#FCFAF8" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect height="8.728" width="46.906" x="6.73" y="15.817"/>
 <rect fill="#F2F2F2" height="7.271" width="45.451" x="7.457" y="16.545"/>
-<polygon fill="#231F20" fill-opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636   " stroke-opacity="0.4"/>
-<polygon fill="#231F20" fill-opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908   " stroke-opacity="0.15"/>
-<polygon fill="#231F20" fill-opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182   " stroke-opacity="0.05"/>
+<polygon fill="#222021" fill-opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636   " stroke-opacity="0.4"/>
+<polygon fill="#222021" fill-opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908   " stroke-opacity="0.15"/>
+<polygon fill="#222021" fill-opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182   " stroke-opacity="0.05"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="4048.7861" y2="4078.6064">
-<stop offset="0" style="stop-color:#C79101"/>
-<stop offset="0.0303" style="stop-color:#C79101"/>
-<stop offset="0.0364" style="stop-color:#FEEFA7"/>
-<stop offset="0.3273" style="stop-color:#FEE570"/>
-<stop offset="0.6727" style="stop-color:#F0C12B"/>
-<stop offset="1" style="stop-color:#E6A501"/>
+<stop offset="0" style="stop-color:#8C673C"/>
+<stop offset="0.0303" style="stop-color:#8C673C"/>
+<stop offset="0.0364" style="stop-color:#E4E0C1"/>
+<stop offset="0.3273" style="stop-color:#D3CC9B"/>
+<stop offset="0.6727" style="stop-color:#B5A366"/>
+<stop offset="1" style="stop-color:#A18046"/>
 </linearGradient>
 <path d="M56.273,22.362H3.727C2.191,22.362,2,24.065,2,24.065l2.549,25.934  c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184L58,24.065  C58,24.065,57.809,22.362,56.273,22.362z" fill="url(#SVGID_2_)"/>
-<path d="M3.727,23.091h52.547c1.178,0,1.563,0.995,1.68,1.464L58,24.065c0,0-0.191-1.703-1.727-1.703H3.727  C2.191,22.362,2,24.065,2,24.065l0.047,0.489C2.164,24.086,2.549,23.091,3.727,23.091z" fill="#FCF3D0"/>
+<path d="M3.727,23.091h52.547c1.178,0,1.563,0.995,1.68,1.464L58,24.065c0,0-0.191-1.703-1.727-1.703H3.727  C2.191,22.362,2,24.065,2,24.065l0.047,0.489C2.164,24.086,2.549,23.091,3.727,23.091z" fill="#EFEDDD"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0166" x2="-2164.0166" y1="4048.7861" y2="4053.1504">
-<stop offset="0" style="stop-color:#FCDA5E"/>
-<stop offset="1" style="stop-color:#FFB418"/>
+<stop offset="0" style="stop-color:#CDC18D"/>
+<stop offset="1" style="stop-color:#BA9D5D"/>
 </linearGradient>
 <path d="M4.334,47.818l0.215,2.181  c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184l0.184-2.181H4.334z" fill="url(#SVGID_3_)" fill-opacity="0.25" stroke-opacity="0.25"/>
 <rect fill="none" height="59.999" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friend.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friend.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friend.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,73 +2,73 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
-<path d="M6.917,52.783v-1.5c0-4.818,2.172-8.519,6.283-10.699  c1.059-0.564,3.787-1.602,6.194-2.518c0.87-0.33,1.66-0.631,2.299-0.881l0.986-0.43c0.268-0.776,0.156-2.01-0.009-2.316l-0.609-0.99  l0.006-0.005c-0.477-0.811-0.928-1.653-1.347-2.516c-1.481-0.104-2.916-1.358-3.614-3.185c-0.731-1.911-0.45-3.901,0.643-4.98  c-0.984-4.118-0.784-7.288,0.595-9.426c0.821-1.273,2.087-2.172,3.585-2.55c1.423-1.708,3.591-3.575,7.675-3.575  c4.679,0.156,8.319,1.761,10.55,4.641c2.173,2.806,2.864,6.706,1.954,11.001c1.044,1.116,1.256,3.072,0.488,4.962  c-0.677,1.671-1.935,2.824-3.292,3.062c-0.272,0.561-0.566,1.127-0.875,1.689c-0.381,0.694-0.74,1.304-1.099,1.863  c-0.177,0.303-0.299,1.717,0.037,2.46l1.25,0.499l1.473,0.547c2.69,0.999,5.678,2.108,6.696,2.639  c1.05,0.547,6.29,3.635,6.289,10.707v1.5H6.917z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M7.667,52.033v-0.75c0-4.523,2.035-7.994,5.884-10.037  c1.021-0.544,3.739-1.577,6.136-2.489c0.844-0.32,1.638-0.622,2.279-0.873l1.283-0.559c0.522-1,0.371-2.794,0.048-3.299  l-0.151-0.245l-0.104-0.169c0,0-1.311-2.285-1.853-3.443c-0.088,0.012-0.178,0.017-0.268,0.017c-1.243,0-2.495-1.089-3.115-2.71  c-0.702-1.834-0.35-3.688,0.783-4.433c-1.058-4.136-0.93-7.262,0.384-9.298c0.764-1.185,1.954-1.988,3.373-2.283  c1.427-1.767,3.432-3.499,7.257-3.499c4.433,0.148,7.868,1.652,9.958,4.351c2.067,2.669,2.696,6.425,1.771,10.577  c0,0-0.016,0.081-0.049,0.229c1.057,0.794,1.344,2.627,0.617,4.417c-0.635,1.568-1.874,2.625-3.092,2.64  c-0.316,0.673-0.664,1.354-1.037,2.032c-0.373,0.68-0.724,1.274-1.073,1.82c-0.352,0.6-0.471,2.557,0.146,3.464l1.495,0.596  l1.488,0.554c2.507,0.931,5.627,2.088,6.611,2.601s5.887,3.408,5.886,10.042v0.75H7.667z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M6.917,52.783v-1.5c0-4.818,2.172-8.519,6.283-10.699  c1.059-0.564,3.787-1.602,6.194-2.518c0.87-0.33,1.66-0.631,2.299-0.881l0.986-0.43c0.268-0.776,0.156-2.01-0.009-2.316l-0.609-0.99  l0.006-0.005c-0.477-0.811-0.928-1.653-1.347-2.516c-1.481-0.104-2.916-1.358-3.614-3.185c-0.731-1.911-0.45-3.901,0.643-4.98  c-0.984-4.118-0.784-7.288,0.595-9.426c0.821-1.273,2.087-2.172,3.585-2.55c1.423-1.708,3.591-3.575,7.675-3.575  c4.679,0.156,8.319,1.761,10.55,4.641c2.173,2.806,2.864,6.706,1.954,11.001c1.044,1.116,1.256,3.072,0.488,4.962  c-0.677,1.671-1.935,2.824-3.292,3.062c-0.272,0.561-0.566,1.127-0.875,1.689c-0.381,0.694-0.74,1.304-1.099,1.863  c-0.177,0.303-0.299,1.717,0.037,2.46l1.25,0.499l1.473,0.547c2.69,0.999,5.678,2.108,6.696,2.639  c1.05,0.547,6.29,3.635,6.289,10.707v1.5H6.917z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M7.667,52.033v-0.75c0-4.523,2.035-7.994,5.884-10.037  c1.021-0.544,3.739-1.577,6.136-2.489c0.844-0.32,1.638-0.622,2.279-0.873l1.283-0.559c0.522-1,0.371-2.794,0.048-3.299  l-0.151-0.245l-0.104-0.169c0,0-1.311-2.285-1.853-3.443c-0.088,0.012-0.178,0.017-0.268,0.017c-1.243,0-2.495-1.089-3.115-2.71  c-0.702-1.834-0.35-3.688,0.783-4.433c-1.058-4.136-0.93-7.262,0.384-9.298c0.764-1.185,1.954-1.988,3.373-2.283  c1.427-1.767,3.432-3.499,7.257-3.499c4.433,0.148,7.868,1.652,9.958,4.351c2.067,2.669,2.696,6.425,1.771,10.577  c0,0-0.016,0.081-0.049,0.229c1.057,0.794,1.344,2.627,0.617,4.417c-0.635,1.568-1.874,2.625-3.092,2.64  c-0.316,0.673-0.664,1.354-1.037,2.032c-0.373,0.68-0.724,1.274-1.073,1.82c-0.352,0.6-0.471,2.557,0.146,3.464l1.495,0.596  l1.488,0.554c2.507,0.931,5.627,2.088,6.611,2.601s5.887,3.408,5.886,10.042v0.75H7.667z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
 <rect fill="none" height="60" width="60"/>
-<path d="M34.994,27.07c0.014-0.011,0.029-0.026,0.041-0.038  c0.002,0.009,0.005,0.016,0.008,0.026C35.025,27.061,35.012,27.068,34.994,27.07z M38.518,22.661L38.518,22.661  c-0.018-0.003-0.041-0.014-0.061-0.015C38.477,22.646,38.499,22.657,38.518,22.661z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M34.994,27.07c0.014-0.011,0.029-0.026,0.041-0.038  c0.002,0.009,0.005,0.016,0.008,0.026C35.025,27.061,35.012,27.068,34.994,27.07z M38.518,22.661L38.518,22.661  c-0.018-0.003-0.041-0.014-0.061-0.015C38.477,22.646,38.499,22.657,38.518,22.661z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15"/>
 <radialGradient cx="297.79" cy="-375.7397" gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="16.2293">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.2" style="stop-color:#FFA98E"/>
-<stop offset="0.96" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+<stop offset="0" style="stop-color:#DDC4B0"/>
+<stop offset="0.2" style="stop-color:#DDC4B0"/>
+<stop offset="0.96" style="stop-color:#A57665"/>
+<stop offset="1" style="stop-color:#A57665"/>
 </radialGradient>
 <path d="M36.914,38.52c-1.525-0.664-1.477-3.914-0.848-4.897c0.108-0.171,0.209-0.345,0.314-0.515H23.614  c0.105,0.17,0.204,0.344,0.314,0.515c0.63,0.983,0.679,4.233-0.848,4.897c-1.527,0.662,7.098,6.437,7.098,6.437  S38.441,39.182,36.914,38.52z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="297.4756" x2="297.4756" y1="-367.9355" y2="-381.3027">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.39" style="stop-color:#2D9BD2"/>
-<stop offset="0.89" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.39" style="stop-color:#5F8BA1"/>
+<stop offset="0.89" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M46.094,41.906c-1.605-0.834-9.564-3.621-9.715-3.795L30.3,43.163l-6.531-5.247  c-0.18,0.27-8.046,3.023-9.866,3.992c-2.083,1.105-5.486,3.646-5.486,9.375h43.158C51.576,45.555,47.695,42.742,46.094,41.906z" fill="url(#SVGID_2_)"/>
 <polygon fill="#020202" fill-opacity="0.3" points="22.282,38.564 30.3,44.955 37.832,38.695 36.379,38.111   30.3,43.163 23.77,37.916 " stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="9.5718" x2="22.6592" y1="45.0781" y2="45.0781">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
 </linearGradient>
 <path d="M22.659,39.577c0,0-11.44,2.987-11.44,11.002c0,0-1.635,0.001-1.647,0  C9.572,45.65,13.418,41.818,22.659,39.577z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="37.1855" x2="50.2734" y1="44.8936" y2="44.8936">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
 </linearGradient>
 <path d="M37.186,39.393c0,0,11.441,2.986,11.441,11.002c0,0,1.637,0,1.646,0  C50.273,45.465,46.428,41.633,37.186,39.393z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="297.5371" x2="297.5371" y1="-375.5508" y2="-368.1697">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5_)" points="30.3,44.955 22.281,38.564 21.815,38.77 30.3,45.531 38.3,38.879 37.834,38.691 "/>
 <radialGradient cx="298.5801" cy="-345.8398" gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.7801">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.51" style="stop-color:#FFC6B3"/>
-<stop offset="0.76" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+<stop offset="0" style="stop-color:#F4EDE4"/>
+<stop offset="0.51" style="stop-color:#E8D9CA"/>
+<stop offset="0.76" style="stop-color:#DDC4B0"/>
+<stop offset="1" style="stop-color:#BF9C89"/>
 </radialGradient>
 <path d="M40.584,23.573c-0.055-0.026-0.113-0.03-0.17-0.046c0-0.001,0-0.002,0-0.002  c-0.012-0.002-0.021-0.004-0.033-0.007c-0.084-0.021-0.168-0.041-0.256-0.045c-10.658-1.854-15.548-7.759-15.916-6.195  c-0.294,1.244-3.281,3.935-4.847,5.276c0.013,0.06,0.02,0.114,0.034,0.174c0,0,0.056,0.275,0.174,0.744  c-0.125,0.013-0.246,0.039-0.365,0.089c-0.995,0.42-1.308,2.053-0.698,3.647c0.61,1.594,1.913,2.548,2.909,2.13  c0.061-0.027,0.113-0.071,0.169-0.107c0.579,1.301,1.289,2.697,2.159,4.094c1.458,1.731,3.691,3.766,6.157,3.766  c2.983,0,4.808-1.633,6.063-3.278c0.031-0.068,0.063-0.133,0.103-0.189c0.931-1.453,1.684-2.911,2.293-4.268  c0.975,0.337,2.226-0.569,2.846-2.102C41.85,25.666,41.57,24.017,40.584,23.573z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="293.6279" x2="302.8386" y1="-368.1089" y2="-358.9682">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+<stop offset="0" style="stop-color:#E8D9CA"/>
+<stop offset="1" style="stop-color:#DDC4B0"/>
 </linearGradient>
 <path d="M29.463,36.254c-1.816,0-3.646-0.846-4.993-2.121c1.425,1.498,3.343,2.957,5.432,2.957  c2.982,0,4.809-1.633,6.064-3.279c0.031-0.067,0.063-0.133,0.101-0.188c0.932-1.453,1.684-2.911,2.295-4.268  C34.967,35.283,32.447,36.254,29.463,36.254z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="297.2969" x2="297.2969" y1="-338.9307" y2="-352.4902">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.38" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.38" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M29.603,8.713c-3.695,0-5.473,1.68-6.845,3.436c-2.23,0.345-5.768,2.39-3.27,11.35  c1.565-1.341,4.427-4.978,4.722-6.222c0.371-1.577,5.343,4.451,16.205,6.248c0.127-0.501,0.185-0.797,0.185-0.797  C42.305,15.077,38.594,9.014,29.603,8.713z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="301.9326" x2="289.6528" y1="-351.9048" y2="-344.6049">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.36" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.36" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M24.221,16.543c0,0,5.316,6.983,16.117,6.971C40.338,23.514,35.251,22.716,24.221,16.543z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="288.5391" x2="288.6491" y1="-343.1895" y2="-350.9899">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.38" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.38" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M22.943,12.668c0,0-5.204,0.312-3.273,9.132C19.67,21.8,19.034,15.76,22.943,12.668z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="299.0225" x2="298.6326" y1="-340.0913" y2="-343.6304">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+<stop offset="0" style="stop-color:#8D7B6A"/>
+<stop offset="1" style="stop-color:#451F1E"/>
 </linearGradient>
 <path d="M32.126,13.891c-2.423-0.346-6.521-2.493-8.129-1.726c0,0,5.26-6,14.538,0.831  C38.535,12.997,36.326,14.489,32.126,13.891z" fill="url(#SVGID_11_)"/>
 <rect fill="none" height="59.996" width="59.996"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friends.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friends.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friends.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,199 +4,199 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-70.4854" cy="-5.0225" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="12.778">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.2" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+<stop offset="0" style="stop-color:#DDC4B0"/>
+<stop offset="0.2" style="stop-color:#DDC4B0"/>
+<stop offset="0.9628" style="stop-color:#A57665"/>
+<stop offset="1" style="stop-color:#A57665"/>
 </radialGradient>
 <path d="M48.205,37.917c-1.123-0.489-1.088-2.883-0.625-3.606c0.08-0.126,0.152-0.253,0.23-0.381h-9.4  c0.076,0.128,0.148,0.255,0.23,0.381c0.465,0.724,0.5,3.117-0.623,3.606c-1.125,0.487,5.227,4.738,5.227,4.738  S49.328,38.404,48.205,37.917z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="43.1104" x2="43.1104" y1="37.4727" y2="47.3145">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M54.961,40.41c-1.182-0.614-7.041-2.667-7.15-2.795l-4.477,3.722l-4.811-3.864  c-0.133,0.198-5.924,2.227-7.264,2.938c-1.535,0.815-4.039,2.687-4.039,6.904H59C59,43.097,56.145,41.025,54.961,40.41z" fill="url(#SVGID_2_)"/>
 <polygon fill="#020202" fill-opacity="0.3" points="37.43,37.952 43.334,42.655 48.879,38.047 47.811,37.615 43.334,41.337   38.523,37.473 " stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="28.0684" x2="37.707" y1="42.7466" y2="42.7466">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
 </linearGradient>
 <path d="M37.707,38.696c0,0-8.424,2.199-8.424,8.1c0,0-1.205,0.002-1.215,0  C28.068,43.167,30.902,40.347,37.707,38.696z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="48.4043" x2="58.041" y1="42.6099" y2="42.6099">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
 </linearGradient>
 <path d="M48.404,38.56c0,0,8.424,2.199,8.424,8.101c0,0,1.203,0,1.213,0  C58.041,43.029,55.209,40.211,48.404,38.56z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="43.1553" x2="43.1553" y1="43.0781" y2="37.6438">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5_)" points="43.334,42.655 37.428,37.952 37.086,38.1 43.334,43.078 49.225,38.182 48.881,38.042 "/>
 <radialGradient cx="-69.8633" cy="-28.6533" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="17.154">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+<stop offset="0" style="stop-color:#F4EDE4"/>
+<stop offset="0.5091" style="stop-color:#E8D9CA"/>
+<stop offset="0.7636" style="stop-color:#DDC4B0"/>
+<stop offset="1" style="stop-color:#BF9C89"/>
 </radialGradient>
 <path d="M50.906,26.909c-0.039-0.017-0.084-0.02-0.125-0.033v-0.002c-0.008-0.002-0.014-0.002-0.025-0.005  c-0.061-0.017-0.123-0.029-0.186-0.034c-7.85-1.364-11.451-5.712-11.723-4.563c-0.217,0.918-2.416,2.9-3.568,3.886  c0.008,0.047,0.016,0.086,0.023,0.129c0,0,0.043,0.203,0.129,0.548c-0.092,0.01-0.182,0.029-0.268,0.066  c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078  c0.428,0.957,0.951,1.985,1.594,3.013c1.074,1.279,2.717,2.775,4.531,2.775c2.197,0,3.541-1.204,4.467-2.413  c0.023-0.053,0.047-0.101,0.074-0.141c0.684-1.071,1.24-2.146,1.689-3.144c0.717,0.248,1.637-0.419,2.094-1.547  C51.838,28.452,51.633,27.236,50.906,26.909z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="40.2764" x2="47.0569" y1="37.6001" y2="30.8725">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+<stop offset="0" style="stop-color:#E8D9CA"/>
+<stop offset="1" style="stop-color:#DDC4B0"/>
 </linearGradient>
 <path d="M42.719,36.249c-1.34,0-2.686-0.624-3.68-1.562c1.051,1.103,2.463,2.177,4,2.177  c2.197,0,3.541-1.204,4.467-2.413c0.023-0.053,0.047-0.101,0.074-0.141c0.684-1.071,1.24-2.146,1.689-3.144  C46.77,35.533,44.914,36.249,42.719,36.249z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="42.9766" x2="42.9766" y1="16.1133" y2="26.0988">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3758" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M42.818,15.967c-2.721,0-4.029,1.238-5.039,2.53c-1.645,0.254-4.246,1.762-2.408,8.359  c1.152-0.988,3.26-3.666,3.477-4.584c0.273-1.16,3.936,3.278,11.934,4.602c0.094-0.368,0.137-0.587,0.137-0.587  C52.172,20.654,49.439,16.188,42.818,15.967z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="46.3916" x2="37.3443" y1="25.6675" y2="20.2965">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3636" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M38.855,21.734c0,0,3.916,5.142,11.869,5.133C50.725,26.867,46.98,26.279,38.855,21.734z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="36.5283" x2="36.6077" y1="19.2515" y2="24.9963">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3758" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M37.916,18.881c0,0-3.834,0.23-2.412,6.725C35.504,25.605,35.037,21.157,37.916,18.881z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="44.2432" x2="43.9615" y1="16.9707" y2="19.5749">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+<stop offset="0" style="stop-color:#8D7B6A"/>
+<stop offset="1" style="stop-color:#451F1E"/>
 </linearGradient>
 <path d="M44.678,19.781c-1.785-0.255-4.803-1.836-5.986-1.272c0,0,3.873-4.417,10.705,0.612  C49.396,19.121,47.77,20.221,44.678,19.781z" fill="url(#SVGID_11_)"/>
 <radialGradient cx="-98.5264" cy="-5.0225" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="12.778">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.2" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+<stop offset="0" style="stop-color:#DDC4B0"/>
+<stop offset="0.2" style="stop-color:#DDC4B0"/>
+<stop offset="0.9628" style="stop-color:#A57665"/>
+<stop offset="1" style="stop-color:#A57665"/>
 </radialGradient>
 <path d="M21.984,37.917c-1.125-0.489-1.088-2.883-0.625-3.606c0.08-0.126,0.154-0.253,0.234-0.381h-9.402  c0.076,0.128,0.15,0.255,0.23,0.381c0.465,0.724,0.498,3.117-0.625,3.606c-1.125,0.487,5.227,4.738,5.227,4.738  S23.109,38.404,21.984,37.917z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="16.8906" x2="16.8906" y1="37.4727" y2="47.3145">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M28.742,40.41c-1.182-0.614-7.041-2.667-7.15-2.795l-4.477,3.722l-4.811-3.864  c-0.133,0.198-5.926,2.227-7.266,2.938C3.506,41.226,1,43.097,1,47.314h31.781C32.781,43.097,29.924,41.025,28.742,40.41z" fill="url(#SVGID_13_)"/>
 <polygon fill="#020202" fill-opacity="0.3" points="11.209,37.952 17.115,42.655 22.66,38.047 21.592,37.615 17.115,41.337   12.305,37.473 " stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="1.8496" x2="11.4883" y1="42.7466" y2="42.7466">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
 </linearGradient>
 <path d="M11.488,38.696c0,0-8.426,2.199-8.426,8.1c0,0-1.203,0.002-1.213,0  C1.85,43.167,4.682,40.347,11.488,38.696z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.1836" x2="31.8223" y1="42.6099" y2="42.6099">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
 </linearGradient>
 <path d="M22.184,38.56c0,0,8.424,2.199,8.424,8.101c0,0,1.205,0,1.215,0  C31.822,43.029,28.99,40.211,22.184,38.56z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="16.9346" x2="16.9346" y1="43.0781" y2="37.6438">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
 </linearGradient>
 <polygon fill="url(#SVGID_16_)" points="17.115,42.655 11.209,37.952 10.865,38.1 17.115,43.078 23.004,38.182 22.662,38.042 "/>
 <radialGradient cx="-97.9023" cy="-28.6533" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_17_" r="17.154">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+<stop offset="0" style="stop-color:#F4EDE4"/>
+<stop offset="0.5091" style="stop-color:#E8D9CA"/>
+<stop offset="0.7636" style="stop-color:#DDC4B0"/>
+<stop offset="1" style="stop-color:#BF9C89"/>
 </radialGradient>
 <path d="M24.686,26.909c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002c-0.012-0.002-0.016-0.002-0.025-0.005  c-0.061-0.017-0.123-0.029-0.188-0.034c-7.848-1.364-11.451-5.712-11.721-4.563c-0.217,0.918-2.416,2.9-3.57,3.886  c0.01,0.047,0.016,0.086,0.025,0.129c0,0,0.041,0.203,0.127,0.548c-0.09,0.01-0.18,0.029-0.268,0.066  c-0.73,0.308-0.963,1.511-0.512,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.045-0.019,0.084-0.051,0.123-0.078  c0.428,0.957,0.951,1.985,1.59,3.013c1.076,1.279,2.719,2.775,4.535,2.775c2.197,0,3.541-1.204,4.467-2.413  c0.023-0.053,0.045-0.101,0.072-0.141c0.684-1.071,1.242-2.146,1.689-3.144c0.719,0.248,1.637-0.419,2.096-1.547  C25.617,28.452,25.414,27.236,24.686,26.909z" fill="url(#SVGID_17_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="14.0576" x2="20.8372" y1="37.5996" y2="30.873">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+<stop offset="0" style="stop-color:#E8D9CA"/>
+<stop offset="1" style="stop-color:#DDC4B0"/>
 </linearGradient>
 <path d="M16.5,36.249c-1.34,0-2.688-0.624-3.68-1.562c1.051,1.103,2.463,2.177,4,2.177  c2.197,0,3.541-1.204,4.467-2.413c0.023-0.053,0.045-0.101,0.072-0.141c0.684-1.071,1.242-2.146,1.689-3.144  C20.551,35.533,18.695,36.249,16.5,36.249z" fill="url(#SVGID_18_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="16.7578" x2="16.7578" y1="16.1133" y2="26.0988">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3758" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M16.6,15.967c-2.721,0-4.031,1.238-5.039,2.53c-1.645,0.254-4.25,1.762-2.408,8.359  c1.15-0.988,3.26-3.666,3.477-4.584c0.273-1.16,3.936,3.278,11.934,4.602c0.092-0.368,0.137-0.587,0.137-0.587  C25.955,20.654,23.221,16.188,16.6,15.967z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="20.1719" x2="11.1239" y1="25.6675" y2="20.2961">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3636" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M12.637,21.734c0,0,3.914,5.142,11.869,5.133C24.506,26.867,20.762,26.279,12.637,21.734z" fill="url(#SVGID_20_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="10.3096" x2="10.389" y1="19.2515" y2="24.9963">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3758" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M11.697,18.881c0,0-3.834,0.23-2.412,6.725C9.285,25.605,8.818,21.157,11.697,18.881z" fill="url(#SVGID_21_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="18.0244" x2="17.7427" y1="16.9707" y2="19.5754">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+<stop offset="0" style="stop-color:#8D7B6A"/>
+<stop offset="1" style="stop-color:#451F1E"/>
 </linearGradient>
 <path d="M18.457,19.781c-1.783-0.255-4.803-1.836-5.984-1.272c0,0,3.873-4.417,10.705,0.612  C23.178,19.121,21.549,20.221,18.457,19.781z" fill="url(#SVGID_22_)"/>
-<path d="M47.916,41.694c-1.092-0.569-4.482-1.827-7.205-2.838l-1.533-0.569l-0.273-0.11l-0.359-0.139  l-0.686-0.275l-0.424,0.186c0,0-0.006,0.002-0.008,0.004h-0.002c-1.777,0.695-5.18,1.935-6.166,2.458  c-0.385,0.206-0.832,0.477-1.283,0.835c-0.475-0.392-0.914-0.667-1.234-0.835c-0.85-0.439-4.098-1.619-5.91-2.299l-0.17-0.069  l-0.004,0.005l-0.752-0.304l-0.684,0.299c-0.668,0.263-1.492,0.576-2.373,0.911l-0.08,0.031c-2.607,0.99-5.561,2.113-6.693,2.715  c-2.535,1.346-4.359,3.248-5.438,5.615h20.582h5.561h20.494C51.592,43.797,48.686,42.094,47.916,41.694z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M17.193,22.325c-1.205,1.026-1.531,3.083-0.748,5.124c0.732,1.925,2.256,3.218,3.783,3.218  h0.002c0.23,0.475,0.467,0.945,0.713,1.408h-0.07l0.584,0.965c0,0,0.15,0.248,0.33,0.545c0.486-0.827,0.914-1.646,1.262-2.418  c0.719,0.248,1.637-0.419,2.096-1.547c0.473-1.168,0.27-2.384-0.459-2.711c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002  c-0.012-0.002-0.016-0.002-0.025-0.005c-0.061-0.017-0.123-0.029-0.188-0.034c-0.014-0.002-0.027-0.006-0.041-0.008  c-0.029-0.006-0.07-0.015-0.105-0.023c0.121,0.023,0.232,0.049,0.359,0.07c0.092-0.368,0.137-0.587,0.137-0.587  c1.256-5.633-1.479-10.1-8.1-10.32c-0.012,0-0.021,0.003-0.033,0.003C16.395,17.765,16.594,19.881,17.193,22.325z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M37.779,18.497c-1.645,0.254-4.246,1.76-2.41,8.354c-0.068,0.01-0.139,0.023-0.205,0.051  c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078  c0.359,0.799,0.787,1.648,1.289,2.504c0.564-0.949,1.1-1.934,1.586-2.947c1.395-0.166,2.754-1.375,3.457-3.109  c0.801-1.979,0.545-4.035-0.584-5.104c0.504-2.285,0.584-4.463,0.252-6.444c-0.033-0.002-0.063-0.006-0.096-0.009  C40.098,15.967,38.789,17.205,37.779,18.497z M35.381,26.849c0.014-0.014,0.029-0.027,0.043-0.041  c0.002,0.01,0.004,0.018,0.008,0.027C35.414,26.837,35.396,26.845,35.381,26.849z M39.174,22.101L39.174,22.101  c-0.02-0.004-0.047-0.015-0.066-0.018C39.127,22.086,39.152,22.097,39.174,22.101z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M47.621,42.258c-1.053-0.549-4.424-1.8-7.133-2.807l-1.549-0.574l-0.264-0.108l-0.369-0.142  l-1.045-0.418c-0.033-0.047-0.057-0.107-0.088-0.16c-1.826,0.708-4.971,1.86-5.914,2.361c-0.385,0.206-0.832,0.477-1.283,0.835  c-0.475-0.392-0.914-0.667-1.234-0.835c-0.85-0.439-4.098-1.619-5.91-2.299l-0.092-0.037l-1.285,0.56  c-0.689,0.271-1.549,0.597-2.461,0.943c-2.59,0.986-5.525,2.101-6.619,2.681c-2.309,1.226-4,2.936-5.035,5.057h19.881h5.561h19.785  C50.957,44.163,48.33,42.626,47.621,42.258z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M17.037,27.223c0.641,1.68,1.924,2.807,3.191,2.807c0.131,0,0.264-0.012,0.391-0.037  c0.432,0.934,0.9,1.844,1.398,2.719H22l0.146,0.241c0.334-0.609,0.645-1.212,0.902-1.785c0.719,0.248,1.637-0.419,2.096-1.547  c0.473-1.168,0.27-2.384-0.459-2.711c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002c-0.012-0.002-0.016-0.002-0.025-0.005  c-0.061-0.017-0.123-0.029-0.188-0.034c-0.014-0.002-0.027-0.006-0.041-0.008c-0.029-0.006-0.07-0.015-0.105-0.023  c0.121,0.023,0.232,0.049,0.359,0.07c0.092-0.368,0.137-0.587,0.137-0.587c1.215-5.457-1.322-9.807-7.5-10.273  c-0.182,1.82,0.049,4.01,0.717,6.578C16.682,23.301,16.289,25.27,17.037,27.223z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M37.779,18.497c-1.645,0.254-4.246,1.76-2.41,8.354c-0.068,0.01-0.139,0.023-0.205,0.051  c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078  c0.268,0.6,0.576,1.224,0.924,1.861c0.551-0.946,1.072-1.918,1.541-2.922c0.025,0.002,0.055,0.002,0.082,0.002  c1.25,0,2.533-1.101,3.195-2.734c0.773-1.902,0.453-3.844-0.701-4.617c0.053-0.229,0.078-0.355,0.078-0.355  c0.502-2.247,0.574-4.381,0.238-6.312C39.926,16.158,38.717,17.299,37.779,18.497z M35.381,26.849  c0.014-0.014,0.029-0.027,0.043-0.041c0.002,0.01,0.004,0.018,0.008,0.027C35.414,26.837,35.396,26.845,35.381,26.849z   M39.174,22.101L39.174,22.101c-0.02-0.004-0.047-0.015-0.066-0.018C39.127,22.086,39.152,22.097,39.174,22.101z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M47.916,41.694c-1.092-0.569-4.482-1.827-7.205-2.838l-1.533-0.569l-0.273-0.11l-0.359-0.139  l-0.686-0.275l-0.424,0.186c0,0-0.006,0.002-0.008,0.004h-0.002c-1.777,0.695-5.18,1.935-6.166,2.458  c-0.385,0.206-0.832,0.477-1.283,0.835c-0.475-0.392-0.914-0.667-1.234-0.835c-0.85-0.439-4.098-1.619-5.91-2.299l-0.17-0.069  l-0.004,0.005l-0.752-0.304l-0.684,0.299c-0.668,0.263-1.492,0.576-2.373,0.911l-0.08,0.031c-2.607,0.99-5.561,2.113-6.693,2.715  c-2.535,1.346-4.359,3.248-5.438,5.615h20.582h5.561h20.494C51.592,43.797,48.686,42.094,47.916,41.694z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M17.193,22.325c-1.205,1.026-1.531,3.083-0.748,5.124c0.732,1.925,2.256,3.218,3.783,3.218  h0.002c0.23,0.475,0.467,0.945,0.713,1.408h-0.07l0.584,0.965c0,0,0.15,0.248,0.33,0.545c0.486-0.827,0.914-1.646,1.262-2.418  c0.719,0.248,1.637-0.419,2.096-1.547c0.473-1.168,0.27-2.384-0.459-2.711c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002  c-0.012-0.002-0.016-0.002-0.025-0.005c-0.061-0.017-0.123-0.029-0.188-0.034c-0.014-0.002-0.027-0.006-0.041-0.008  c-0.029-0.006-0.07-0.015-0.105-0.023c0.121,0.023,0.232,0.049,0.359,0.07c0.092-0.368,0.137-0.587,0.137-0.587  c1.256-5.633-1.479-10.1-8.1-10.32c-0.012,0-0.021,0.003-0.033,0.003C16.395,17.765,16.594,19.881,17.193,22.325z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M37.779,18.497c-1.645,0.254-4.246,1.76-2.41,8.354c-0.068,0.01-0.139,0.023-0.205,0.051  c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078  c0.359,0.799,0.787,1.648,1.289,2.504c0.564-0.949,1.1-1.934,1.586-2.947c1.395-0.166,2.754-1.375,3.457-3.109  c0.801-1.979,0.545-4.035-0.584-5.104c0.504-2.285,0.584-4.463,0.252-6.444c-0.033-0.002-0.063-0.006-0.096-0.009  C40.098,15.967,38.789,17.205,37.779,18.497z M35.381,26.849c0.014-0.014,0.029-0.027,0.043-0.041  c0.002,0.01,0.004,0.018,0.008,0.027C35.414,26.837,35.396,26.845,35.381,26.849z M39.174,22.101L39.174,22.101  c-0.02-0.004-0.047-0.015-0.066-0.018C39.127,22.086,39.152,22.097,39.174,22.101z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M47.621,42.258c-1.053-0.549-4.424-1.8-7.133-2.807l-1.549-0.574l-0.264-0.108l-0.369-0.142  l-1.045-0.418c-0.033-0.047-0.057-0.107-0.088-0.16c-1.826,0.708-4.971,1.86-5.914,2.361c-0.385,0.206-0.832,0.477-1.283,0.835  c-0.475-0.392-0.914-0.667-1.234-0.835c-0.85-0.439-4.098-1.619-5.91-2.299l-0.092-0.037l-1.285,0.56  c-0.689,0.271-1.549,0.597-2.461,0.943c-2.59,0.986-5.525,2.101-6.619,2.681c-2.309,1.226-4,2.936-5.035,5.057h19.881h5.561h19.785  C50.957,44.163,48.33,42.626,47.621,42.258z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M17.037,27.223c0.641,1.68,1.924,2.807,3.191,2.807c0.131,0,0.264-0.012,0.391-0.037  c0.432,0.934,0.9,1.844,1.398,2.719H22l0.146,0.241c0.334-0.609,0.645-1.212,0.902-1.785c0.719,0.248,1.637-0.419,2.096-1.547  c0.473-1.168,0.27-2.384-0.459-2.711c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002c-0.012-0.002-0.016-0.002-0.025-0.005  c-0.061-0.017-0.123-0.029-0.188-0.034c-0.014-0.002-0.027-0.006-0.041-0.008c-0.029-0.006-0.07-0.015-0.105-0.023  c0.121,0.023,0.232,0.049,0.359,0.07c0.092-0.368,0.137-0.587,0.137-0.587c1.215-5.457-1.322-9.807-7.5-10.273  c-0.182,1.82,0.049,4.01,0.717,6.578C16.682,23.301,16.289,25.27,17.037,27.223z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M37.779,18.497c-1.645,0.254-4.246,1.76-2.41,8.354c-0.068,0.01-0.139,0.023-0.205,0.051  c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078  c0.268,0.6,0.576,1.224,0.924,1.861c0.551-0.946,1.072-1.918,1.541-2.922c0.025,0.002,0.055,0.002,0.082,0.002  c1.25,0,2.533-1.101,3.195-2.734c0.773-1.902,0.453-3.844-0.701-4.617c0.053-0.229,0.078-0.355,0.078-0.355  c0.502-2.247,0.574-4.381,0.238-6.312C39.926,16.158,38.717,17.299,37.779,18.497z M35.381,26.849  c0.014-0.014,0.029-0.027,0.043-0.041c0.002,0.01,0.004,0.018,0.008,0.027C35.414,26.837,35.396,26.845,35.381,26.849z   M39.174,22.101L39.174,22.101c-0.02-0.004-0.047-0.015-0.066-0.018C39.127,22.086,39.152,22.097,39.174,22.101z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="-84.3965" cy="-1.04" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_23_" r="18.6813">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.2" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+<stop offset="0" style="stop-color:#DDC4B0"/>
+<stop offset="0.2" style="stop-color:#DDC4B0"/>
+<stop offset="0.9628" style="stop-color:#A57665"/>
+<stop offset="1" style="stop-color:#A57665"/>
 </radialGradient>
 <path d="M37.447,39.174c-1.643-0.715-1.59-4.214-0.912-5.273c0.117-0.186,0.225-0.37,0.338-0.554H23.129  c0.113,0.184,0.219,0.368,0.338,0.554c0.678,1.06,0.73,4.559-0.914,5.273c-1.645,0.713,7.641,6.929,7.641,6.929  S39.092,39.887,37.447,39.174z" fill="url(#SVGID_23_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="30.001" x2="30.001" y1="38.5244" y2="52.9141">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#BA1212"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="1" style="stop-color:#88444B"/>
 </linearGradient>
 <path d="M47.33,42.822c-1.729-0.9-10.297-3.901-10.459-4.089l-6.545,5.439l-7.031-5.648  c-0.193,0.289-8.662,3.257-10.621,4.298c-2.242,1.189-5.906,3.925-5.906,10.092h46.467C53.234,46.747,49.057,43.719,47.33,42.822z" fill="url(#SVGID_24_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="30.0654" x2="30.0654" y1="37.5811" y2="45.9985">
-<stop offset="0" style="stop-color:#BC1C24"/>
-<stop offset="1" style="stop-color:#6B1C24"/>
+<stop offset="0" style="stop-color:#8C4C54"/>
+<stop offset="1" style="stop-color:#53343E"/>
 </linearGradient>
 <polygon fill="url(#SVGID_25_)" points="21.695,39.225 30.326,46.103 38.436,39.365 36.871,38.733 30.326,44.173 23.295,38.524 "/>
-<path d="M22.1,40.313c0,0-12.316,3.215-12.316,11.844c0,0-1.76,0.002-1.775,0C8.008,46.851,12.15,42.725,22.1,40.313  z" fill="#FF7B56"/>
-<path d="M37.74,40.113c0,0,12.316,3.218,12.316,11.844c0,0,1.762,0,1.775,0C51.832,46.65,47.689,42.525,37.74,40.113  z" fill="#FF7B56"/>
+<path d="M22.1,40.313c0,0-12.316,3.215-12.316,11.844c0,0-1.76,0.002-1.775,0C8.008,46.851,12.15,42.725,22.1,40.313  z" fill="#CCA089"/>
+<path d="M37.74,40.113c0,0,12.316,3.218,12.316,11.844c0,0,1.762,0,1.775,0C51.832,46.65,47.689,42.525,37.74,40.113  z" fill="#CCA089"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="30.0645" x2="30.0645" y1="46.7217" y2="38.7736">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+<stop offset="0" style="stop-color:#DDC4B0"/>
+<stop offset="0.9628" style="stop-color:#A57665"/>
+<stop offset="1" style="stop-color:#A57665"/>
 </linearGradient>
 <polygon fill="url(#SVGID_26_)" points="30.326,46.103 21.691,39.225 21.191,39.445 30.326,46.722 38.938,39.561 38.438,39.358 "/>
 <radialGradient cx="-83.4844" cy="-35.5879" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_27_" r="25.0781">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+<stop offset="0" style="stop-color:#F4EDE4"/>
+<stop offset="0.5091" style="stop-color:#E8D9CA"/>
+<stop offset="0.7636" style="stop-color:#DDC4B0"/>
+<stop offset="1" style="stop-color:#BF9C89"/>
 </radialGradient>
 <path d="M41.398,23.083c-0.059-0.027-0.125-0.031-0.184-0.051V23.03c-0.012-0.002-0.023-0.004-0.035-0.006  c-0.092-0.023-0.182-0.045-0.275-0.051c-11.475-1.996-16.738-8.354-17.135-6.67c-0.316,1.34-3.535,4.236-5.219,5.682  c0.014,0.064,0.021,0.121,0.035,0.188c0,0,0.063,0.296,0.188,0.801c-0.135,0.014-0.264,0.041-0.393,0.094  c-1.07,0.454-1.406,2.21-0.75,3.928c0.658,1.716,2.059,2.744,3.131,2.294c0.066-0.029,0.121-0.078,0.182-0.115  c0.625,1.4,1.389,2.901,2.326,4.406c1.568,1.865,3.973,4.055,6.627,4.055c3.213,0,5.18-1.758,6.529-3.53  c0.033-0.074,0.068-0.144,0.109-0.204c1.002-1.564,1.813-3.135,2.471-4.594c1.047,0.361,2.395-0.612,3.063-2.263  C42.76,25.336,42.461,23.561,41.398,23.083z" fill="url(#SVGID_27_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="25.8574" x2="35.7696" y1="38.709" y2="28.8743">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+<stop offset="0" style="stop-color:#E8D9CA"/>
+<stop offset="1" style="stop-color:#DDC4B0"/>
 </linearGradient>
 <path d="M29.426,36.734c-1.955,0-3.926-0.91-5.377-2.283c1.535,1.612,3.6,3.184,5.848,3.184  c3.213,0,5.18-1.758,6.529-3.53c0.033-0.074,0.068-0.144,0.109-0.204c1.002-1.564,1.813-3.135,2.471-4.594  C35.352,35.689,32.639,36.734,29.426,36.734z" fill="url(#SVGID_28_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="29.8047" x2="29.8047" y1="7.3003" y2="21.8973">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3758" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M29.574,7.086c-3.977,0-5.891,1.809-7.369,3.699c-2.4,0.37-6.209,2.57-3.52,12.218  c1.684-1.444,4.768-5.359,5.084-6.699c0.398-1.697,5.75,4.792,17.445,6.727c0.137-0.541,0.197-0.857,0.197-0.857  C43.25,13.937,39.256,7.407,29.574,7.086z" fill="url(#SVGID_29_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="34.7979" x2="21.5721" y1="21.2656" y2="13.414">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3636" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M23.783,15.516c0,0,5.723,7.517,17.35,7.504C41.133,23.02,35.656,22.159,23.783,15.516z" fill="url(#SVGID_30_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="20.3789" x2="20.495" y1="11.8853" y2="20.2845">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3758" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M22.406,11.344c0,0-5.604,0.334-3.525,9.831C18.881,21.175,18.195,14.67,22.406,11.344z" fill="url(#SVGID_31_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="31.6582" x2="31.2464" y1="8.5503" y2="12.3578">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+<stop offset="0" style="stop-color:#8D7B6A"/>
+<stop offset="1" style="stop-color:#451F1E"/>
 </linearGradient>
 <path d="M32.291,12.66c-2.609-0.375-7.02-2.686-8.75-1.859c0,0,5.662-6.459,15.65,0.895  C39.191,11.695,36.813,13.303,32.291,12.66z" fill="url(#SVGID_32_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ftu.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ftu.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ftu.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,25 +4,25 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07  c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11  c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304  v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001  z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" fill-opacity="0.6" height="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
@@ -31,80 +31,80 @@
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+<stop offset="0" style="stop-color:#AADAC6"/>
+<stop offset="1" style="stop-color:#6A99AA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
-<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
+<rect fill="#BCE2D2" height="0.767" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+<stop offset="1" style="stop-color:#D3D7D5"/>
 </linearGradient>
 <path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785  c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+<stop offset="0" style="stop-color:#6F7172"/>
+<stop offset="1" style="stop-color:#BFC2C1"/>
 </linearGradient>
 <path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51  c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951  h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183  h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606  c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
 <path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534  h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303  c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307  c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+<stop offset="0" style="stop-color:#C6B17B"/>
+<stop offset="0.7455" style="stop-color:#98604F"/>
+<stop offset="1" style="stop-color:#7F3736"/>
 </linearGradient>
 <path d="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307  c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -112,45 +112,45 @@
 <g transform="matrix(1 0 0 1 30 30)">
 <rect fill="none" height="30" width="30"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -576.9805 -204.4805)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-595" x2="-595" y1="208" y2="226">
-<stop offset="0" stop-color="#FFE6DE"/>
-<stop offset="1" stop-color="#DB7250"/>
+<stop offset="0" stop-color="#F5EFE8"/>
+<stop offset="1" stop-color="#B18B7A"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="17.98,3.537,20.9,9.609,26.98,12.54,20.9,15.46,17.98,21.54,15.05,15.46,8.977,12.54,15.05,9.609"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -576.9805 -204.4805)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-595" x2="-595" y1="209.5" y2="224.5">
-<stop offset="0" stop-color="#FF7236"/>
-<stop offset="0.79" stop-color="#D11414"/>
-<stop offset="1" stop-color="#E8522A"/>
+<stop offset="0" stop-color="#C39072"/>
+<stop offset="0.79" stop-color="#984D51"/>
+<stop offset="1" stop-color="#AF7563"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="15.55,10.11,17.98,5.07,20.4,10.11,25.44,12.54,20.4,14.96,17.98,20,15.55,14.96,10.51,12.54"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -576.9805 -204.4805)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-595" x2="-595" y1="206.9" y2="227.1">
-<stop offset="0" stop-color="#FF3030"/>
-<stop offset="1" stop-color="#9C2D31"/>
+<stop offset="0" stop-color="#C1766E"/>
+<stop offset="1" stop-color="#7B4E54"/>
 </linearGradient>
 <path d="M17.98,3.736l2.773,5.756,0.088,0.182,0.184,0.088,5.754,2.773-5.754,2.775-0.184,0.088-0.088,0.184-2.773,5.752-2.774-5.752-0.088-0.184-0.183-0.088-5.754-2.775,5.754-2.773,0.183-0.088,0.088-0.182,2.77-5.761m0-1.332l-3.3,6.836-6.837,3.295,6.836,3.297,3.295,6.838,3.297-6.838,6.836-3.297-6.85-3.3-3.29-6.836z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -576.9805 -204.4805)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-585.2" x2="-585.2" y1="218.8" y2="226.2">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="1" stop-color="#231F20"/>
+<stop offset="0" stop-color="#A8A9AA"/>
+<stop offset="1" stop-color="#222021"/>
 </linearGradient>
 <path d="M6.725,19.12l-4.832,2.328,0.562,0.271h10.15c0.829,0,1.555-0.416,1.997-1.047l-3.222-1.553-2.329-4.832-2.336,4.83z" fill="url(#SVGID_4__)" fill-opacity="0.2" stroke-opacity="0.2" style="enable-background:new;"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -576.9805 -204.4805)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="-585.4" x2="-585.4" y1="219.2" y2="226.2">
-<stop offset="0" stop-color="#A9AAAD"/>
+<stop offset="0" stop-color="#AAABAC"/>
 <stop offset="1" stop-color="#000000"/>
 </linearGradient>
 <path d="M6.857,19.25l-4.55,2.193,0.562,0.27h9.735c0.764,0,1.442-0.35,1.891-0.896l-3.251-1.565-2.193-4.551-2.19,4.56z" fill="url(#SVGID_5__)" fill-opacity="0.4" stroke-opacity="0.4" style="enable-background:new;"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -576.9805 -204.4805)" gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="-586" x2="-586" y1="220.1" y2="231.4">
-<stop offset="0" stop-color="#FFE6DE"/>
-<stop offset="1" stop-color="#DB7250"/>
+<stop offset="0" stop-color="#F5EFE8"/>
+<stop offset="1" stop-color="#B18B7A"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6__)" points="9.052,15.65,10.88,19.44,14.67,21.27,10.88,23.09,9.052,26.88,7.225,23.09,3.434,21.27,7.225,19.44"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -576.9805 -204.4805)" gradientUnits="userSpaceOnUse" id="SVGID_7__" x1="-586" x2="-586" y1="221.1" y2="230.4">
-<stop offset="0" stop-color="#FF7236"/>
-<stop offset="0.79" stop-color="#D11414"/>
-<stop offset="1" stop-color="#E8522A"/>
+<stop offset="0" stop-color="#C39072"/>
+<stop offset="0.79" stop-color="#984D51"/>
+<stop offset="1" stop-color="#AF7563"/>
 </linearGradient>
 <polygon fill="url(#SVGID_7__)" points="7.536,19.75,9.052,16.6,10.57,19.75,13.71,21.27,10.57,22.78,9.052,25.93,7.536,22.78,4.391,21.27"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -576.9805 -204.4805)" gradientUnits="userSpaceOnUse" id="SVGID_8__" x1="-586" x2="-586" y1="219.4" y2="232.1">
-<stop offset="0" stop-color="#FF3030"/>
-<stop offset="1" stop-color="#9C2D31"/>
+<stop offset="0" stop-color="#C1766E"/>
+<stop offset="1" stop-color="#7B4E54"/>
 </linearGradient>
 <path d="M9.052,15.77l1.732,3.594,0.055,0.115,0.114,0.055,3.594,1.73-3.594,1.731-0.114,0.055-0.055,0.115-1.728,3.58-1.732-3.59-0.055-0.115-0.115-0.06-3.594-1.732,3.594-1.729,0.114-0.056,0.055-0.114,1.733-3.6m0-0.83l-2.058,4.27-4.27,2.057,4.27,2.062,2.058,4.271,2.058-4.271,4.27-2.062-4.27-2.057-2.058-4.27z" fill="url(#SVGID_8__)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_games.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_games.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_games.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,7 +5,7 @@
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.752" x2="37.7069" y1="18.6255" y2="19.3878">
 <stop offset="0" style="stop-color:#333333"/>
-<stop offset="1" style="stop-color:#A7A8A9"/>
+<stop offset="1" style="stop-color:#A8A8A8"/>
 </linearGradient>
 <path d="M27.656,5.649l5.785,0.394l1.092,2.745L32.23,9.758l2.959,1.516l0.109,5.178l-3.068-0.485  l3.068,2.237c0,0-5.514,8.872-1.639,11.192l-4.416,2.117c0,0-5.463-3.121-1.531-9.217C31.645,16.203,27.656,5.649,27.656,5.649z" fill="url(#SVGID_1_)"/>
 <polygon fill="#FFFFFF" fill-opacity="0.5" points="32.23,11.271 35.189,12.787 35.268,16.447 35.299,16.452 35.189,11.273 33.85,10.588   " stroke-opacity="0.5"/>
@@ -16,11 +16,11 @@
 <polygon fill="#FFFFFF" fill-opacity="0.5" points="32.23,10.651 35.189,12.167 35.279,16.449 35.299,16.452 35.189,11.273   33.186,10.248 " stroke-opacity="0.5"/>
 <path d="M32.299,26.955c-0.076,1.082,0.098,2.057,0.691,2.762l0.67-0.321C32.773,28.864,32.381,27.989,32.299,26.955  z" fill="#FFFFFF"/>
 <path d="M32.23,16.86l2.701,1.97c0.223-0.394,0.367-0.625,0.367-0.625l-1.504-1.098L32.23,16.86z" fill="#FFFFFF"/>
-<path d="M32.883,12.973c0.137-1.023,0.125-1.99-0.025-2.895L32.23,9.758l0.521-0.22  c-0.266-1.135-0.76-2.168-1.496-3.093c-0.164-0.205-0.342-0.4-0.52-0.587l-3.08-0.209c0,0,3.988,10.554,0.057,16.647  c-3.932,6.096,1.531,9.217,1.531,9.217l0.713-0.34c-2.512-3.189-1.322-6.021,0.35-9.96c0.674-1.581,1.402-3.31,1.939-5.234  l-0.016-0.011l0.02,0.002C32.516,15.021,32.74,14.026,32.883,12.973z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M32.883,12.973c0.137-1.023,0.125-1.99-0.025-2.895L32.23,9.758l0.521-0.22  c-0.266-1.135-0.76-2.168-1.496-3.093c-0.164-0.205-0.342-0.4-0.52-0.587l-3.08-0.209c0,0,3.988,10.554,0.057,16.647  c-3.932,6.096,1.531,9.217,1.531,9.217l0.713-0.34c-2.512-3.189-1.322-6.021,0.35-9.96c0.674-1.581,1.402-3.31,1.939-5.234  l-0.016-0.011l0.02,0.002C32.516,15.021,32.74,14.026,32.883,12.973z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="21.6943" x2="27.5643" y1="21.5898" y2="2.1062">
-<stop offset="0" style="stop-color:#2E3030"/>
+<stop offset="0" style="stop-color:#2F2F2F"/>
 <stop offset="0.6545" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#4D5152"/>
+<stop offset="1" style="stop-color:#4F4F51"/>
 </linearGradient>
 <path d="M32.131,12.872c1.213-8.979-9.904-10.008-9.904-10.008L17.592,2c0,0-0.477,1.282,2.004,2.599  C15.244,7.53,6.963,13.376,6.555,15.737c-0.271,1.542,4.236,7.189,5.402,3.09c0.777-2.747,5.494-1.03,6.773-1.84  c1.045-0.661,2.186,0.291,2.186,0.291c-9.029,8.198-9.834,16.507-9.834,16.507v11.351h20.432V33.785  C23.324,27.117,30.877,22.202,32.131,12.872z" fill="url(#SVGID_2_)"/>
 <path d="M17.922,10.739l3.496-2.382C21.418,8.357,21.248,13.408,17.922,10.739z" fill="#FCFCFC" fill-opacity="0.3" stroke-opacity="0.3"/>
@@ -31,42 +31,42 @@
 <path d="M17.922,10.385l3.496-2.243C21.418,8.142,20.67,12.024,17.922,10.385z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.5703" x2="33.0273" y1="46.6494" y2="46.6494">
 <stop offset="0" style="stop-color:#363636"/>
-<stop offset="0.6545" style="stop-color:#898C8C"/>
-<stop offset="1" style="stop-color:#565C5C"/>
+<stop offset="0.6545" style="stop-color:#8A8B8B"/>
+<stop offset="1" style="stop-color:#58595A"/>
 </linearGradient>
 <path d="M33.027,46.647c0,0.838-0.672,1.516-1.514,1.516H10.965c-0.842,0-1.395-0.678-1.395-1.516l0,0  c0-0.835,0.553-1.511,1.395-1.511h20.549C32.355,45.136,33.027,45.812,33.027,46.647L33.027,46.647z" fill="url(#SVGID_4_)"/>
 <path d="M10.965,45.892h20.549c0.709,0,1.293,0.483,1.461,1.135c0.031-0.121,0.053-0.249,0.053-0.379  c0-0.835-0.672-1.511-1.514-1.511H10.965c-0.842,0-1.395,0.676-1.395,1.511c0,0.13,0.016,0.258,0.043,0.379  C9.756,46.375,10.256,45.892,10.965,45.892z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="17.2041" x2="34.1982" y1="20.5649" y2="5.97">
-<stop offset="0" style="stop-color:#2E3030"/>
+<stop offset="0" style="stop-color:#2F2F2F"/>
 <stop offset="0.6545" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#4D5152"/>
+<stop offset="1" style="stop-color:#4F4F51"/>
 </linearGradient>
 <path d="M29.066,5.392l-9.162,11.402c0.576,0.123,1.012,0.483,1.012,0.483  c-0.455,0.413-0.875,0.825-1.289,1.238l0.043,0.192l12.477-5.991C32.576,9.154,31.045,6.858,29.066,5.392z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.5635" x2="32.4584" y1="20.1465" y2="24.9896">
-<stop offset="0" style="stop-color:#2E3030"/>
+<stop offset="0" style="stop-color:#2F2F2F"/>
 <stop offset="0.6545" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#4D5152"/>
+<stop offset="1" style="stop-color:#4F4F51"/>
 </linearGradient>
 <path d="M32.131,12.872c0.129-0.939,0.113-1.786-0.002-2.559c-4.604,1.772-10.771,6.632-11.324,7.071  c-8.918,8.165-9.723,16.401-9.723,16.401v0.008l20.432-0.008C23.324,27.117,30.877,22.202,32.131,12.872z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="11.082" x2="31.5137" y1="39.4644" y2="39.4644">
 <stop offset="0" style="stop-color:#363636"/>
-<stop offset="0.6545" style="stop-color:#898C8C"/>
-<stop offset="1" style="stop-color:#565C5C"/>
+<stop offset="0.6545" style="stop-color:#8A8B8B"/>
+<stop offset="1" style="stop-color:#58595A"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="11.343" width="20.432" x="11.082" y="33.792"/>
 <linearGradient gradientTransform="matrix(1.0123 0 0 1 -4.0079 0)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="13.707" x2="33.2224" y1="33.5234" y2="32.0012">
-<stop offset="0" style="stop-color:#2E3030"/>
-<stop offset="0.0545" style="stop-color:#2E3030"/>
+<stop offset="0" style="stop-color:#2F2F2F"/>
+<stop offset="0.0545" style="stop-color:#2F2F2F"/>
 <stop offset="0.7333" style="stop-color:#8F8F8F"/>
-<stop offset="1" style="stop-color:#4D5152"/>
+<stop offset="1" style="stop-color:#4F4F51"/>
 </linearGradient>
 <path d="M11.082,33.785h20.432c-2.48-2.008-3.729-3.008-9.955-3.008  C13.785,30.777,11.082,33.785,11.082,33.785z" fill="url(#SVGID_8_)"/>
-<rect fill="#231F20" fill-opacity="0.5" height="0.758" stroke-opacity="0.5" width="20.432" x="11.082" y="44.378"/>
+<rect fill="#222021" fill-opacity="0.5" height="0.758" stroke-opacity="0.5" width="20.432" x="11.082" y="44.378"/>
 <rect fill="#FFFFFF" fill-opacity="0.3" height="0.756" stroke-opacity="0.3" width="20.432" x="11.082" y="33.785"/>
 <rect fill="#FFFFFF" fill-opacity="0.2" height="0.758" stroke-opacity="0.2" width="20.432" x="11.082" y="34.541"/>
 <rect fill="#FFFFFF" fill-opacity="0.1" height="0.755" stroke-opacity="0.1" width="20.432" x="11.082" y="35.299"/>
-<rect fill="#231F20" fill-opacity="0.3" height="0.755" stroke-opacity="0.3" width="20.432" x="11.082" y="43.623"/>
-<rect fill="#231F20" fill-opacity="0.1" height="0.758" stroke-opacity="0.1" width="20.432" x="11.082" y="42.864"/>
+<rect fill="#222021" fill-opacity="0.3" height="0.755" stroke-opacity="0.3" width="20.432" x="11.082" y="43.623"/>
+<rect fill="#222021" fill-opacity="0.1" height="0.758" stroke-opacity="0.1" width="20.432" x="11.082" y="42.864"/>
 <path d="M27.799,28.044c-0.25,2.393,0.572,4.693,3.715,7.255v-1.514C29.037,31.77,28.006,29.913,27.799,28.044z" fill="#FFFFFF"/>
 <path d="M22.227,4.377c0,0,9.34,0.87,9.957,7.938c0.684-8.461-9.957-9.451-9.957-9.451L17.592,2  c0,0-0.266,0.718,0.639,1.633L22.227,4.377z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <path d="M11.082,33.785v1.514c0,0,0.805-8.31,9.834-16.508c0,0-0.469-0.386-1.078-0.493  C11.826,26.152,11.082,33.785,11.082,33.785z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
@@ -76,7 +76,7 @@
 <path d="M27.77,27.689c-0.119,2.25,0.777,4.435,3.744,6.851v-0.756C28.879,31.639,27.881,29.676,27.77,27.689z" fill="#FFFFFF"/>
 <path d="M19.596,5.356c-0.225-0.119-0.416-0.237-0.594-0.355C14.533,8.034,6.945,13.48,6.555,15.737  c-0.027,0.152-0.008,0.343,0.051,0.56C7.404,13.822,15.361,8.208,19.596,5.356z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="47.9121" x2="55.8671" y1="28.4629" y2="29.2252">
-<stop offset="0" style="stop-color:#888F91"/>
+<stop offset="0" style="stop-color:#8B8E8E"/>
 <stop offset="1" style="stop-color:#C9C9C9"/>
 </linearGradient>
 <path d="M45.816,15.486l5.787,0.393l1.094,2.745l-2.303,0.97l2.957,1.516l0.107,5.178l-3.064-0.485  l3.064,2.238c0,0-5.514,8.872-1.639,11.192l-4.416,2.117c0,0-5.461-3.122-1.529-9.217C49.805,26.041,45.816,15.486,45.816,15.486z" fill="url(#SVGID_9_)"/>
@@ -88,19 +88,19 @@
 <polygon fill="#FFFFFF" fill-opacity="0.5" points="50.395,20.488 53.352,22.003 53.441,26.287 53.459,26.289 53.352,21.111   51.35,20.085 " stroke-opacity="0.5"/>
 <path d="M50.461,36.793c-0.076,1.082,0.1,2.057,0.691,2.762l0.668-0.321C50.934,38.703,50.543,37.826,50.461,36.793z  " fill="#FFFFFF"/>
 <path d="M50.395,26.697l2.697,1.97c0.227-0.394,0.367-0.625,0.367-0.625l-1.504-1.099L50.395,26.697z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M51.795,22.912c0.119-0.9,0.127-1.758,0.043-2.579l-1.443-0.739l1.232-0.519  c-0.297-1.192-0.838-2.284-1.617-3.264c-0.012-0.015-0.025-0.029-0.039-0.043l-4.154-0.282c0,0,3.988,10.554,0.059,16.647  c-3.932,6.095,1.529,9.217,1.529,9.217l1.41-0.676c-2.369-2.885-1.332-5.364,0.352-9.328c0.65-1.533,1.355-3.199,1.898-5.053  l-0.67-0.49l0.77,0.121C51.428,24.971,51.652,23.974,51.795,22.912z" fill="#231F20" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M51.043,22.811c0.141-1.024,0.125-1.987-0.023-2.895l-0.625-0.321l0.521-0.22  c-0.27-1.134-0.764-2.168-1.5-3.092c-0.164-0.205-0.338-0.4-0.52-0.586l-3.08-0.21c0,0,3.988,10.554,0.059,16.647  c-3.932,6.095,1.529,9.217,1.529,9.217l0.713-0.341c-2.51-3.188-1.32-6.021,0.354-9.958c0.672-1.584,1.398-3.312,1.939-5.237  l-0.016-0.012l0.018,0.002C50.68,24.857,50.9,23.863,51.043,22.811z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M28.693,31.644c0.158,0,0.375-0.017,0.619-0.072c-0.018-0.021-0.037-0.043-0.055-0.065  l1.316-0.63c0.396-0.384,0.758-0.951,1-1.798c0.039-0.138,0.135-0.432,1.217-0.519c-1.998-3.107,2.508-10.354,2.508-10.354  l-2.74-1.999c-7.863,5.659-9.123,7.896-9.336,9.108c-0.271,1.575,1.242,3.525,1.709,4.085  C25.795,30.422,27.146,31.644,28.693,31.644z" fill="#231F20" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M34.332,11.312c-0.064,0.176-0.518,1.574,0.83,3.061c-0.857,0.591-1.65,1.149-2.391,1.678  l2.527,0.4l-0.109-5.178l-0.707-0.362L34.332,11.312z" fill="#231F20" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M33.027,46.647c0-0.835-0.672-1.511-1.514-1.511V33.785c0,0-0.002-0.004-0.006-0.007  c-3.328,5.372-3.754,9.555-3.777,9.845v4.541h3.783C32.355,48.163,33.027,47.485,33.027,46.647z" fill="#231F20" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M35.229,13.167l-0.039-1.893l-0.027-0.015l-0.119,0.317  C35.002,11.689,34.799,12.333,35.229,13.167z" fill="#231F20" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M28.693,30.888c0.59,0,1.654-0.263,2.152-2.015c0.168-0.599,0.658-0.923,1.613-1.043  c-1.039-3.379,2.84-9.625,2.84-9.625l-2.096-1.528c-5.842,4.191-8.951,7.136-9.234,8.768c-0.174,0.997,0.725,2.489,1.543,3.467  C26.133,29.65,27.371,30.888,28.693,30.888z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M33.027,46.647c0-0.835-0.672-1.511-1.514-1.511v-9.898c-2.627,4.633-3.004,8.114-3.027,8.385  v4.541h3.027C32.355,48.163,33.027,47.485,33.027,46.647z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M35.299,16.452l-0.027-1.233c-0.492,0.34-0.971,0.676-1.432,1.001L35.299,16.452z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M51.795,22.912c0.119-0.9,0.127-1.758,0.043-2.579l-1.443-0.739l1.232-0.519  c-0.297-1.192-0.838-2.284-1.617-3.264c-0.012-0.015-0.025-0.029-0.039-0.043l-4.154-0.282c0,0,3.988,10.554,0.059,16.647  c-3.932,6.095,1.529,9.217,1.529,9.217l1.41-0.676c-2.369-2.885-1.332-5.364,0.352-9.328c0.65-1.533,1.355-3.199,1.898-5.053  l-0.67-0.49l0.77,0.121C51.428,24.971,51.652,23.974,51.795,22.912z" fill="#222021" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M51.043,22.811c0.141-1.024,0.125-1.987-0.023-2.895l-0.625-0.321l0.521-0.22  c-0.27-1.134-0.764-2.168-1.5-3.092c-0.164-0.205-0.338-0.4-0.52-0.586l-3.08-0.21c0,0,3.988,10.554,0.059,16.647  c-3.932,6.095,1.529,9.217,1.529,9.217l0.713-0.341c-2.51-3.188-1.32-6.021,0.354-9.958c0.672-1.584,1.398-3.312,1.939-5.237  l-0.016-0.012l0.018,0.002C50.68,24.857,50.9,23.863,51.043,22.811z" fill="#222021" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M28.693,31.644c0.158,0,0.375-0.017,0.619-0.072c-0.018-0.021-0.037-0.043-0.055-0.065  l1.316-0.63c0.396-0.384,0.758-0.951,1-1.798c0.039-0.138,0.135-0.432,1.217-0.519c-1.998-3.107,2.508-10.354,2.508-10.354  l-2.74-1.999c-7.863,5.659-9.123,7.896-9.336,9.108c-0.271,1.575,1.242,3.525,1.709,4.085  C25.795,30.422,27.146,31.644,28.693,31.644z" fill="#222021" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M34.332,11.312c-0.064,0.176-0.518,1.574,0.83,3.061c-0.857,0.591-1.65,1.149-2.391,1.678  l2.527,0.4l-0.109-5.178l-0.707-0.362L34.332,11.312z" fill="#222021" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M33.027,46.647c0-0.835-0.672-1.511-1.514-1.511V33.785c0,0-0.002-0.004-0.006-0.007  c-3.328,5.372-3.754,9.555-3.777,9.845v4.541h3.783C32.355,48.163,33.027,47.485,33.027,46.647z" fill="#222021" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M35.229,13.167l-0.039-1.893l-0.027-0.015l-0.119,0.317  C35.002,11.689,34.799,12.333,35.229,13.167z" fill="#222021" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M28.693,30.888c0.59,0,1.654-0.263,2.152-2.015c0.168-0.599,0.658-0.923,1.613-1.043  c-1.039-3.379,2.84-9.625,2.84-9.625l-2.096-1.528c-5.842,4.191-8.951,7.136-9.234,8.768c-0.174,0.997,0.725,2.489,1.543,3.467  C26.133,29.65,27.371,30.888,28.693,30.888z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M33.027,46.647c0-0.835-0.672-1.511-1.514-1.511v-9.898c-2.627,4.633-3.004,8.114-3.027,8.385  v4.541h3.027C32.355,48.163,33.027,47.485,33.027,46.647z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M35.299,16.452l-0.027-1.233c-0.492,0.34-0.971,0.676-1.432,1.001L35.299,16.452z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="39.8555" x2="45.7253" y1="31.4277" y2="11.9445">
-<stop offset="0" style="stop-color:#8B8E8F"/>
+<stop offset="0" style="stop-color:#8C8E8E"/>
 <stop offset="0.6545" style="stop-color:#C2C2C2"/>
-<stop offset="1" style="stop-color:#A0A9AB"/>
+<stop offset="1" style="stop-color:#A3A8A7"/>
 </linearGradient>
 <path d="M50.295,22.709c1.209-8.98-9.908-10.006-9.908-10.006l-4.635-0.864c0,0-0.475,1.282,2.004,2.598  c-4.35,2.931-12.631,8.778-13.041,11.138c-0.27,1.543,4.24,7.189,5.402,3.091c0.779-2.748,5.498-1.031,6.777-1.84  c1.043-0.661,2.184,0.289,2.184,0.289c-9.029,8.199-9.834,16.508-9.834,16.508v11.351h20.432V43.623  C41.486,36.955,49.037,32.04,50.295,22.709z" fill="url(#SVGID_10_)"/>
 <path d="M36.086,20.578l3.492-2.383C39.578,18.195,39.412,23.245,36.086,20.578z" fill="#FCFCFC" fill-opacity="0.5" stroke-opacity="0.5"/>
@@ -110,36 +110,36 @@
 </linearGradient>
 <path d="M36.086,20.223l3.492-2.243C39.578,17.98,38.832,21.864,36.086,20.223z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="27.7305" x2="51.1914" y1="56.4868" y2="56.4868">
-<stop offset="0" style="stop-color:#8C8E8F"/>
+<stop offset="0" style="stop-color:#8D8E8E"/>
 <stop offset="0.6545" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#AEB2B3"/>
+<stop offset="1" style="stop-color:#B0B2B1"/>
 </linearGradient>
 <path d="M51.191,56.484c0,0.84-0.674,1.516-1.516,1.516H29.129c-0.846,0-1.398-0.676-1.398-1.516l0,0  c0-0.835,0.553-1.511,1.398-1.511h20.547C50.518,54.973,51.191,55.649,51.191,56.484L51.191,56.484z" fill="url(#SVGID_12_)"/>
 <path d="M29.129,55.729h20.547c0.711,0,1.293,0.482,1.461,1.134c0.029-0.121,0.055-0.246,0.055-0.379  c0-0.835-0.674-1.511-1.516-1.511H29.129c-0.846,0-1.398,0.676-1.398,1.511c0,0.133,0.02,0.258,0.043,0.379  C27.916,56.211,28.416,55.729,29.129,55.729z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="35.3633" x2="52.3587" y1="30.4033" y2="15.8073">
-<stop offset="0" style="stop-color:#8B8E8F"/>
+<stop offset="0" style="stop-color:#8C8E8E"/>
 <stop offset="0.6545" style="stop-color:#C2C2C2"/>
-<stop offset="1" style="stop-color:#A0A9AB"/>
+<stop offset="1" style="stop-color:#A3A8A7"/>
 </linearGradient>
 <path d="M47.227,15.23l-9.158,11.404c0.576,0.121,1.01,0.48,1.01,0.48c-0.455,0.413-0.875,0.826-1.287,1.241  l0.039,0.191l12.477-5.992C50.736,18.991,49.209,16.696,47.227,15.23z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="32.9014" x2="50.7963" y1="30.0332" y2="34.8763">
-<stop offset="0" style="stop-color:#8B8E8F"/>
+<stop offset="0" style="stop-color:#8C8E8E"/>
 <stop offset="0.6545" style="stop-color:#C2C2C2"/>
-<stop offset="1" style="stop-color:#A0A9AB"/>
+<stop offset="1" style="stop-color:#A3A8A7"/>
 </linearGradient>
 <path d="M50.295,22.709c0.125-0.939,0.111-1.787-0.006-2.556c-4.604,1.769-10.771,6.629-11.32,7.068  c-8.92,8.164-9.725,16.401-9.725,16.401v0.007l20.432-0.007C41.486,36.955,49.037,32.04,50.295,22.709z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="29.2441" x2="49.6758" y1="49.3013" y2="49.3013">
-<stop offset="0" style="stop-color:#8C8E8F"/>
+<stop offset="0" style="stop-color:#8D8E8E"/>
 <stop offset="0.6545" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#AEB2B3"/>
+<stop offset="1" style="stop-color:#B0B2B1"/>
 </linearGradient>
 <rect fill="url(#SVGID_15_)" height="11.344" width="20.432" x="29.244" y="43.629"/>
-<rect fill="#231F20" fill-opacity="0.3" height="0.758" stroke-opacity="0.3" width="20.432" x="29.244" y="54.215"/>
+<rect fill="#222021" fill-opacity="0.3" height="0.758" stroke-opacity="0.3" width="20.432" x="29.244" y="54.215"/>
 <rect fill="#FFFFFF" fill-opacity="0.5" height="0.755" stroke-opacity="0.5" width="20.432" x="29.244" y="43.623"/>
 <rect fill="#FFFFFF" fill-opacity="0.3" height="0.758" stroke-opacity="0.3" width="20.432" x="29.244" y="44.378"/>
 <rect fill="#FFFFFF" fill-opacity="0.1" height="0.756" stroke-opacity="0.1" width="20.432" x="29.244" y="45.136"/>
-<rect fill="#231F20" fill-opacity="0.2" height="0.755" stroke-opacity="0.2" width="20.432" x="29.244" y="53.459"/>
-<rect fill="#231F20" fill-opacity="0.1" height="0.758" stroke-opacity="0.1" width="20.432" x="29.244" y="52.702"/>
+<rect fill="#222021" fill-opacity="0.2" height="0.755" stroke-opacity="0.2" width="20.432" x="29.244" y="53.459"/>
+<rect fill="#222021" fill-opacity="0.1" height="0.758" stroke-opacity="0.1" width="20.432" x="29.244" y="52.702"/>
 <path d="M45.961,37.882c-0.248,2.392,0.57,4.695,3.715,7.254v-1.513C47.199,41.606,46.166,39.75,45.961,37.882z" fill="#FFFFFF"/>
 <path d="M40.387,14.214c0,0,9.34,0.869,9.961,7.937c0.682-8.461-9.961-9.449-9.961-9.449l-4.635-0.864  c0,0-0.266,0.719,0.643,1.634L40.387,14.214z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <path d="M29.244,43.623v1.513c0,0,0.805-8.31,9.834-16.507c0,0-0.467-0.386-1.078-0.492  C29.988,35.989,29.244,43.623,29.244,43.623z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
@@ -149,9 +149,9 @@
 <path d="M45.93,37.527c-0.115,2.25,0.777,4.435,3.746,6.851v-0.755C47.041,41.477,46.041,39.514,45.93,37.527z" fill="#FFFFFF"/>
 <path d="M37.756,15.194c-0.225-0.118-0.414-0.236-0.594-0.355  c-4.467,3.032-12.057,8.479-12.447,10.735c-0.025,0.153-0.004,0.343,0.051,0.56C25.564,23.66,33.521,18.045,37.756,15.194z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(1.0123 0 0 1 -4.0079 0)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="33.5625" x2="53.7416" y1="42.9795" y2="41.7184">
-<stop offset="0" style="stop-color:#8B8E8F"/>
+<stop offset="0" style="stop-color:#8C8E8E"/>
 <stop offset="0.6545" style="stop-color:#DEDEDE"/>
-<stop offset="1" style="stop-color:#A0A9AB"/>
+<stop offset="1" style="stop-color:#A3A8A7"/>
 </linearGradient>
 <path d="M29.244,43.601h20.432c-2.48-2.009-3.729-3.006-9.957-3.006  C31.945,40.595,29.244,43.601,29.244,43.601z" fill="url(#SVGID_16_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_audio.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_audio.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_audio.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,18 +4,18 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="280.6641" x2="306.9727" y1="-333.5469" y2="-333.5469">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+<stop offset="0" style="stop-color:#B7BCBA"/>
+<stop offset="0.2667" style="stop-color:#E7EBE8"/>
+<stop offset="0.703" style="stop-color:#919595"/>
+<stop offset="1" style="stop-color:#B9BDBC"/>
 </linearGradient>
 <path d="M29.529,6.518H6.109c-0.795,0-1.445,0.643-1.445,1.431v42.626h26.309V7.948  C30.973,7.16,30.324,6.518,29.529,6.518z" fill="url(#SVGID_1_)"/>
 <path d="M29.529,6.518c0.795,0,1.443,0.643,1.443,1.431v42.626H4.664V7.948  c0-0.788,0.65-1.431,1.445-1.431L29.529,6.518 M29.529,7.651H6.109c-0.168,0-0.313,0.136-0.313,0.297v41.489h24.042V7.948  C29.839,7.787,29.696,7.651,29.529,7.651L29.529,7.651z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="278.3945" x2="309.0776" y1="-352.5684" y2="-352.5684">
-<stop offset="0" style="stop-color:#3C94DE"/>
-<stop offset="0.2545" style="stop-color:#96E9FA"/>
-<stop offset="0.7091" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#6D98AD"/>
+<stop offset="0.2545" style="stop-color:#B4DCCA"/>
+<stop offset="0.7091" style="stop-color:#3D568F"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="6.012" width="30.848" x="2.395" y="44.563"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1.129" stroke-opacity="0.4" width="30.848" x="2.395" y="44.563"/>
@@ -50,18 +50,18 @@
 <circle cx="17.822" cy="26.358" fill="none" fill-opacity="0.15" r="4.385" stroke="#EBEBEB" stroke-opacity="0.15"/>
 <path d="M30.973,50.574h2.27v-4.883v-1.129h-2.27v-1.129V12.705h-8.271  c-1.479,0-2.683,1.198-2.683,2.669v35.2H30.973z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="297.2568" x2="323.5664" y1="-340.9707" y2="-340.9707">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+<stop offset="0" style="stop-color:#B7BCBA"/>
+<stop offset="0.2667" style="stop-color:#E7EBE8"/>
+<stop offset="0.703" style="stop-color:#919595"/>
+<stop offset="1" style="stop-color:#B9BDBC"/>
 </linearGradient>
 <path d="M46.122,13.942h-23.42c-0.796,0-1.445,0.644-1.445,1.432v42.625h26.31V15.374  C47.564,14.586,46.918,13.942,46.122,13.942z" fill="url(#SVGID_8_)"/>
 <path d="M46.122,13.942c0.796,0,1.442,0.644,1.442,1.432v42.625H21.257V15.374  c0-0.788,0.649-1.432,1.445-1.432H46.122 M46.122,15.076h-23.42c-0.169,0-0.312,0.137-0.312,0.298v41.489h24.042V15.374  C46.432,15.213,46.289,15.076,46.122,15.076L46.122,15.076z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="294.9863" x2="325.6694" y1="-359.9941" y2="-359.9941">
-<stop offset="0" style="stop-color:#3C94DE"/>
-<stop offset="0.2545" style="stop-color:#96E9FA"/>
-<stop offset="0.7091" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#6D98AD"/>
+<stop offset="0.2545" style="stop-color:#B4DCCA"/>
+<stop offset="0.7091" style="stop-color:#3D568F"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="6.01" width="30.849" x="18.986" y="51.989"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1.129" stroke-opacity="0.4" width="30.849" x="18.986" y="51.989"/>
@@ -95,32 +95,32 @@
 <circle cx="34.413" cy="33.784" fill="url(#SVGID_14_)" r="5.046"/>
 <circle cx="34.414" cy="33.784" fill="none" fill-opacity="0.15" r="4.385" stroke="#EBEBEB" stroke-opacity="0.15"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="329.0576" x2="329.0576" y1="-307.5635" y2="-334.9076">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="0.1576" style="stop-color:#36B5FF"/>
-<stop offset="0.8242" style="stop-color:#1B66D8"/>
-<stop offset="1" style="stop-color:#2183E0"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="0.1576" style="stop-color:#72B9C3"/>
+<stop offset="0.8242" style="stop-color:#546F9F"/>
+<stop offset="1" style="stop-color:#5A82A7"/>
 </linearGradient>
 <path d="M52.841,1.999L48.51,4.772c2.588,3.613,3.951,7.799,3.951,12.575c0,4.217-1.031,8.032-3.092,11.386  l4.419,2.49c0.126-0.201,3.817-5.979,3.817-13.875C57.605,11.46,56.031,6.457,52.841,1.999z" fill="url(#SVGID_15_)"/>
 <path d="M47.822,15.064c0-0.788-0.647-1.431-1.443-1.431h-4.771  c0.306,1.081,0.44,2.276,0.44,3.714c0,2.583-0.452,4.328-1.608,6.229l-0.612,1.002l6.471,3.647l0.573-0.933  c0.206-0.339,0.563-0.971,0.952-1.842L47.822,15.064L47.822,15.064z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="320.6797" x2="320.6797" y1="-312.7827" y2="-330.3271">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="0.1576" style="stop-color:#36B5FF"/>
-<stop offset="0.8242" style="stop-color:#1B66D8"/>
-<stop offset="1" style="stop-color:#2183E0"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="0.1576" style="stop-color:#72B9C3"/>
+<stop offset="0.8242" style="stop-color:#546F9F"/>
+<stop offset="1" style="stop-color:#5A82A7"/>
 </linearGradient>
 <path d="M45.258,6.974l-4.3,2.793c1.66,2.317,2.226,4.52,2.226,7.581c0,2.683-0.473,4.681-1.775,6.819  l4.494,2.533C47.691,23.772,50.796,15.748,45.258,6.974z" fill="url(#SVGID_16_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="329.0576" x2="329.0576" y1="-306.832" y2="-336.1659">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.2545" style="stop-color:#4F88BD"/>
-<stop offset="0.7333" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+<stop offset="0.2545" style="stop-color:#708A9C"/>
+<stop offset="0.7333" style="stop-color:#314172"/>
+<stop offset="1" style="stop-color:#91CBCE"/>
 </linearGradient>
 <path d="M52.674,2.851c2.896,4.244,4.305,8.992,4.305,14.497c0,6.409-2.488,11.396-3.414,13.028  l-3.328-1.875c1.892-3.304,2.853-7.053,2.853-11.153c0-4.587-1.243-8.755-3.694-12.399L52.674,2.851 M52.841,1.999L48.51,4.772  c2.588,3.613,3.951,7.799,3.951,12.575c0,4.217-1.031,8.032-3.092,11.386l4.419,2.49c0.126-0.201,3.817-5.979,3.817-13.875  C57.605,11.46,56.031,6.457,52.841,1.999L52.841,1.999z" fill="url(#SVGID_17_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="320.6797" x2="320.6797" y1="-312.3647" y2="-331.4919">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.2545" style="stop-color:#4F88BD"/>
-<stop offset="0.7333" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+<stop offset="0.2545" style="stop-color:#708A9C"/>
+<stop offset="0.7333" style="stop-color:#314172"/>
+<stop offset="1" style="stop-color:#91CBCE"/>
 </linearGradient>
 <path d="M45.061,7.849c4.98,8.402,1.881,15.669,0.608,18.001l-3.401-1.917  c1.09-1.979,1.543-3.935,1.543-6.585c0-3.063-0.578-5.261-1.975-7.405L45.061,7.849 M45.258,6.974l-4.3,2.793  c1.66,2.317,2.226,4.52,2.226,7.581c0,2.683-0.473,4.681-1.775,6.819l4.494,2.533C47.691,23.772,50.796,15.748,45.258,6.974  L45.258,6.974z" fill="url(#SVGID_18_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_bluetooth.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_bluetooth.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_bluetooth.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,26 +4,26 @@
 <g>
 <rect fill="none" height="59.999" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="283.0508" x2="328.9473" y1="-335" y2="-335">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+<stop offset="0" style="stop-color:#B7BCBA"/>
+<stop offset="0.2667" style="stop-color:#E7EBE8"/>
+<stop offset="0.703" style="stop-color:#919595"/>
+<stop offset="1" style="stop-color:#B9BDBC"/>
 </linearGradient>
 <path d="M51.18,3H8.822C7.846,3,7.051,3.788,7.051,4.754V57h45.896V4.754C52.947,3.788,52.152,3,51.18,3z" fill="url(#SVGID_1_)"/>
 <path d="M51.18,3c0.973,0,1.769,0.788,1.769,1.754V57H7.051V4.754C7.051,3.788,7.846,3,8.822,3H51.18   M51.18,4.389H8.822c-0.207,0-0.382,0.168-0.382,0.365v50.854h43.119V4.754C51.559,4.557,51.385,4.389,51.18,4.389L51.18,4.389z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="280.2695" x2="331.4557" y1="-358.3159" y2="-358.3159">
-<stop offset="0" style="stop-color:#3C94DE"/>
-<stop offset="0.2545" style="stop-color:#96E9FA"/>
-<stop offset="0.7091" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#6D98AD"/>
+<stop offset="0.2545" style="stop-color:#B4DCCA"/>
+<stop offset="0.7091" style="stop-color:#3D568F"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="7.368" width="51.46" x="4.27" y="49.632"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1.384" stroke-opacity="0.4" width="51.46" x="4.27" y="49.632"/>
 <rect fill-opacity="0.15" height="1.384" stroke-opacity="0.15" width="45.896" x="7.051" y="48.248"/>
 <path d="M38.482,21.464l-9.881-10.119v13.33l-5.431-5.558l-1.983,2.022  l6.826,7.002l-6.826,6.998l1.979,2.021l5.436-5.556v13.33l9.882-10.113l-6.526-6.679L38.482,21.464z M34.537,21.484l-3.156,3.227  l-0.004-6.457L34.537,21.484z M34.537,34.801l-3.16,3.223l0.004-6.453L34.537,34.801z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="305.8359" x2="305.8359" y1="-348.332" y2="-316.7938">
-<stop offset="0" style="stop-color:#2183E0"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#5A82A7"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M38.482,19.863l-9.88-10.119v13.331l-5.431-5.559l-1.983,2.024l6.826,7l-6.826,6.998l1.979,2.021  l5.436-5.555v13.328l9.881-10.111l-6.525-6.681L38.482,19.863z M34.537,19.885l-3.156,3.226l-0.004-6.456L34.537,19.885z   M34.537,33.201l-3.16,3.222l0.004-6.454L34.537,33.201z" fill="url(#SVGID_3_)"/>
 <rect fill="none" height="59.999" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_group_feeds.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_group_feeds.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_group_feeds.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,199 +4,199 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-70.4854" cy="-5.0225" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="12.778">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.2" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+<stop offset="0" style="stop-color:#DDC4B0"/>
+<stop offset="0.2" style="stop-color:#DDC4B0"/>
+<stop offset="0.9628" style="stop-color:#A57665"/>
+<stop offset="1" style="stop-color:#A57665"/>
 </radialGradient>
 <path d="M48.205,37.917c-1.123-0.489-1.088-2.883-0.625-3.606c0.08-0.126,0.152-0.253,0.23-0.381h-9.4  c0.076,0.128,0.148,0.255,0.23,0.381c0.465,0.724,0.5,3.117-0.623,3.606c-1.125,0.487,5.227,4.738,5.227,4.738  S49.328,38.404,48.205,37.917z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="43.1104" x2="43.1104" y1="37.4727" y2="47.3145">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M54.961,40.41c-1.182-0.614-7.041-2.667-7.15-2.795l-4.477,3.722l-4.811-3.864  c-0.133,0.198-5.924,2.227-7.264,2.938c-1.535,0.815-4.039,2.687-4.039,6.904H59C59,43.097,56.145,41.025,54.961,40.41z" fill="url(#SVGID_2_)"/>
 <polygon fill="#020202" fill-opacity="0.3" points="37.43,37.952 43.334,42.655 48.879,38.047 47.811,37.615 43.334,41.337   38.523,37.473 " stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="28.0684" x2="37.707" y1="42.7466" y2="42.7466">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
 </linearGradient>
 <path d="M37.707,38.696c0,0-8.424,2.199-8.424,8.1c0,0-1.205,0.002-1.215,0  C28.068,43.167,30.902,40.347,37.707,38.696z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="48.4043" x2="58.041" y1="42.6099" y2="42.6099">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
 </linearGradient>
 <path d="M48.404,38.56c0,0,8.424,2.199,8.424,8.101c0,0,1.203,0,1.213,0  C58.041,43.029,55.209,40.211,48.404,38.56z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="43.1553" x2="43.1553" y1="43.0781" y2="37.6438">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5_)" points="43.334,42.655 37.428,37.952 37.086,38.1 43.334,43.078 49.225,38.182 48.881,38.042 "/>
 <radialGradient cx="-69.8633" cy="-28.6533" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="17.154">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+<stop offset="0" style="stop-color:#F4EDE4"/>
+<stop offset="0.5091" style="stop-color:#E8D9CA"/>
+<stop offset="0.7636" style="stop-color:#DDC4B0"/>
+<stop offset="1" style="stop-color:#BF9C89"/>
 </radialGradient>
 <path d="M50.906,26.909c-0.039-0.017-0.084-0.02-0.125-0.033v-0.002c-0.008-0.002-0.014-0.002-0.025-0.005  c-0.061-0.017-0.123-0.029-0.186-0.034c-7.85-1.364-11.451-5.712-11.723-4.563c-0.217,0.918-2.416,2.9-3.568,3.886  c0.008,0.047,0.016,0.086,0.023,0.129c0,0,0.043,0.203,0.129,0.548c-0.092,0.01-0.182,0.029-0.268,0.066  c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078  c0.428,0.957,0.951,1.985,1.594,3.013c1.074,1.279,2.717,2.775,4.531,2.775c2.197,0,3.541-1.204,4.467-2.413  c0.023-0.053,0.047-0.101,0.074-0.141c0.684-1.071,1.24-2.146,1.689-3.144c0.717,0.248,1.637-0.419,2.094-1.547  C51.838,28.452,51.633,27.236,50.906,26.909z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="40.2764" x2="47.0569" y1="37.6001" y2="30.8725">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+<stop offset="0" style="stop-color:#E8D9CA"/>
+<stop offset="1" style="stop-color:#DDC4B0"/>
 </linearGradient>
 <path d="M42.719,36.249c-1.34,0-2.686-0.624-3.68-1.562c1.051,1.103,2.463,2.177,4,2.177  c2.197,0,3.541-1.204,4.467-2.413c0.023-0.053,0.047-0.101,0.074-0.141c0.684-1.071,1.24-2.146,1.689-3.144  C46.77,35.533,44.914,36.249,42.719,36.249z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="42.9766" x2="42.9766" y1="16.1133" y2="26.0988">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3758" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M42.818,15.967c-2.721,0-4.029,1.238-5.039,2.53c-1.645,0.254-4.246,1.762-2.408,8.359  c1.152-0.988,3.26-3.666,3.477-4.584c0.273-1.16,3.936,3.278,11.934,4.602c0.094-0.368,0.137-0.587,0.137-0.587  C52.172,20.654,49.439,16.188,42.818,15.967z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="46.3916" x2="37.3443" y1="25.6675" y2="20.2965">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3636" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M38.855,21.734c0,0,3.916,5.142,11.869,5.133C50.725,26.867,46.98,26.279,38.855,21.734z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="36.5283" x2="36.6077" y1="19.2515" y2="24.9963">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3758" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M37.916,18.881c0,0-3.834,0.23-2.412,6.725C35.504,25.605,35.037,21.157,37.916,18.881z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="44.2432" x2="43.9615" y1="16.9707" y2="19.5749">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+<stop offset="0" style="stop-color:#8D7B6A"/>
+<stop offset="1" style="stop-color:#451F1E"/>
 </linearGradient>
 <path d="M44.678,19.781c-1.785-0.255-4.803-1.836-5.986-1.272c0,0,3.873-4.417,10.705,0.612  C49.396,19.121,47.77,20.221,44.678,19.781z" fill="url(#SVGID_11_)"/>
 <radialGradient cx="-98.5264" cy="-5.0225" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="12.778">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.2" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+<stop offset="0" style="stop-color:#DDC4B0"/>
+<stop offset="0.2" style="stop-color:#DDC4B0"/>
+<stop offset="0.9628" style="stop-color:#A57665"/>
+<stop offset="1" style="stop-color:#A57665"/>
 </radialGradient>
 <path d="M21.984,37.917c-1.125-0.489-1.088-2.883-0.625-3.606c0.08-0.126,0.154-0.253,0.234-0.381h-9.402  c0.076,0.128,0.15,0.255,0.23,0.381c0.465,0.724,0.498,3.117-0.625,3.606c-1.125,0.487,5.227,4.738,5.227,4.738  S23.109,38.404,21.984,37.917z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="16.8906" x2="16.8906" y1="37.4727" y2="47.3145">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M28.742,40.41c-1.182-0.614-7.041-2.667-7.15-2.795l-4.477,3.722l-4.811-3.864  c-0.133,0.198-5.926,2.227-7.266,2.938C3.506,41.226,1,43.097,1,47.314h31.781C32.781,43.097,29.924,41.025,28.742,40.41z" fill="url(#SVGID_13_)"/>
 <polygon fill="#020202" fill-opacity="0.3" points="11.209,37.952 17.115,42.655 22.66,38.047 21.592,37.615 17.115,41.337   12.305,37.473 " stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="1.8496" x2="11.4883" y1="42.7466" y2="42.7466">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
 </linearGradient>
 <path d="M11.488,38.696c0,0-8.426,2.199-8.426,8.1c0,0-1.203,0.002-1.213,0  C1.85,43.167,4.682,40.347,11.488,38.696z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.1836" x2="31.8223" y1="42.6099" y2="42.6099">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
 </linearGradient>
 <path d="M22.184,38.56c0,0,8.424,2.199,8.424,8.101c0,0,1.205,0,1.215,0  C31.822,43.029,28.99,40.211,22.184,38.56z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="16.9346" x2="16.9346" y1="43.0781" y2="37.6438">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
 </linearGradient>
 <polygon fill="url(#SVGID_16_)" points="17.115,42.655 11.209,37.952 10.865,38.1 17.115,43.078 23.004,38.182 22.662,38.042 "/>
 <radialGradient cx="-97.9023" cy="-28.6533" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_17_" r="17.154">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+<stop offset="0" style="stop-color:#F4EDE4"/>
+<stop offset="0.5091" style="stop-color:#E8D9CA"/>
+<stop offset="0.7636" style="stop-color:#DDC4B0"/>
+<stop offset="1" style="stop-color:#BF9C89"/>
 </radialGradient>
 <path d="M24.686,26.909c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002c-0.012-0.002-0.016-0.002-0.025-0.005  c-0.061-0.017-0.123-0.029-0.188-0.034c-7.848-1.364-11.451-5.712-11.721-4.563c-0.217,0.918-2.416,2.9-3.57,3.886  c0.01,0.047,0.016,0.086,0.025,0.129c0,0,0.041,0.203,0.127,0.548c-0.09,0.01-0.18,0.029-0.268,0.066  c-0.73,0.308-0.963,1.511-0.512,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.045-0.019,0.084-0.051,0.123-0.078  c0.428,0.957,0.951,1.985,1.59,3.013c1.076,1.279,2.719,2.775,4.535,2.775c2.197,0,3.541-1.204,4.467-2.413  c0.023-0.053,0.045-0.101,0.072-0.141c0.684-1.071,1.242-2.146,1.689-3.144c0.719,0.248,1.637-0.419,2.096-1.547  C25.617,28.452,25.414,27.236,24.686,26.909z" fill="url(#SVGID_17_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="14.0576" x2="20.8372" y1="37.5996" y2="30.873">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+<stop offset="0" style="stop-color:#E8D9CA"/>
+<stop offset="1" style="stop-color:#DDC4B0"/>
 </linearGradient>
 <path d="M16.5,36.249c-1.34,0-2.688-0.624-3.68-1.562c1.051,1.103,2.463,2.177,4,2.177  c2.197,0,3.541-1.204,4.467-2.413c0.023-0.053,0.045-0.101,0.072-0.141c0.684-1.071,1.242-2.146,1.689-3.144  C20.551,35.533,18.695,36.249,16.5,36.249z" fill="url(#SVGID_18_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="16.7578" x2="16.7578" y1="16.1133" y2="26.0988">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3758" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M16.6,15.967c-2.721,0-4.031,1.238-5.039,2.53c-1.645,0.254-4.25,1.762-2.408,8.359  c1.15-0.988,3.26-3.666,3.477-4.584c0.273-1.16,3.936,3.278,11.934,4.602c0.092-0.368,0.137-0.587,0.137-0.587  C25.955,20.654,23.221,16.188,16.6,15.967z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="20.1719" x2="11.1239" y1="25.6675" y2="20.2961">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3636" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M12.637,21.734c0,0,3.914,5.142,11.869,5.133C24.506,26.867,20.762,26.279,12.637,21.734z" fill="url(#SVGID_20_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="10.3096" x2="10.389" y1="19.2515" y2="24.9963">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3758" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M11.697,18.881c0,0-3.834,0.23-2.412,6.725C9.285,25.605,8.818,21.157,11.697,18.881z" fill="url(#SVGID_21_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="18.0244" x2="17.7427" y1="16.9707" y2="19.5754">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+<stop offset="0" style="stop-color:#8D7B6A"/>
+<stop offset="1" style="stop-color:#451F1E"/>
 </linearGradient>
 <path d="M18.457,19.781c-1.783-0.255-4.803-1.836-5.984-1.272c0,0,3.873-4.417,10.705,0.612  C23.178,19.121,21.549,20.221,18.457,19.781z" fill="url(#SVGID_22_)"/>
-<path d="M47.916,41.694c-1.092-0.569-4.482-1.827-7.205-2.838l-1.533-0.569l-0.273-0.11l-0.359-0.139  l-0.686-0.275l-0.424,0.186c0,0-0.006,0.002-0.008,0.004h-0.002c-1.777,0.695-5.18,1.935-6.166,2.458  c-0.385,0.206-0.832,0.477-1.283,0.835c-0.475-0.392-0.914-0.667-1.234-0.835c-0.85-0.439-4.098-1.619-5.91-2.299l-0.17-0.069  l-0.004,0.005l-0.752-0.304l-0.684,0.299c-0.668,0.263-1.492,0.576-2.373,0.911l-0.08,0.031c-2.607,0.99-5.561,2.113-6.693,2.715  c-2.535,1.346-4.359,3.248-5.438,5.615h20.582h5.561h20.494C51.592,43.797,48.686,42.094,47.916,41.694z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M17.193,22.325c-1.205,1.026-1.531,3.083-0.748,5.124c0.732,1.925,2.256,3.218,3.783,3.218  h0.002c0.23,0.475,0.467,0.945,0.713,1.408h-0.07l0.584,0.965c0,0,0.15,0.248,0.33,0.545c0.486-0.827,0.914-1.646,1.262-2.418  c0.719,0.248,1.637-0.419,2.096-1.547c0.473-1.168,0.27-2.384-0.459-2.711c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002  c-0.012-0.002-0.016-0.002-0.025-0.005c-0.061-0.017-0.123-0.029-0.188-0.034c-0.014-0.002-0.027-0.006-0.041-0.008  c-0.029-0.006-0.07-0.015-0.105-0.023c0.121,0.023,0.232,0.049,0.359,0.07c0.092-0.368,0.137-0.587,0.137-0.587  c1.256-5.633-1.479-10.1-8.1-10.32c-0.012,0-0.021,0.003-0.033,0.003C16.395,17.765,16.594,19.881,17.193,22.325z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M37.779,18.497c-1.645,0.254-4.246,1.76-2.41,8.354c-0.068,0.01-0.139,0.023-0.205,0.051  c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078  c0.359,0.799,0.787,1.648,1.289,2.504c0.564-0.949,1.1-1.934,1.586-2.947c1.395-0.166,2.754-1.375,3.457-3.109  c0.801-1.979,0.545-4.035-0.584-5.104c0.504-2.285,0.584-4.463,0.252-6.444c-0.033-0.002-0.063-0.006-0.096-0.009  C40.098,15.967,38.789,17.205,37.779,18.497z M35.381,26.849c0.014-0.014,0.029-0.027,0.043-0.041  c0.002,0.01,0.004,0.018,0.008,0.027C35.414,26.837,35.396,26.845,35.381,26.849z M39.174,22.101L39.174,22.101  c-0.02-0.004-0.047-0.015-0.066-0.018C39.127,22.086,39.152,22.097,39.174,22.101z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M47.621,42.258c-1.053-0.549-4.424-1.8-7.133-2.807l-1.549-0.574l-0.264-0.108l-0.369-0.142  l-1.045-0.418c-0.033-0.047-0.057-0.107-0.088-0.16c-1.826,0.708-4.971,1.86-5.914,2.361c-0.385,0.206-0.832,0.477-1.283,0.835  c-0.475-0.392-0.914-0.667-1.234-0.835c-0.85-0.439-4.098-1.619-5.91-2.299l-0.092-0.037l-1.285,0.56  c-0.689,0.271-1.549,0.597-2.461,0.943c-2.59,0.986-5.525,2.101-6.619,2.681c-2.309,1.226-4,2.936-5.035,5.057h19.881h5.561h19.785  C50.957,44.163,48.33,42.626,47.621,42.258z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M17.037,27.223c0.641,1.68,1.924,2.807,3.191,2.807c0.131,0,0.264-0.012,0.391-0.037  c0.432,0.934,0.9,1.844,1.398,2.719H22l0.146,0.241c0.334-0.609,0.645-1.212,0.902-1.785c0.719,0.248,1.637-0.419,2.096-1.547  c0.473-1.168,0.27-2.384-0.459-2.711c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002c-0.012-0.002-0.016-0.002-0.025-0.005  c-0.061-0.017-0.123-0.029-0.188-0.034c-0.014-0.002-0.027-0.006-0.041-0.008c-0.029-0.006-0.07-0.015-0.105-0.023  c0.121,0.023,0.232,0.049,0.359,0.07c0.092-0.368,0.137-0.587,0.137-0.587c1.215-5.457-1.322-9.807-7.5-10.273  c-0.182,1.82,0.049,4.01,0.717,6.578C16.682,23.301,16.289,25.27,17.037,27.223z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M37.779,18.497c-1.645,0.254-4.246,1.76-2.41,8.354c-0.068,0.01-0.139,0.023-0.205,0.051  c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078  c0.268,0.6,0.576,1.224,0.924,1.861c0.551-0.946,1.072-1.918,1.541-2.922c0.025,0.002,0.055,0.002,0.082,0.002  c1.25,0,2.533-1.101,3.195-2.734c0.773-1.902,0.453-3.844-0.701-4.617c0.053-0.229,0.078-0.355,0.078-0.355  c0.502-2.247,0.574-4.381,0.238-6.312C39.926,16.158,38.717,17.299,37.779,18.497z M35.381,26.849  c0.014-0.014,0.029-0.027,0.043-0.041c0.002,0.01,0.004,0.018,0.008,0.027C35.414,26.837,35.396,26.845,35.381,26.849z   M39.174,22.101L39.174,22.101c-0.02-0.004-0.047-0.015-0.066-0.018C39.127,22.086,39.152,22.097,39.174,22.101z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M47.916,41.694c-1.092-0.569-4.482-1.827-7.205-2.838l-1.533-0.569l-0.273-0.11l-0.359-0.139  l-0.686-0.275l-0.424,0.186c0,0-0.006,0.002-0.008,0.004h-0.002c-1.777,0.695-5.18,1.935-6.166,2.458  c-0.385,0.206-0.832,0.477-1.283,0.835c-0.475-0.392-0.914-0.667-1.234-0.835c-0.85-0.439-4.098-1.619-5.91-2.299l-0.17-0.069  l-0.004,0.005l-0.752-0.304l-0.684,0.299c-0.668,0.263-1.492,0.576-2.373,0.911l-0.08,0.031c-2.607,0.99-5.561,2.113-6.693,2.715  c-2.535,1.346-4.359,3.248-5.438,5.615h20.582h5.561h20.494C51.592,43.797,48.686,42.094,47.916,41.694z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M17.193,22.325c-1.205,1.026-1.531,3.083-0.748,5.124c0.732,1.925,2.256,3.218,3.783,3.218  h0.002c0.23,0.475,0.467,0.945,0.713,1.408h-0.07l0.584,0.965c0,0,0.15,0.248,0.33,0.545c0.486-0.827,0.914-1.646,1.262-2.418  c0.719,0.248,1.637-0.419,2.096-1.547c0.473-1.168,0.27-2.384-0.459-2.711c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002  c-0.012-0.002-0.016-0.002-0.025-0.005c-0.061-0.017-0.123-0.029-0.188-0.034c-0.014-0.002-0.027-0.006-0.041-0.008  c-0.029-0.006-0.07-0.015-0.105-0.023c0.121,0.023,0.232,0.049,0.359,0.07c0.092-0.368,0.137-0.587,0.137-0.587  c1.256-5.633-1.479-10.1-8.1-10.32c-0.012,0-0.021,0.003-0.033,0.003C16.395,17.765,16.594,19.881,17.193,22.325z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M37.779,18.497c-1.645,0.254-4.246,1.76-2.41,8.354c-0.068,0.01-0.139,0.023-0.205,0.051  c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078  c0.359,0.799,0.787,1.648,1.289,2.504c0.564-0.949,1.1-1.934,1.586-2.947c1.395-0.166,2.754-1.375,3.457-3.109  c0.801-1.979,0.545-4.035-0.584-5.104c0.504-2.285,0.584-4.463,0.252-6.444c-0.033-0.002-0.063-0.006-0.096-0.009  C40.098,15.967,38.789,17.205,37.779,18.497z M35.381,26.849c0.014-0.014,0.029-0.027,0.043-0.041  c0.002,0.01,0.004,0.018,0.008,0.027C35.414,26.837,35.396,26.845,35.381,26.849z M39.174,22.101L39.174,22.101  c-0.02-0.004-0.047-0.015-0.066-0.018C39.127,22.086,39.152,22.097,39.174,22.101z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M47.621,42.258c-1.053-0.549-4.424-1.8-7.133-2.807l-1.549-0.574l-0.264-0.108l-0.369-0.142  l-1.045-0.418c-0.033-0.047-0.057-0.107-0.088-0.16c-1.826,0.708-4.971,1.86-5.914,2.361c-0.385,0.206-0.832,0.477-1.283,0.835  c-0.475-0.392-0.914-0.667-1.234-0.835c-0.85-0.439-4.098-1.619-5.91-2.299l-0.092-0.037l-1.285,0.56  c-0.689,0.271-1.549,0.597-2.461,0.943c-2.59,0.986-5.525,2.101-6.619,2.681c-2.309,1.226-4,2.936-5.035,5.057h19.881h5.561h19.785  C50.957,44.163,48.33,42.626,47.621,42.258z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M17.037,27.223c0.641,1.68,1.924,2.807,3.191,2.807c0.131,0,0.264-0.012,0.391-0.037  c0.432,0.934,0.9,1.844,1.398,2.719H22l0.146,0.241c0.334-0.609,0.645-1.212,0.902-1.785c0.719,0.248,1.637-0.419,2.096-1.547  c0.473-1.168,0.27-2.384-0.459-2.711c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002c-0.012-0.002-0.016-0.002-0.025-0.005  c-0.061-0.017-0.123-0.029-0.188-0.034c-0.014-0.002-0.027-0.006-0.041-0.008c-0.029-0.006-0.07-0.015-0.105-0.023  c0.121,0.023,0.232,0.049,0.359,0.07c0.092-0.368,0.137-0.587,0.137-0.587c1.215-5.457-1.322-9.807-7.5-10.273  c-0.182,1.82,0.049,4.01,0.717,6.578C16.682,23.301,16.289,25.27,17.037,27.223z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M37.779,18.497c-1.645,0.254-4.246,1.76-2.41,8.354c-0.068,0.01-0.139,0.023-0.205,0.051  c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078  c0.268,0.6,0.576,1.224,0.924,1.861c0.551-0.946,1.072-1.918,1.541-2.922c0.025,0.002,0.055,0.002,0.082,0.002  c1.25,0,2.533-1.101,3.195-2.734c0.773-1.902,0.453-3.844-0.701-4.617c0.053-0.229,0.078-0.355,0.078-0.355  c0.502-2.247,0.574-4.381,0.238-6.312C39.926,16.158,38.717,17.299,37.779,18.497z M35.381,26.849  c0.014-0.014,0.029-0.027,0.043-0.041c0.002,0.01,0.004,0.018,0.008,0.027C35.414,26.837,35.396,26.845,35.381,26.849z   M39.174,22.101L39.174,22.101c-0.02-0.004-0.047-0.015-0.066-0.018C39.127,22.086,39.152,22.097,39.174,22.101z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="-84.3965" cy="-1.04" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_23_" r="18.6813">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.2" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+<stop offset="0" style="stop-color:#DDC4B0"/>
+<stop offset="0.2" style="stop-color:#DDC4B0"/>
+<stop offset="0.9628" style="stop-color:#A57665"/>
+<stop offset="1" style="stop-color:#A57665"/>
 </radialGradient>
 <path d="M37.447,39.174c-1.643-0.715-1.59-4.214-0.912-5.273c0.117-0.186,0.225-0.37,0.338-0.554H23.129  c0.113,0.184,0.219,0.368,0.338,0.554c0.678,1.06,0.73,4.559-0.914,5.273c-1.645,0.713,7.641,6.929,7.641,6.929  S39.092,39.887,37.447,39.174z" fill="url(#SVGID_23_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="30.001" x2="30.001" y1="38.5244" y2="52.9141">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#BA1212"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="1" style="stop-color:#88444B"/>
 </linearGradient>
 <path d="M47.33,42.822c-1.729-0.9-10.297-3.901-10.459-4.089l-6.545,5.439l-7.031-5.648  c-0.193,0.289-8.662,3.257-10.621,4.298c-2.242,1.189-5.906,3.925-5.906,10.092h46.467C53.234,46.747,49.057,43.719,47.33,42.822z" fill="url(#SVGID_24_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="30.0654" x2="30.0654" y1="37.5811" y2="45.9985">
-<stop offset="0" style="stop-color:#BC1C24"/>
-<stop offset="1" style="stop-color:#6B1C24"/>
+<stop offset="0" style="stop-color:#8C4C54"/>
+<stop offset="1" style="stop-color:#53343E"/>
 </linearGradient>
 <polygon fill="url(#SVGID_25_)" points="21.695,39.225 30.326,46.103 38.436,39.365 36.871,38.733 30.326,44.173 23.295,38.524 "/>
-<path d="M22.1,40.313c0,0-12.316,3.215-12.316,11.844c0,0-1.76,0.002-1.775,0C8.008,46.851,12.15,42.725,22.1,40.313  z" fill="#FF7B56"/>
-<path d="M37.74,40.113c0,0,12.316,3.218,12.316,11.844c0,0,1.762,0,1.775,0C51.832,46.65,47.689,42.525,37.74,40.113  z" fill="#FF7B56"/>
+<path d="M22.1,40.313c0,0-12.316,3.215-12.316,11.844c0,0-1.76,0.002-1.775,0C8.008,46.851,12.15,42.725,22.1,40.313  z" fill="#CCA089"/>
+<path d="M37.74,40.113c0,0,12.316,3.218,12.316,11.844c0,0,1.762,0,1.775,0C51.832,46.65,47.689,42.525,37.74,40.113  z" fill="#CCA089"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="30.0645" x2="30.0645" y1="46.7217" y2="38.7736">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+<stop offset="0" style="stop-color:#DDC4B0"/>
+<stop offset="0.9628" style="stop-color:#A57665"/>
+<stop offset="1" style="stop-color:#A57665"/>
 </linearGradient>
 <polygon fill="url(#SVGID_26_)" points="30.326,46.103 21.691,39.225 21.191,39.445 30.326,46.722 38.938,39.561 38.438,39.358 "/>
 <radialGradient cx="-83.4844" cy="-35.5879" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_27_" r="25.0781">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+<stop offset="0" style="stop-color:#F4EDE4"/>
+<stop offset="0.5091" style="stop-color:#E8D9CA"/>
+<stop offset="0.7636" style="stop-color:#DDC4B0"/>
+<stop offset="1" style="stop-color:#BF9C89"/>
 </radialGradient>
 <path d="M41.398,23.083c-0.059-0.027-0.125-0.031-0.184-0.051V23.03c-0.012-0.002-0.023-0.004-0.035-0.006  c-0.092-0.023-0.182-0.045-0.275-0.051c-11.475-1.996-16.738-8.354-17.135-6.67c-0.316,1.34-3.535,4.236-5.219,5.682  c0.014,0.064,0.021,0.121,0.035,0.188c0,0,0.063,0.296,0.188,0.801c-0.135,0.014-0.264,0.041-0.393,0.094  c-1.07,0.454-1.406,2.21-0.75,3.928c0.658,1.716,2.059,2.744,3.131,2.294c0.066-0.029,0.121-0.078,0.182-0.115  c0.625,1.4,1.389,2.901,2.326,4.406c1.568,1.865,3.973,4.055,6.627,4.055c3.213,0,5.18-1.758,6.529-3.53  c0.033-0.074,0.068-0.144,0.109-0.204c1.002-1.564,1.813-3.135,2.471-4.594c1.047,0.361,2.395-0.612,3.063-2.263  C42.76,25.336,42.461,23.561,41.398,23.083z" fill="url(#SVGID_27_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="25.8574" x2="35.7696" y1="38.709" y2="28.8743">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+<stop offset="0" style="stop-color:#E8D9CA"/>
+<stop offset="1" style="stop-color:#DDC4B0"/>
 </linearGradient>
 <path d="M29.426,36.734c-1.955,0-3.926-0.91-5.377-2.283c1.535,1.612,3.6,3.184,5.848,3.184  c3.213,0,5.18-1.758,6.529-3.53c0.033-0.074,0.068-0.144,0.109-0.204c1.002-1.564,1.813-3.135,2.471-4.594  C35.352,35.689,32.639,36.734,29.426,36.734z" fill="url(#SVGID_28_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="29.8047" x2="29.8047" y1="7.3003" y2="21.8973">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3758" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M29.574,7.086c-3.977,0-5.891,1.809-7.369,3.699c-2.4,0.37-6.209,2.57-3.52,12.218  c1.684-1.444,4.768-5.359,5.084-6.699c0.398-1.697,5.75,4.792,17.445,6.727c0.137-0.541,0.197-0.857,0.197-0.857  C43.25,13.937,39.256,7.407,29.574,7.086z" fill="url(#SVGID_29_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="34.7979" x2="21.5721" y1="21.2656" y2="13.414">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3636" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M23.783,15.516c0,0,5.723,7.517,17.35,7.504C41.133,23.02,35.656,22.159,23.783,15.516z" fill="url(#SVGID_30_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="20.3789" x2="20.495" y1="11.8853" y2="20.2845">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3758" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M22.406,11.344c0,0-5.604,0.334-3.525,9.831C18.881,21.175,18.195,14.67,22.406,11.344z" fill="url(#SVGID_31_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="31.6582" x2="31.2464" y1="8.5503" y2="12.3578">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+<stop offset="0" style="stop-color:#8D7B6A"/>
+<stop offset="1" style="stop-color:#451F1E"/>
 </linearGradient>
 <path d="M32.291,12.66c-2.609-0.375-7.02-2.686-8.75-1.859c0,0,5.662-6.459,15.65,0.895  C39.191,11.695,36.813,13.303,32.291,12.66z" fill="url(#SVGID_32_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -205,17 +205,17 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill="none" height="30" width="30"/>
 <path d="M4.452,29.001c-1.903,0-3.451-1.549-3.451-3.453V4.453c0-1.903,1.548-3.452,3.451-3.452h21.095  c1.905,0,3.454,1.548,3.454,3.452v21.095c0,1.904-1.549,3.453-3.454,3.453H4.452z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<path d="M27.932,25.493c0,1.346-1.092,2.438-2.44,2.438H4.508c-1.347,0-2.438-1.093-2.438-2.438V4.509  c0-1.348,1.091-2.44,2.438-2.44h20.983c1.348,0,2.44,1.093,2.44,2.44V25.493z" fill="#F7B388"/>
+<path d="M27.932,25.493c0,1.346-1.092,2.438-2.44,2.438H4.508c-1.347,0-2.438-1.093-2.438-2.438V4.509  c0-1.348,1.091-2.44,2.438-2.44h20.983c1.348,0,2.44,1.093,2.44,2.44V25.493z" fill="#D6C1A9"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2190.8022" x2="-2167.4888" y1="3344.4668" y2="3321.1533">
-<stop offset="0" style="stop-color:#DF4F20"/>
-<stop offset="0.5" style="stop-color:#F48228"/>
-<stop offset="1" style="stop-color:#CF3A21"/>
+<stop offset="0" style="stop-color:#A66C59"/>
+<stop offset="0.5" style="stop-color:#B78C65"/>
+<stop offset="1" style="stop-color:#9B5D55"/>
 </linearGradient>
 <path d="M4.508,27.188c-0.935,0-1.697-0.761-1.697-1.695V4.509c0-0.937,0.763-1.696,1.697-1.696h20.983  c0.937,0,1.697,0.762,1.697,1.696v20.984c0,0.935-0.76,1.695-1.697,1.695H4.508z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2178.999" x2="-2178.999" y1="3345.792" y2="3319.6384">
-<stop offset="0" style="stop-color:#C5422B"/>
-<stop offset="0.5" style="stop-color:#F48228"/>
-<stop offset="1" style="stop-color:#AD1B00"/>
+<stop offset="0" style="stop-color:#976059"/>
+<stop offset="0.5" style="stop-color:#B78C65"/>
+<stop offset="1" style="stop-color:#793436"/>
 </linearGradient>
 <path d="M25.547,2.413c1.125,0,2.041,0.916,2.041,2.04v21.095c0,1.124-0.917,2.04-2.041,2.04H4.452  c-1.124,0-2.038-0.916-2.038-2.04V4.453c0-1.124,0.915-2.04,2.038-2.04H25.547 M25.547,2.001H4.452  c-1.353,0-2.451,1.098-2.451,2.452v21.095c0,1.354,1.098,2.453,2.451,2.453h21.095c1.354,0,2.454-1.1,2.454-2.453V4.453  C28.001,3.099,26.901,2.001,25.547,2.001L25.547,2.001z" fill="url(#SVGID_2__)"/>
 <circle cx="8.615" cy="21.385" fill="#FFFFFF" r="2.508"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_help.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_help.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_help.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,23 +4,23 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.2666" y2="58.2666">
-<stop offset="0" style="stop-color:#E5FFB2"/>
-<stop offset="0.3879" style="stop-color:#6AAB18"/>
-<stop offset="0.6788" style="stop-color:#247307"/>
-<stop offset="1" style="stop-color:#C2FF4A"/>
+<stop offset="0" style="stop-color:#E1E8C9"/>
+<stop offset="0.3879" style="stop-color:#4C7F44"/>
+<stop offset="0.6788" style="stop-color:#275341"/>
+<stop offset="1" style="stop-color:#B4C980"/>
 </linearGradient>
 <circle cx="30" cy="30" fill="url(#SVGID_1_)" r="28"/>
 <radialGradient cx="30.2666" cy="5.2007" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="51.4665">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </radialGradient>
 <path d="M30,57.2C15.002,57.2,2.801,44.999,2.801,30S15.002,2.8,30,2.8S57.199,15.001,57.199,30  S44.998,57.2,30,57.2L30,57.2z" fill="url(#SVGID_2_)"/>
 <path d="M21.201,19.861v-4.594c2.779-0.641,5.418-0.961,7.916-0.961c3.689,0,6.516,0.714,8.484,2.146  c1.971,1.428,2.955,3.525,2.955,6.292c0,1.609-0.381,2.972-1.137,4.089c-0.76,1.117-5.988,6.37-6.504,7.089s-0.773,1.57-0.773,2.555  v0.984h-7.336v-1.313c0-1.594,0.348-2.94,1.043-4.042c0.695-1.102,1.91-2.465,3.645-4.09c1.359-1.266,3.047-4.203,3.047-4.828  c0-2.827-1.703-4.24-5.109-4.24C25.51,18.947,23.436,19.251,21.201,19.861z M28.439,50c-1.236,0-2.297-0.438-3.188-1.313  c-0.889-0.875-1.334-1.945-1.334-3.211c0-1.25,0.441-2.321,1.322-3.21c0.883-0.891,1.949-1.336,3.199-1.336s2.32,0.445,3.211,1.336  c0.891,0.89,1.336,1.96,1.336,3.21c0,1.266-0.445,2.335-1.336,3.211C30.76,49.563,29.689,50,28.439,50z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <path d="M21.201,18.754v-4.593c2.779-0.64,5.418-0.96,7.916-0.96c3.689,0,6.516,0.714,8.484,2.145  c1.971,1.428,2.955,3.525,2.955,6.292c0,1.609-0.381,2.972-1.137,4.089c-0.76,1.117-5.988,6.371-6.504,7.089  c-0.516,0.719-0.773,1.57-0.773,2.554v0.985h-7.336v-1.313c0-1.594,0.348-2.941,1.043-4.042s1.91-2.465,3.645-4.09  c1.359-1.266,3.047-4.204,3.047-4.828c0-2.827-1.703-4.241-5.109-4.241C25.51,17.841,23.436,18.145,21.201,18.754z M28.439,48.894  c-1.236,0-2.297-0.438-3.188-1.313c-0.889-0.875-1.334-1.945-1.334-3.211c0-1.25,0.441-2.32,1.322-3.21  c0.883-0.891,1.949-1.336,3.199-1.336s2.32,0.445,3.211,1.336s1.336,1.96,1.336,3.21c0,1.266-0.445,2.336-1.336,3.211  C30.76,48.456,29.689,48.894,28.439,48.894z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30.8789" x2="30.8789" y1="11.7944" y2="47.7757">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#F9FCF9"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M21.201,17.461v-4.593c2.779-0.641,5.418-0.961,7.916-0.961c3.689,0,6.516,0.714,8.484,2.145  c1.971,1.428,2.955,3.525,2.955,6.292c0,1.61-0.381,2.972-1.137,4.089c-0.76,1.117-5.988,6.371-6.504,7.089  s-0.773,1.571-0.773,2.554v0.985h-7.336v-1.313c0-1.594,0.348-2.941,1.043-4.042c0.695-1.101,1.91-2.465,3.645-4.09  c1.359-1.265,3.047-4.203,3.047-4.828c0-2.826-1.703-4.241-5.109-4.241C25.51,16.546,23.436,16.852,21.201,17.461z M28.439,47.6  c-1.236,0-2.297-0.438-3.188-1.312c-0.889-0.875-1.334-1.945-1.334-3.211c0-1.25,0.441-2.32,1.322-3.21  c0.883-0.891,1.949-1.336,3.199-1.336s2.32,0.445,3.211,1.336s1.336,1.96,1.336,3.21c0,1.266-0.445,2.336-1.336,3.211  C30.76,47.162,29.689,47.6,28.439,47.6z" fill="url(#SVGID_3_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_hold_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_hold_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_hold_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,37 +3,37 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-2349.8247" cy="1517.2324" gradientTransform="matrix(4.489659e-010 -1 -1 -4.489659e-010 1546.7637 -2331.9561)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="36.2594">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="0.297" style="stop-color:#FFC144"/>
-<stop offset="0.6667" style="stop-color:#EF6902"/>
-<stop offset="0.7939" style="stop-color:#FEB037"/>
-<stop offset="1" style="stop-color:#FEB037"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="0.297" style="stop-color:#C7B17C"/>
+<stop offset="0.6667" style="stop-color:#A86F49"/>
+<stop offset="0.7939" style="stop-color:#C2A673"/>
+<stop offset="1" style="stop-color:#C2A673"/>
 </radialGradient>
 <path d="M42.117,24.584c-0.412,0.077-0.578,0.316-0.602,0.895c-0.027,0.719-0.291,3.172-0.433,3.764  c-0.125,0.521-0.342,0.804-0.94,0.979c-0.75,0.221-3.188,1.038-10.144,1.039c-6.953,0-9.396-0.809-10.142-1.038  c-0.651-0.201-0.774-0.389-0.94-0.98c-0.162-0.586-0.401-3.045-0.433-3.764c-0.022-0.576-0.157-0.819-0.575-0.883  c-0.729-0.113-13.291-2.238-14.601-2.502c-0.795-0.158-1.236-0.045-1.293,0.704c-0.231,3.013,2.01,7.642,3.004,9.068  c0.888,1.272,1.688,2.664,3.82,3.555C10.869,36.267,20.977,37.97,30,37.97c9.027,0,19.132-1.705,21.159-2.549  c2.134-0.891,2.934-2.282,3.82-3.555c0.994-1.429,3.236-6.056,3.005-9.068c-0.057-0.749-0.499-0.862-1.293-0.702  C55.381,22.357,42.832,24.451,42.117,24.584z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(4.489659e-010 -1 -1 -4.489659e-010 1546.7637 -2331.9561)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2359.3091" x2="-2358.9661" y1="1529.9209" y2="1527.0802">
-<stop offset="0" style="stop-color:#E17B15"/>
-<stop offset="1" style="stop-color:#B05004"/>
+<stop offset="0" style="stop-color:#A47952"/>
+<stop offset="1" style="stop-color:#7C4738"/>
 </linearGradient>
 <path d="M19.859,30.222c-0.652-0.201-0.775-0.389-0.941-0.98c-0.162-0.586-0.402-3.045-0.432-3.764  c-0.023-0.576-0.158-0.819-0.576-0.883c-0.047-0.008-0.061-0.011-0.061-0.012c-0.246-0.039-0.994-0.165-2.041-0.34  c0.024,0.255,0.371,3.523,1.034,4.354C18.064,30.123,19.859,30.222,19.859,30.222z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(4.489659e-010 -1 1 4.489659e-010 2447.9541 -2331.959)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2359.3081" x2="-2358.9651" y1="-2404.8115" y2="-2407.6523">
-<stop offset="0" style="stop-color:#E17B15"/>
-<stop offset="1" style="stop-color:#B05004"/>
+<stop offset="0" style="stop-color:#A47952"/>
+<stop offset="1" style="stop-color:#7C4738"/>
 </linearGradient>
 <path d="M40.16,30.222c0.654-0.203,0.779-0.389,0.943-0.98c0.162-0.586,0.401-3.045,0.434-3.766  c0.021-0.574,0.158-0.817,0.574-0.883c0.045-0.008,0.059-0.009,0.059-0.009c0.246-0.04,0.994-0.166,2.041-0.34  c-0.026,0.256-0.369,3.522-1.035,4.354C41.957,30.124,40.16,30.222,40.16,30.222z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 -1182.6451 -838.0215)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1453.7261" x2="-1488.9213" y1="-225.5083" y2="-260.7034">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+<stop offset="0" style="stop-color:#D3C59A"/>
+<stop offset="1" style="stop-color:#D0BA98"/>
 </linearGradient>
 <path d="M54.979,31.252c-0.888,1.272-1.688,2.667-3.819,3.555  c-2.027,0.845-12.132,2.549-21.16,2.549c-9.025,0-19.129-1.704-21.158-2.549c-2.133-0.889-2.934-2.281-3.82-3.555  c-0.912-1.312-2.873-5.318-3.008-8.299c-0.147,3.014,2.029,7.509,3.008,8.913c0.888,1.272,1.688,2.664,3.82,3.555  C10.869,36.267,20.977,37.97,30,37.97c9.027,0,19.132-1.705,21.159-2.549c2.134-0.891,2.934-2.282,3.82-3.555  c0.979-1.404,3.158-5.899,3.009-8.913C57.854,25.934,55.895,29.94,54.979,31.252z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 -1182.6451 -838.0215)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-1449.3701" x2="-1489.4139" y1="-225.6621" y2="-265.7059">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+<stop offset="0" style="stop-color:#D3C59A"/>
+<stop offset="1" style="stop-color:#D0BA98"/>
 </linearGradient>
 <path d="M42.117,24.584c-0.412,0.077-0.578,0.316-0.602,0.895  c-0.027,0.719-0.291,3.172-0.433,3.764c-0.125,0.521-0.342,0.804-0.94,0.979c-0.75,0.221-3.188,1.038-10.144,1.039  c-6.953,0-9.396-0.809-10.142-1.038c-0.651-0.201-0.774-0.389-0.94-0.98c-0.162-0.586-0.401-3.045-0.433-3.764  c-0.022-0.576-0.157-0.819-0.575-0.883c-0.729-0.113-13.291-2.238-14.601-2.502c-0.795-0.158-1.236-0.045-1.293,0.704  c-0.027,0.354-0.018,0.729,0.019,1.12c0.094-0.645,0.524-0.747,1.274-0.596c1.312,0.265,13.869,2.388,14.601,2.5  c0.418,0.064,0.553,0.309,0.575,0.884c0.029,0.722,0.271,3.179,0.433,3.766c0.164,0.589,0.289,0.776,0.94,0.979  c0.746,0.229,3.188,1.038,10.142,1.037c6.955,0.001,9.394-0.816,10.144-1.036c0.6-0.177,0.815-0.458,0.94-0.981  c0.142-0.59,0.402-3.043,0.433-3.763c0.022-0.576,0.188-0.815,0.602-0.894c0.715-0.133,13.264-2.228,14.574-2.49  c0.75-0.151,1.184-0.051,1.274,0.594c0.036-0.389,0.046-0.768,0.019-1.119c-0.058-0.749-0.499-0.863-1.293-0.703  C55.381,22.357,42.832,24.451,42.117,24.584z" fill="url(#SVGID_5_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(4.489659e-010 -1 -1 -4.489659e-010 1571.1406 -2294.7852)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2328.7651" x2="-2328.7651" y1="1565.4004" y2="1516.2345">
-<stop offset="0" style="stop-color:#CF8122"/>
-<stop offset="0.5" style="stop-color:#8C4105"/>
-<stop offset="1" style="stop-color:#CF8122"/>
+<stop offset="0" style="stop-color:#9B7956"/>
+<stop offset="0.5" style="stop-color:#64352E"/>
+<stop offset="1" style="stop-color:#9B7956"/>
 </linearGradient>
 <path d="M53.646,32.675C51.37,33.519,39.55,35.204,30,35.205  c-9.551,0-21.371-1.688-23.645-2.53c-0.433-0.161-0.804-0.342-1.144-0.532c0.231,0.341,0.472,0.687,0.731,1.025  c0.068,0.026,0.127,0.056,0.197,0.083C8.451,34.105,20.387,35.818,30,35.818c9.614,0,21.55-1.711,23.86-2.566  c0.069-0.027,0.129-0.059,0.196-0.085c0.261-0.339,0.5-0.685,0.733-1.023C54.447,32.333,54.077,32.514,53.646,32.675z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_homezone.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_homezone.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_homezone.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,54 +4,54 @@
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.002" x2="30.002" y1="11.8628" y2="56.8359">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#969899"/>
+<stop offset="1" style="stop-color:#979898"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="52.176,57 7.829,57 7.829,33.938 30,11.426 52.176,33.938 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.0024" x2="30.0024" y1="56.21" y2="32.4016">
-<stop offset="0" style="stop-color:#D9DADA"/>
+<stop offset="0" style="stop-color:#D9DAD9"/>
 <stop offset="1" style="stop-color:#989999"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="8.538,56.291 8.538,32.809 30,11.018 51.467,32.809 51.467,56.291 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30.0024" x2="30.0024" y1="55.9912" y2="24.6791">
-<stop offset="0" style="stop-color:#F8F9F9"/>
-<stop offset="1" style="stop-color:#D6D8D9"/>
+<stop offset="0" style="stop-color:#F8F9F8"/>
+<stop offset="1" style="stop-color:#D7D8D8"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="9.958,56.291 9.958,31.262 30,10.911 50.047,31.262 50.047,56.291 "/>
 <rect fill-opacity="0.15" height="24.126" width="17.031" x="21.487" y="32.874"/>
 <rect fill-opacity="0.5" height="23.416" width="15.61" x="22.197" y="33.584"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30.0024" x2="30.0024" y1="56.9395" y2="34.2324">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#632100"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#451E21"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="22.707" width="14.191" x="22.906" y="34.293"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30.002" x2="30.002" y1="34.3389" y2="56.9575">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="21.288" width="12.773" x="23.616" y="35.003"/>
 <polygon fill-opacity="0.15" points="30,11.426 7.829,33.938 7.829,37.05 30,14.264 52.176,37.05 52.176,33.938 "/>
 <polygon fill-opacity="0.35" points="30,11.426 7.829,33.938 7.829,35.631 30,12.845 52.176,35.631 52.176,33.938 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="29.9995" x2="29.9995" y1="0.772" y2="35.3261">
-<stop offset="0" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#992006"/>
+<stop offset="0" style="stop-color:#A86F5F"/>
+<stop offset="1" style="stop-color:#6D3235"/>
 </linearGradient>
 <path d="M30,11.426l22.176,22.785l4.434-4.555c0,0-23.922-24.521-25.035-25.733  c-1.115-1.209-1.833-1.274-3.209,0.069C26.999,5.338,3.391,29.656,3.391,29.656l4.438,4.555L30,11.426z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="29.9985" x2="29.9985" y1="1.605" y2="34.2477">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<stop offset="0" style="stop-color:#A8835F"/>
+<stop offset="0.2606" style="stop-color:#A86F5F"/>
+<stop offset="1" style="stop-color:#9A5047"/>
 </linearGradient>
 <path d="M4.38,29.656c3.367-3.468,23.247-23.94,24.483-25.158c0.535-0.522,0.941-0.788,1.205-0.788  c0.235,0,0.548,0.221,0.985,0.694c1.031,1.125,21.078,21.677,24.564,25.253l-3.441,3.537L30,10.409L7.828,33.194L4.38,29.656z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="29.9985" x2="29.9985" y1="3.5249" y2="29.1588">
-<stop offset="0" style="stop-color:#F7D481"/>
-<stop offset="1" style="stop-color:#F5340A"/>
+<stop offset="0" style="stop-color:#D4C9A4"/>
+<stop offset="1" style="stop-color:#AF6151"/>
 </linearGradient>
 <path d="M28.863,5.917c0.535-0.522,0.941-0.788,1.205-0.788c0.235,0,0.548,0.221,0.985,0.694  c0.977,1.066,19.014,19.562,23.875,24.544l0.689-0.71C52.131,26.082,32.084,5.529,31.053,4.404c-0.437-0.474-0.75-0.694-0.985-0.694  c-0.264,0-0.67,0.266-1.205,0.788C27.626,5.716,7.747,26.188,4.38,29.656l0.69,0.708C9.841,25.451,27.693,7.069,28.863,5.917z" fill="url(#SVGID_8_)"/>
 <path d="M33.904,48.131c-1.369,0-2.482-1.115-2.482-2.484s1.113-2.483,2.482-2.483s2.484,1.114,2.484,2.483  S35.273,48.131,33.904,48.131L33.904,48.131z" fill-opacity="0.1"/>
 <circle cx="33.904" cy="45.646" fill-opacity="0.15" r="1.773"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="33.9043" x2="33.9043" y1="44.5342" y2="46.6904">
-<stop offset="0" style="stop-color:#ED8100"/>
-<stop offset="1" style="stop-color:#B04400"/>
+<stop offset="0" style="stop-color:#A67647"/>
+<stop offset="1" style="stop-color:#7B4135"/>
 </linearGradient>
 <path d="M33.904,46.711c-0.586,0-1.064-0.478-1.064-1.064c0-0.586,0.479-1.064,1.064-1.064  c0.588,0,1.064,0.479,1.064,1.064C34.969,46.233,34.492,46.711,33.904,46.711L33.904,46.711z" fill="url(#SVGID_9_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_im.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_im.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_im.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,9 +5,9 @@
 <rect fill="none" height="60" width="60"/>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="332.6348" cy="1113.6206" gradientTransform="matrix(1 0 0 1 -304 -1104)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="40.177">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <path d="M12.382,51.741c-0.268,0-0.437-0.438-0.437-1.114v-9.345l-0.157-0.102  c-6-4.087-9.439-10.062-9.439-16.389c0-11.811,11.883-21.418,26.486-21.418s26.486,9.608,26.486,21.418  c0,11.811-11.883,21.418-26.486,21.418c-3.297,0-6.522-0.489-9.588-1.454l-0.215-0.069l-5.752,6.45  C12.941,51.514,12.606,51.741,12.382,51.741L12.382,51.741z" fill="url(#SVGID_1_)"/>
 <rect fill="#FFFFFF" height="1.234" width="27.511" x="15.059" y="15.13"/>
@@ -20,22 +20,22 @@
 <rect fill-opacity="0.1" height="0.616" stroke-opacity="0.1" width="27.511" x="15.059" y="32.924"/>
 <rect fill-opacity="0.2" height="0.616" stroke-opacity="0.2" width="27.511" x="15.059" y="32.301"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -304 -1104)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="332.6865" x2="332.6865" y1="1106.7769" y2="1152.0294">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#113F85"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#343962"/>
 </linearGradient>
 <path d="M28.687,3.023C13.948,3.023,2,12.714,2,24.671c0,6.659,3.712,12.613,9.544,16.584v9.107  c0,1.6,0.873,1.932,1.936,0.738l5.571-6.245c2.99,0.94,6.237,1.462,9.638,1.462c14.736,0,26.685-9.692,26.685-21.647  C55.372,12.714,43.423,3.023,28.687,3.023z M28.687,45.18c-3.195,0-6.322-0.474-9.297-1.41l-0.7-0.22l-6.007,6.735v-9.63  l-0.499-0.34c-5.747-3.913-9.046-9.612-9.046-15.644c0-11.309,11.463-20.509,25.549-20.509c14.088,0,25.547,9.2,25.547,20.509  C54.233,35.979,42.774,45.18,28.687,45.18z" fill="url(#SVGID_2_)"/>
 <path d="M54.942,28.519c-3.528-3.098-8.502-5.042-14.019-5.042  c-10.671,0-19.353,7.235-19.353,16.13c0,2.199,0.535,4.292,1.494,6.206c1.814,0.314,3.688,0.5,5.621,0.5  C41.804,46.318,52.704,38.638,54.942,28.519z" fill-opacity="0.15" stroke-opacity="0.15"/>
 <path d="M54.624,29.76c-3.344-3.145-8.237-5.143-13.7-5.143  c-10.044,0-18.214,6.724-18.214,14.991c0,2.3,0.65,4.473,1.78,6.422c1.37,0.177,2.765,0.289,4.196,0.289  C41.262,46.318,51.801,39.258,54.624,29.76z" fill-opacity="0.15" stroke-opacity="0.15"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -304 -1104)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="344.9238" x2="344.9238" y1="1129.416" y2="1160.7534">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="1" style="stop-color:#BD6500"/>
+<stop offset="0" style="stop-color:#D3CA99"/>
+<stop offset="1" style="stop-color:#845239"/>
 </linearGradient>
 <path d="M23.848,39.607c0,7.649,7.646,13.85,17.076,13.85c2.177,0,4.253-0.333,6.168-0.935l3.563,3.996  c0.686,0.764,1.239,0.553,1.239-0.473v-5.828C55.626,47.679,58,43.868,58,39.607c0-7.651-7.644-13.85-17.076-13.85  C31.494,25.755,23.848,31.956,23.848,39.607z" fill="url(#SVGID_3_)"/>
 <radialGradient cx="345.2559" cy="1131.3125" gradientTransform="matrix(1 0 0 1 -304 -1104)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="25.7806">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.0667" style="stop-color:#FEE16E"/>
-<stop offset="0.697" style="stop-color:#F09000"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#D3CA99"/>
+<stop offset="0.0667" style="stop-color:#D3CA99"/>
+<stop offset="0.697" style="stop-color:#A87D48"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M47.452,51.216l-0.701,0.22c-1.863,0.587-3.824,0.882-5.827,0.882  c-8.787,0-15.938-5.703-15.938-12.711c0-7.01,7.15-12.715,15.938-12.715c8.79,0,15.938,5.705,15.938,12.715  c0,3.719-2.044,7.24-5.608,9.67l-0.498,0.338v5.305L47.452,51.216z" fill="url(#SVGID_4_)"/>
 <rect fill="#FFFFFF" height="1.138" width="18.451" x="31.698" y="42.878"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_imageprint.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_imageprint.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_imageprint.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,36 +4,36 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.998" x2="29.998" y1="5.7212" y2="28.1196">
-<stop offset="0" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#585B5C"/>
+<stop offset="0" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#595A5B"/>
 </linearGradient>
 <path d="M49.198,26.8c0,0.885-0.717,1.6-1.601,1.6H12.398c-0.883,0-1.6-0.715-1.6-1.6V7.601  c0-0.883,0.717-1.6,1.6-1.6h35.199c0.884,0,1.601,0.717,1.601,1.6V26.8z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="17.6411" y2="46.4399">
-<stop offset="0" style="stop-color:#DDE3E6"/>
-<stop offset="0.6909" style="stop-color:#C0CCD1"/>
-<stop offset="1" style="stop-color:#9BA1A3"/>
+<stop offset="0" style="stop-color:#E0E3E1"/>
+<stop offset="0.6909" style="stop-color:#C5CCC9"/>
+<stop offset="1" style="stop-color:#9DA1A1"/>
 </linearGradient>
 <path d="M57.998,43.6c0,1.769-1.432,3.2-3.201,3.2H5.199C3.434,46.8,2,45.368,2,43.6V21.2  c0-1.766,1.434-3.199,3.199-3.199h49.598c1.77,0,3.201,1.434,3.201,3.199V43.6z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="18.9814" y2="45.166">
-<stop offset="0" style="stop-color:#BDC3C4"/>
-<stop offset="0.3515" style="stop-color:#DDE3E6"/>
-<stop offset="0.6545" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#BFC2C1"/>
+<stop offset="0.3515" style="stop-color:#E0E3E1"/>
+<stop offset="0.6545" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M54.8,45.493H5.199c-1.043,0-1.893-0.849-1.893-1.893V21.2c0-1.043,0.85-1.892,1.893-1.892H54.8  c1.044,0,1.893,0.849,1.893,1.892v22.4C56.692,44.645,55.844,45.493,54.8,45.493L54.8,45.493z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.998" x2="29.998" y1="37.9102" y2="45.1094">
-<stop offset="0" style="stop-color:#131414"/>
-<stop offset="0.2424" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#444747"/>
+<stop offset="0" style="stop-color:#131314"/>
+<stop offset="0.2424" style="stop-color:#262628"/>
+<stop offset="1" style="stop-color:#454646"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="7.199" width="38.399" x="10.799" y="38"/>
 <rect fill="#FFFFFF" fill-opacity="0.2" height="1.307" stroke-opacity="0.2" width="38.399" x="10.799" y="36.693"/>
-<rect fill="#6D6E70" height="0.799" width="36.797" x="11.6" y="54.8"/>
+<rect fill="#6E6E6F" height="0.799" width="36.797" x="11.6" y="54.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="29.998" x2="29.998" y1="42.6509" y2="54.6499">
-<stop offset="0" style="stop-color:#585B5C"/>
-<stop offset="0.7879" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#595A5B"/>
+<stop offset="0.7879" style="stop-color:#989D9D"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5_)" points="49.198,42.801 48.396,42.801 11.6,42.801 10.799,42.801 10.799,43.6 11.6,43.6 11.6,54.8   48.396,54.8 48.396,43.6 49.198,43.6 "/>
 <rect fill="#020202" fill-opacity="0.15" height="12" stroke-opacity="0.15" width="35.199" x="12.398" y="6.001"/>
@@ -65,40 +65,40 @@
 </linearGradient>
 <polygon fill="url(#SVGID_9_)" points="46.799,57.198 38.332,57.198 34.611,57.112 20.8,55.063 14.338,51.975 13.642,51.294   13.2,50.225 13.2,39.601 46.799,39.601 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="38.749" x2="22.3049" y1="37.021" y2="56.1539">
-<stop offset="0" style="stop-color:#C2F3FF"/>
-<stop offset="0.3758" style="stop-color:#2D9BD2"/>
-<stop offset="0.6909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#D4EDDD"/>
+<stop offset="0.3758" style="stop-color:#5F8BA1"/>
+<stop offset="0.6909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <polygon fill="url(#SVGID_10_)" points="45.199,54.8 22.799,54.8 14.801,52.398 14.801,39.601 45.199,39.601 "/>
 <linearGradient gradientTransform="matrix(0.8734 -0.108 0.1257 0.9176 55.8475 218.6808)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-7.1758" x2="-5.4868" y1="-190.3931" y2="-184.663">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
 </linearGradient>
 <path d="M32.764,41.259c0,0-10.45,3.05-11.486,13.332C21.277,54.591,32.56,51.987,32.764,41.259z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="24.5244" x2="17.7473" y1="44.6128" y2="48.3141">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
 </linearGradient>
 <path d="M18.223,39.601c0,0,6.994,6.28,6.553,15.199h-1.977l-7.998-3.039v-12.16H18.223z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="13.4502" x2="18.0304" y1="47.0591" y2="46.2696">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
 </linearGradient>
 <path d="M14.801,39.601v12.798c0,0,4.039,1.376,4.026,0.881c-0.196-7.036-2.468-11.459-4.024-13.679H14.801z  " fill="url(#SVGID_13_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="29.6777" x2="37.6251" y1="46.6196" y2="52.8009">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
 </linearGradient>
 <path d="M22.893,54.8c0,0,2.605-8.37,20.937-10.631c0,0-1.723,7.344-9.751,10.631H22.893z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="38.2305" x2="26.6075" y1="43.4058" y2="56.9659">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
 </linearGradient>
 <path d="M43.801,44.278c0.018-0.069,0.028-0.109,0.028-0.109C25.092,46.172,22.893,54.8,22.893,54.8h0.479  C23.372,54.8,24.978,46.563,43.801,44.278z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="39.4199" x2="34.4577" y1="53.3096" y2="48.4554">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
 </linearGradient>
 <path d="M27.33,54.8c0,0,6.406-2.688,16.471-10.521c-0.225,2.718-2.982,8.391-9.723,10.521H27.33z" fill="url(#SVGID_16_)"/>
 <rect fill="#FFFFFF" fill-opacity="0.3" height="0.801" stroke-opacity="0.3" width="21.6" x="23.6" y="53.999"/>
@@ -118,32 +118,32 @@
 <rect fill="#020202" fill-opacity="0.1" height="0.802" stroke-opacity="0.1" width="38.399" x="10.799" y="16.4"/>
 <path d="M8.4,18.001V21.2c0,2.205,1.793,3.999,3.998,3.999h35.199c2.205,0,4-1.794,4-3.999v-3.199H8.4  z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="29.999" x2="29.999" y1="17.9209" y2="24.3213">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="0.7576" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#1F2021"/>
+<stop offset="0" style="stop-color:#A2A6A5"/>
+<stop offset="0.7576" style="stop-color:#262628"/>
+<stop offset="1" style="stop-color:#202020"/>
 </linearGradient>
 <path d="M9.199,18.001V21.2c0,1.769,1.434,3.201,3.199,3.201h35.199c1.767,0,3.201-1.433,3.201-3.201v-3.199  H9.199z" fill="url(#SVGID_18_)"/>
 <rect fill="#FFFFFF" fill-opacity="0.2" height="1.307" stroke-opacity="0.2" width="41.6" x="9.199" y="18.001"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="53.1973" x2="53.1973" y1="41.2002" y2="44.4434">
-<stop offset="0" style="stop-color:#576266"/>
+<stop offset="0" style="stop-color:#5C5F62"/>
 <stop offset="1" style="stop-color:#E3E3E3"/>
 </linearGradient>
 <path d="M54.797,43.597c0,0.441-0.359,0.799-0.799,0.799h-1.6c-0.441,0-0.801-0.357-0.801-0.799v-1.598  c0-0.441,0.359-0.799,0.801-0.799h1.6c0.439,0,0.799,0.357,0.799,0.799V43.597z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="53.1982" x2="53.1982" y1="41.9692" y2="43.616">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+<stop offset="0" style="stop-color:#C6B17B"/>
+<stop offset="0.7455" style="stop-color:#98604F"/>
+<stop offset="1" style="stop-color:#7F3736"/>
 </linearGradient>
 <rect fill="url(#SVGID_20_)" height="1.598" width="1.6" x="52.398" y="41.999"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="53.1973" x2="53.1973" y1="36.4004" y2="39.6486">
-<stop offset="0" style="stop-color:#576266"/>
+<stop offset="0" style="stop-color:#5C5F62"/>
 <stop offset="1" style="stop-color:#C4C4C4"/>
 </linearGradient>
 <path d="M54.797,38.799c0,0.444-0.357,0.802-0.801,0.802h-1.598c-0.441,0-0.801-0.357-0.801-0.802v-1.6  c0-0.441,0.359-0.799,0.801-0.799h1.598c0.443,0,0.801,0.357,0.801,0.799V38.799z" fill="url(#SVGID_21_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="53.1973" x2="53.1973" y1="37.1694" y2="38.8182">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <rect fill="url(#SVGID_22_)" height="1.6" width="1.598" x="52.398" y="37.199"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,16 +5,16 @@
 <rect fill="none" height="60" width="60"/>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.2666" y2="58.2666">
-<stop offset="0" style="stop-color:#E5FFB2"/>
-<stop offset="0.3879" style="stop-color:#6AAB18"/>
-<stop offset="0.6788" style="stop-color:#247307"/>
-<stop offset="1" style="stop-color:#C2FF4A"/>
+<stop offset="0" style="stop-color:#E1E8C9"/>
+<stop offset="0.3879" style="stop-color:#4C7F44"/>
+<stop offset="0.6788" style="stop-color:#275341"/>
+<stop offset="1" style="stop-color:#B4C980"/>
 </linearGradient>
 <circle cx="30" cy="30" fill="url(#SVGID_1_)" r="28"/>
 <radialGradient cx="30.2666" cy="5.2007" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="51.4669">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </radialGradient>
 <path d="M30,57.2C15.002,57.2,2.801,44.999,2.801,30S15.002,2.8,30,2.8c14.999,0,27.2,12.201,27.2,27.2  S44.999,57.2,30,57.2L30,57.2z" fill="url(#SVGID_2_)"/>
 <polygon fill-opacity="0.1" points="23.799,27.181 26.471,27.181 26.471,50.313 34.252,50.313 34.252,22.751 23.799,22.751 " stroke-opacity="0.1"/>
@@ -22,13 +22,13 @@
 <polygon fill-opacity="0.2" points="23.799,26.38 26.471,26.38 26.471,49.513 34.252,49.513 34.252,21.95 23.799,21.95 " stroke-opacity="0.2"/>
 <path d="M30.39,19.091c1.281,0,2.31-0.316,3.083-0.949s1.159-1.503,1.159-2.613c0-1.077-0.399-1.94-1.196-2.589  s-1.813-0.974-3.046-0.974c-1.297,0-2.323,0.321-3.081,0.962c-0.76,0.641-1.138,1.507-1.138,2.601c0,1.11,0.388,1.98,1.161,2.613  S29.124,19.091,30.39,19.091z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.0254" x2="29.0254" y1="11.5566" y2="49.1577">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#F9FCF9"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="23.799,25.581 26.471,25.581 26.471,48.713 34.252,48.713 34.252,21.15 23.799,21.15 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30.373" x2="30.373" y1="11.5576" y2="49.1534">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#F9FCF9"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M30.361,18.291c1.281,0,2.309-0.315,3.083-0.948c0.773-0.633,1.159-1.504,1.159-2.613  c0-1.079-0.398-1.941-1.195-2.59s-1.813-0.973-3.047-0.973c-1.297,0-2.323,0.32-3.082,0.961s-1.137,1.507-1.137,2.602  c0,1.109,0.388,1.98,1.161,2.613C28.076,17.976,29.096,18.291,30.361,18.291z" fill="url(#SVGID_4_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_input_device.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_input_device.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_input_device.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,15 +4,15 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="21.5996" x2="21.5996" y1="23.4971" y2="-23.1007">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7308" style="stop-color:#818687"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7308" style="stop-color:#838585"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M6.505,55.064C6.505,56.68,7.809,58,9.401,58h41.197  c1.594,0,2.896-1.32,2.896-2.936V14.48c0-1.615-1.303-2.937-2.896-2.937H9.401c-1.592,0-2.896,1.321-2.896,2.937V55.064z" fill="url(#SVGID_1_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="21.6001" x2="21.6001" y1="22.0293" y2="-21.623">
-<stop offset="0" style="stop-color:#E5EBED"/>
-<stop offset="0.6727" style="stop-color:#A1A9AC"/>
-<stop offset="1" style="stop-color:#C6CDCF"/>
+<stop offset="0" style="stop-color:#E7EBE8"/>
+<stop offset="0.6727" style="stop-color:#A4A9A8"/>
+<stop offset="1" style="stop-color:#C9CCCB"/>
 </linearGradient>
 <path d="M50.598,56.531H9.401c-0.789,0-1.427-0.66-1.427-1.477V14.48c0-0.809,0.638-1.469,1.427-1.469h41.197  c0.785,0,1.428,0.66,1.428,1.469v40.575C52.025,55.871,51.383,56.531,50.598,56.531L50.598,56.531z" fill="url(#SVGID_2_)"/>
 <g>
@@ -40,12 +40,12 @@
 <path d="M20.329,17.206v16.877c0,2.028,1.644,3.672,3.671,3.672c2.027,0,3.67-1.644,3.67-3.672V17.206   H20.329z" fill="url(#SVGID_5_)"/>
 <path d="M20.329,22.951c1.151,0.404,2.382,0.635,3.671,0.635   c1.29,0,2.52-0.23,3.67-0.635v-9.646h-7.341V22.951z" fill-opacity="0.5" stroke-opacity="0.5"/>
 <radialGradient cx="15.5718" cy="32.6318" gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="19.0015">
-<stop offset="0" style="stop-color:#C0E76F"/>
-<stop offset="0.1333" style="stop-color:#C0E76F"/>
-<stop offset="0.4848" style="stop-color:#79BE19"/>
-<stop offset="0.7091" style="stop-color:#428C0F"/>
-<stop offset="0.8545" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#96CF3D"/>
+<stop offset="0" style="stop-color:#B6C393"/>
+<stop offset="0.1333" style="stop-color:#B6C393"/>
+<stop offset="0.4848" style="stop-color:#5E8D4A"/>
+<stop offset="0.7091" style="stop-color:#356742"/>
+<stop offset="0.8545" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#8DA369"/>
 </radialGradient>
 <path d="M34.059,12.059c0,5.56-4.502,10.057-10.059,10.057c-5.556,0-10.058-4.497-10.058-10.057   C13.941,6.505,18.443,2,24,2C29.557,2,34.059,6.505,34.059,12.059z" fill="url(#SVGID_6_)"/>
 </g>
@@ -59,9 +59,9 @@
 </linearGradient>
 <path d="M50.199,25.41c0,3.157-2.558,5.717-5.717,5.717c-3.156,0-5.718-2.56-5.718-5.717   c0-3.161,2.562-5.717,5.718-5.717C47.642,19.693,50.199,22.249,50.199,25.41z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="36.082" x2="36.082" y1="14.4321" y2="5.0154">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
 </linearGradient>
 <path d="M44.482,30.377c-3.016,0-5.469-2.451-5.469-5.467c0-3.017,2.453-5.469,5.469-5.469   c3.014,0,5.469,2.452,5.469,5.469C49.951,27.926,47.498,30.377,44.482,30.377L44.482,30.377z" fill="url(#SVGID_8_)"/>
 </g>
@@ -75,10 +75,10 @@
 </linearGradient>
 <circle cx="44.48" cy="43.885" fill="url(#SVGID_9_)" r="5.718"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="36.0811" x2="36.0811" y1="-4.0439" y2="-13.4606">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="0.1576" style="stop-color:#36B5FF"/>
-<stop offset="0.8242" style="stop-color:#1B66D8"/>
-<stop offset="1" style="stop-color:#2183E0"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="0.1576" style="stop-color:#72B9C3"/>
+<stop offset="0.8242" style="stop-color:#546F9F"/>
+<stop offset="1" style="stop-color:#5A82A7"/>
 </linearGradient>
 <path d="M44.48,48.854c-3.015,0-5.467-2.453-5.467-5.47c0-3.015,2.452-5.466,5.467-5.466   c3.016,0,5.469,2.451,5.469,5.466C49.949,46.4,47.496,48.854,44.48,48.854L44.48,48.854z" fill="url(#SVGID_10_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_internet_radio.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_internet_radio.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_internet_radio.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,28 +4,28 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="11.647" y2="52.3348">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
 </linearGradient>
 <path d="M58,50.776c0,0.858-0.697,1.556-1.557,1.556H3.555C2.694,52.332,2,51.635,2,50.776V13.443  c0-0.859,0.694-1.556,1.555-1.556h52.889c0.859,0,1.557,0.696,1.557,1.556V50.776z" fill="url(#SVGID_1_)"/>
 <path d="M56.443,11.888H3.555C2.694,11.888,2,12.584,2,13.443v12.056l56-6.158v-5.897  C58,12.584,57.303,11.888,56.443,11.888z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M56.443,12.666c0.428,0,0.777,0.349,0.777,0.777v37.333c0,0.428-0.35,0.778-0.777,0.778H3.555  c-0.43,0-0.778-0.351-0.778-0.778V13.443c0-0.429,0.349-0.777,0.778-0.777H56.443 M56.443,11.888H3.555  C2.694,11.888,2,12.584,2,13.443v37.333c0,0.858,0.694,1.556,1.555,1.556h52.889c0.859,0,1.557-0.697,1.557-1.556V13.443  C58,12.584,57.303,11.888,56.443,11.888L56.443,11.888z" fill="#D83506"/>
-<path d="M56.443,51.555H3.555C2.694,51.555,2,50.857,2,49.999v0.777c0,0.858,0.694,1.556,1.555,1.556h52.889  c0.859,0,1.557-0.697,1.557-1.556v-0.777C58,50.857,57.303,51.555,56.443,51.555z" fill="#600909"/>
+<path d="M56.443,12.666c0.428,0,0.777,0.349,0.777,0.777v37.333c0,0.428-0.35,0.778-0.777,0.778H3.555  c-0.43,0-0.778-0.351-0.778-0.778V13.443c0-0.429,0.349-0.777,0.778-0.777H56.443 M56.443,11.888H3.555  C2.694,11.888,2,12.584,2,13.443v37.333c0,0.858,0.694,1.556,1.555,1.556h52.889c0.859,0,1.557-0.697,1.557-1.556V13.443  C58,12.584,57.303,11.888,56.443,11.888L56.443,11.888z" fill="#995145"/>
+<path d="M56.443,51.555H3.555C2.694,51.555,2,50.857,2,49.999v0.777c0,0.858,0.694,1.556,1.555,1.556h52.889  c0.859,0,1.557-0.697,1.557-1.556v-0.777C58,50.857,57.303,51.555,56.443,51.555z" fill="#46232D"/>
 <path d="M56.443,11.888H3.555C2.694,11.888,2,12.584,2,13.443v0.778c0-0.86,0.694-1.556,1.555-1.556  h52.889c0.859,0,1.557,0.695,1.557,1.556v-0.778C58,12.584,57.303,11.888,56.443,11.888z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="45.9424" x2="45.9424" y1="32.6411" y2="20.912">
-<stop offset="0" style="stop-color:#444243"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<stop offset="0" style="stop-color:#434343"/>
+<stop offset="1" style="stop-color:#222021"/>
 </linearGradient>
 <circle cx="45.942" cy="26.611" fill="url(#SVGID_2_)" r="6.946"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="45.9424" x2="45.9424" y1="33.9702" y2="28.6358">
 <stop offset="0" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#413F3F"/>
+<stop offset="1" style="stop-color:#404040"/>
 </linearGradient>
 <path d="M45.943,33.558c-3.754,0-6.803-2.979-6.935-6.698c-0.003,0.084-0.013,0.163-0.013,0.248  c0,3.836,3.109,6.946,6.947,6.946c3.836,0,6.945-3.11,6.945-6.946c0-0.085-0.01-0.164-0.01-0.248  C52.744,30.578,49.695,33.558,45.943,33.558z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="45.9443" x2="45.9443" y1="35.3247" y2="17.436">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="1" style="stop-color:#9D1010"/>
+<stop offset="0" style="stop-color:#B36B4D"/>
+<stop offset="1" style="stop-color:#733A43"/>
 </linearGradient>
 <path d="M45.943,35.609c-4.933,0-8.944-4.013-8.944-8.943c0-4.933,4.012-8.945,8.944-8.945  s8.945,4.013,8.945,8.945C54.889,31.597,50.876,35.609,45.943,35.609L45.943,35.609z M45.943,18.888  c-4.29,0-7.778,3.488-7.778,7.778c0,4.287,3.488,7.776,7.778,7.776c4.287,0,7.779-3.489,7.779-7.776  C53.723,22.376,50.23,18.888,45.943,18.888L45.943,18.888z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="45.9434" x2="45.9434" y1="20.5371" y2="32.7461">
@@ -58,11 +58,11 @@
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="10.889" width="28" x="6.277" y="20.055"/>
 <rect fill="#D9D9D9" height="0.777" width="28" x="6.277" y="30.943"/>
-<polygon fill="#A6A8AB" points="31.945,25.499 31.945,27.832 29.609,27.832 29.609,26.276 28.832,26.276 28.832,27.832   26.498,27.832 26.498,26.276 25.723,26.276 25.723,27.832 23.387,27.832 23.387,26.276 22.61,26.276 22.61,27.832 20.277,27.832   20.277,25.499 19.499,25.499 19.499,27.832 17.166,27.832 17.166,26.276 16.388,26.276 16.388,27.832 14.056,27.832 14.056,26.276   13.276,26.276 13.276,27.832 10.944,27.832 10.944,26.276 10.165,26.276 10.165,27.832 8.609,27.832 8.609,25.499 7.833,25.499   7.833,28.609 8.609,28.609 10.165,28.609 10.944,28.609 13.276,28.609 14.056,28.609 16.388,28.609 17.166,28.609 19.499,28.609   20.277,28.609 22.61,28.609 23.387,28.609 25.723,28.609 26.498,28.609 28.832,28.609 29.609,28.609 31.945,28.609 32.721,28.609   32.721,27.832 32.721,25.499 "/>
-<rect fill="#E00000" height="10.889" width="1.556" x="20.301" y="20.055"/>
+<polygon fill="#A8A9AA" points="31.945,25.499 31.945,27.832 29.609,27.832 29.609,26.276 28.832,26.276 28.832,27.832   26.498,27.832 26.498,26.276 25.723,26.276 25.723,27.832 23.387,27.832 23.387,26.276 22.61,26.276 22.61,27.832 20.277,27.832   20.277,25.499 19.499,25.499 19.499,27.832 17.166,27.832 17.166,26.276 16.388,26.276 16.388,27.832 14.056,27.832 14.056,26.276   13.276,26.276 13.276,27.832 10.944,27.832 10.944,26.276 10.165,26.276 10.165,27.832 8.609,27.832 8.609,25.499 7.833,25.499   7.833,28.609 8.609,28.609 10.165,28.609 10.944,28.609 13.276,28.609 14.056,28.609 16.388,28.609 17.166,28.609 19.499,28.609   20.277,28.609 22.61,28.609 23.387,28.609 25.723,28.609 26.498,28.609 28.832,28.609 29.609,28.609 31.945,28.609 32.721,28.609   32.721,27.832 32.721,25.499 "/>
+<rect fill="#9D4349" height="10.889" width="1.556" x="20.301" y="20.055"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="9.127" x2="9.127" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="9.127" cy="41.832" fill="url(#SVGID_10_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="9.126" x2="9.126" y1="40.7729" y2="42.8472">
@@ -71,8 +71,8 @@
 </linearGradient>
 <circle cx="9.126" cy="41.832" fill="url(#SVGID_11_)" r="1.039"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="13.7295" x2="13.7295" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <path d="M15.285,41.832c0,0.858-0.693,1.556-1.556,1.556c-0.857,0-1.555-0.697-1.555-1.556  c0-0.861,0.697-1.556,1.555-1.556C14.592,40.276,15.285,40.971,15.285,41.832z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="13.7295" x2="13.7295" y1="40.7729" y2="42.8472">
@@ -81,8 +81,8 @@
 </linearGradient>
 <circle cx="13.73" cy="41.832" fill="url(#SVGID_13_)" r="1.038"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="18.3955" x2="18.3955" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="18.396" cy="41.832" fill="url(#SVGID_14_)" r="1.555"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="18.3955" x2="18.3955" y1="40.7729" y2="42.8472">
@@ -91,8 +91,8 @@
 </linearGradient>
 <circle cx="18.396" cy="41.832" fill="url(#SVGID_15_)" r="1.038"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="23.0615" x2="23.0615" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="23.062" cy="41.832" fill="url(#SVGID_16_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="23.0635" x2="23.0635" y1="40.7729" y2="42.8472">
@@ -101,8 +101,8 @@
 </linearGradient>
 <circle cx="23.063" cy="41.832" fill="url(#SVGID_17_)" r="1.038"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="27.7295" x2="27.7295" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="27.729" cy="41.832" fill="url(#SVGID_18_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="27.7295" x2="27.7295" y1="40.7729" y2="42.8472">
@@ -111,8 +111,8 @@
 </linearGradient>
 <circle cx="27.729" cy="41.832" fill="url(#SVGID_19_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="32.3965" x2="32.3965" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="32.396" cy="41.832" fill="url(#SVGID_20_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="32.3965" x2="32.3965" y1="40.7729" y2="42.8472">
@@ -121,8 +121,8 @@
 </linearGradient>
 <circle cx="32.396" cy="41.832" fill="url(#SVGID_21_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="9.127" x2="9.127" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="9.127" cy="46.499" fill="url(#SVGID_22_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="9.126" x2="9.126" y1="45.4399" y2="47.5142">
@@ -131,8 +131,8 @@
 </linearGradient>
 <circle cx="9.126" cy="46.499" fill="url(#SVGID_23_)" r="1.039"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="13.7295" x2="13.7295" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <path d="M15.285,46.499c0,0.858-0.693,1.556-1.556,1.556c-0.857,0-1.555-0.697-1.555-1.556  c0-0.861,0.697-1.556,1.555-1.556C14.592,44.943,15.285,45.638,15.285,46.499z" fill="url(#SVGID_24_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="13.7295" x2="13.7295" y1="45.4399" y2="47.5142">
@@ -141,8 +141,8 @@
 </linearGradient>
 <circle cx="13.73" cy="46.499" fill="url(#SVGID_25_)" r="1.038"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="18.3955" x2="18.3955" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="18.396" cy="46.499" fill="url(#SVGID_26_)" r="1.555"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="18.3955" x2="18.3955" y1="45.4399" y2="47.5142">
@@ -151,8 +151,8 @@
 </linearGradient>
 <circle cx="18.396" cy="46.499" fill="url(#SVGID_27_)" r="1.038"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="23.0615" x2="23.0615" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="23.062" cy="46.499" fill="url(#SVGID_28_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="23.0635" x2="23.0635" y1="45.4399" y2="47.5142">
@@ -161,8 +161,8 @@
 </linearGradient>
 <circle cx="23.063" cy="46.499" fill="url(#SVGID_29_)" r="1.038"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="27.7295" x2="27.7295" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="27.729" cy="46.499" fill="url(#SVGID_30_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="27.7295" x2="27.7295" y1="45.4399" y2="47.5142">
@@ -171,8 +171,8 @@
 </linearGradient>
 <circle cx="27.729" cy="46.499" fill="url(#SVGID_31_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="32.3965" x2="32.3965" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="32.396" cy="46.499" fill="url(#SVGID_32_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="32.3965" x2="32.3965" y1="45.4399" y2="47.5142">
@@ -181,8 +181,8 @@
 </linearGradient>
 <circle cx="32.396" cy="46.499" fill="url(#SVGID_33_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="36.999" x2="36.999" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="36.999" cy="41.832" fill="url(#SVGID_34_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35_" x1="36.999" x2="36.999" y1="40.7729" y2="42.8472">
@@ -191,8 +191,8 @@
 </linearGradient>
 <circle cx="36.999" cy="41.832" fill="url(#SVGID_35_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_36_" x1="41.666" x2="41.666" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="41.666" cy="41.832" fill="url(#SVGID_36_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_37_" x1="41.666" x2="41.666" y1="40.7729" y2="42.8472">
@@ -201,8 +201,8 @@
 </linearGradient>
 <circle cx="41.666" cy="41.832" fill="url(#SVGID_37_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_38_" x1="46.333" x2="46.333" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="46.333" cy="41.832" fill="url(#SVGID_38_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_39_" x1="46.333" x2="46.333" y1="40.7729" y2="42.8472">
@@ -211,8 +211,8 @@
 </linearGradient>
 <circle cx="46.333" cy="41.832" fill="url(#SVGID_39_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_40_" x1="50.999" x2="50.999" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <path d="M52.553,41.832c0,0.858-0.691,1.556-1.553,1.556c-0.858,0-1.556-0.697-1.556-1.556  c0-0.861,0.697-1.556,1.556-1.556C51.861,40.276,52.553,40.971,52.553,41.832z" fill="url(#SVGID_40_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_41_" x1="50.999" x2="50.999" y1="40.7729" y2="42.8472">
@@ -221,8 +221,8 @@
 </linearGradient>
 <path d="M52.037,41.832c0,0.573-0.467,1.037-1.037,1.037c-0.573,0-1.039-0.464-1.039-1.037  s0.466-1.037,1.039-1.037C51.57,40.795,52.037,41.259,52.037,41.832z" fill="url(#SVGID_41_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_42_" x1="36.999" x2="36.999" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="36.999" cy="46.499" fill="url(#SVGID_42_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_43_" x1="36.999" x2="36.999" y1="45.4399" y2="47.5142">
@@ -231,8 +231,8 @@
 </linearGradient>
 <circle cx="36.999" cy="46.499" fill="url(#SVGID_43_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_44_" x1="41.666" x2="41.666" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="41.666" cy="46.499" fill="url(#SVGID_44_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_45_" x1="41.666" x2="41.666" y1="45.4399" y2="47.5142">
@@ -241,8 +241,8 @@
 </linearGradient>
 <circle cx="41.666" cy="46.499" fill="url(#SVGID_45_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_46_" x1="46.333" x2="46.333" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="46.333" cy="46.499" fill="url(#SVGID_46_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_47_" x1="46.333" x2="46.333" y1="45.4399" y2="47.5142">
@@ -251,8 +251,8 @@
 </linearGradient>
 <circle cx="46.333" cy="46.499" fill="url(#SVGID_47_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_48_" x1="50.999" x2="50.999" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <path d="M52.553,46.499c0,0.858-0.691,1.556-1.553,1.556c-0.858,0-1.556-0.697-1.556-1.556  c0-0.861,0.697-1.556,1.556-1.556C51.861,44.943,52.553,45.638,52.553,46.499z" fill="url(#SVGID_48_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_49_" x1="50.999" x2="50.999" y1="45.4399" y2="47.5142">
@@ -309,30 +309,30 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5  c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
 <path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15  l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691  l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586  c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156  l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979  l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202  l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848  L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212  l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15  c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428  C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15  C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094  c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
 <radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383  l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15  l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85  l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164  l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552  l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443  L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247  l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_java.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_java.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_java.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,12 +5,12 @@
 <rect fill="none" height="60" width="60"/>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.8457" x2="27.8457" y1="3.1968" y2="48.3756">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.4606" style="stop-color:#BDC2C4"/>
-<stop offset="0.7333" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.4606" style="stop-color:#BFC2C1"/>
+<stop offset="0.7333" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M51.063,18.041H31.026v-2.398c2.141-1.259,4.404-2.609,4.404-5.144c0-3.896-4.045-7.063-7.939-7.063  s-7.937,3.168-7.937,7.063c0,2.535,2.265,3.892,4.414,5.146v2.396h-5.7c-1.445,0-2.628,1.183-2.628,2.625v13.049h-1.452  c-1.211-2.092-2.594-4.378-5.186-4.378C5.136,29.337,2,33.348,2,37.217c0,3.868,3.136,7.879,7.003,7.879  c2.592,0,3.975-2.285,5.186-4.377h1.452v3.885c0,1.445,1.183,2.627,2.628,2.627h6.205v-3.62c-1.89-1.103-3.883-2.296-3.883-4.526  c0-3.426,3.557-6.213,6.981-6.213s6.983,2.787,6.983,6.213c0,2.229-1.991,3.418-3.873,4.524v3.622h20.381  c1.447,0,2.629-1.182,2.629-2.627V20.666C53.692,19.224,52.511,18.041,51.063,18.041z" fill="url(#SVGID_1_)"/>
 <path d="M18.269,18.758h5.7v-0.717h-5.7c-1.445,0-2.628,1.183-2.628,2.625v0.718  C15.641,19.941,16.823,18.758,18.269,18.758z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
@@ -22,57 +22,57 @@
 <path d="M53.692,32.871H40.51l-0.113,0.01l-0.056,0.008c-1.32,0.211-2.018,1.203-2.18,1.639  l-1.121,2.34c-0.059,0.079-0.109,0.162-0.154,0.241c-0.066,0.112-0.119,0.222-0.129,0.247c-0.045,0.096-0.088,0.196-0.146,0.367  c-0.1,0.307-0.148,0.6-0.148,0.893v8.615h15.32c0.754,0,1.43-0.325,1.91-0.836V32.871z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
 <path d="M53.692,33.589H40.51l-0.056,0.009c-0.988,0.158-1.514,0.889-1.646,1.24l-1.151,2.401  c-0.056,0.073-0.105,0.149-0.152,0.231c-0.045,0.078-0.083,0.153-0.103,0.201c-0.036,0.074-0.067,0.15-0.109,0.273  c-0.076,0.233-0.113,0.452-0.113,0.67v8.615h14.603c0.754,0,1.43-0.325,1.91-0.836V33.589z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="47.9434" x2="47.9434" y1="34.2832" y2="38.7279">
-<stop offset="0" style="stop-color:#3DAEFF"/>
-<stop offset="1" style="stop-color:#1A79D1"/>
+<stop offset="0" style="stop-color:#77BBC5"/>
+<stop offset="1" style="stop-color:#51739A"/>
 </linearGradient>
 <path d="M57.618,37.627l-1.189-2.479c0,0-0.269-0.707-1.109-0.842H40.567  c-0.842,0.135-1.111,0.842-1.111,0.842l-1.188,2.479c-0.288,0.326-0.356,0.74-0.37,0.988h20.092  C57.975,38.367,57.907,37.953,57.618,37.627z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="47.9492" x2="47.9492" y1="37" y2="57.4615">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.6909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#5F8BA1"/>
 </linearGradient>
 <path d="M58,55.128c0,0.793-0.644,1.436-1.436,1.436H39.333c-0.793,0-1.436-0.643-1.436-1.436V38.615  c0-0.793,0.643-1.436,1.436-1.436h17.231c0.792,0,1.436,0.643,1.436,1.436V55.128z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9492" x2="47.9492" y1="37.1016" y2="51.9137">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.1818" style="stop-color:#2B93C7"/>
-<stop offset="0.8606" style="stop-color:#0F348A"/>
-<stop offset="1" style="stop-color:#0F348A"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.1818" style="stop-color:#5A8198"/>
+<stop offset="0.8606" style="stop-color:#343665"/>
+<stop offset="1" style="stop-color:#343665"/>
 </linearGradient>
 <path d="M40.769,51.538h14.359c0.793,0,1.437-0.644,1.437-1.437V37.18H39.333v12.922  C39.333,50.895,39.976,51.538,40.769,51.538z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="47.9482" x2="47.9482" y1="50.2227" y2="56.8327">
-<stop offset="0" style="stop-color:#113EA3"/>
-<stop offset="0.4121" style="stop-color:#113EA3"/>
-<stop offset="1" style="stop-color:#2174BF"/>
+<stop offset="0" style="stop-color:#3D4477"/>
+<stop offset="0.4121" style="stop-color:#3D4477"/>
+<stop offset="1" style="stop-color:#506C90"/>
 </linearGradient>
 <path d="M55.87,51.326c-0.17,0.103-0.36,0.168-0.565,0.194c-0.047,0.011-0.103,0.018-0.177,0.018H40.769  c-0.074,0-0.129-0.007-0.176-0.018c-0.205-0.026-0.396-0.092-0.564-0.194l-1.93,4.525c0.25,0.424,0.707,0.712,1.234,0.712h17.231  c0.528,0,0.984-0.288,1.233-0.712L55.87,51.326z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="47.9482" x2="47.9482" y1="50.3188" y2="56.3521">
-<stop offset="0" style="stop-color:#0F1C94"/>
-<stop offset="0.4121" style="stop-color:#0F1C94"/>
-<stop offset="1" style="stop-color:#2B93C7"/>
+<stop offset="0" style="stop-color:#3C376C"/>
+<stop offset="0.4121" style="stop-color:#3C376C"/>
+<stop offset="1" style="stop-color:#5A8198"/>
 </linearGradient>
 <path d="M40.028,52.044c0.169,0.103,0.359,0.169,0.564,0.194  c0.047,0.011,0.102,0.018,0.176,0.018h14.359c0.074,0,0.13-0.007,0.177-0.018c0.205-0.025,0.396-0.092,0.565-0.194l1.73,4.063  c0.074-0.078,0.143-0.162,0.197-0.255l-1.928-4.525c-0.17,0.103-0.36,0.168-0.565,0.194c-0.047,0.011-0.103,0.018-0.177,0.018  H40.769c-0.074,0-0.129-0.007-0.176-0.018c-0.205-0.026-0.396-0.092-0.564-0.194l-1.93,4.525c0.056,0.093,0.125,0.177,0.198,0.255  L40.028,52.044z" fill="url(#SVGID_6_)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="47.9492" x2="47.9492" y1="37.1016" y2="51.9137">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.1818" style="stop-color:#2786B5"/>
-<stop offset="0.5394" style="stop-color:#1F4BA3"/>
-<stop offset="0.8606" style="stop-color:#0D1F78"/>
-<stop offset="1" style="stop-color:#0D1F78"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.1818" style="stop-color:#52718A"/>
+<stop offset="0.5394" style="stop-color:#47507B"/>
+<stop offset="0.8606" style="stop-color:#322D58"/>
+<stop offset="1" style="stop-color:#322D58"/>
 </linearGradient>
 <path d="M39.333,37.18v12.922c0,0.793,0.643,1.437,1.436,1.437h14.359c0.793,0,1.437-0.644,1.437-1.437V37.18  H39.333z M55.847,50.102c0,0.396-0.323,0.719-0.719,0.719H40.769c-0.395,0-0.717-0.322-0.717-0.719V37.896h15.795V50.102z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="47.9492" x2="47.9492" y1="34.291" y2="37.2549">
-<stop offset="0" style="stop-color:#57ADFF"/>
-<stop offset="0.9879" style="stop-color:#0048B5"/>
-<stop offset="1" style="stop-color:#0048B5"/>
+<stop offset="0" style="stop-color:#89C8CD"/>
+<stop offset="0.9879" style="stop-color:#36447F"/>
+<stop offset="1" style="stop-color:#36447F"/>
 </linearGradient>
 <path d="M56.564,35.743c0-0.793-0.644-1.437-1.437-1.437H40.769c-0.793,0-1.436,0.644-1.436,1.437v1.437  h17.231V35.743z" fill="url(#SVGID_8_)"/>
-<path d="M39.333,37.18h17.231c0.465,0,0.875,0.225,1.138,0.568c-0.029-0.041-0.05-0.082-0.084-0.121l-1.189-2.479  c0,0-0.269-0.707-1.109-0.842H40.567c-0.842,0.135-1.111,0.842-1.111,0.842l-1.188,2.479c-0.101,0.115-0.167,0.238-0.222,0.362  C38.28,37.512,38.765,37.18,39.333,37.18z" fill="#A1E2FF"/>
-<path d="M57.786,37.869c0.006,0.011,0.012,0.022,0.018,0.033C57.798,37.891,57.792,37.881,57.786,37.869z" fill="#A1E2FF"/>
-<path d="M37.985,38.139c-0.004,0.01-0.006,0.02-0.01,0.029C37.979,38.158,37.981,38.148,37.985,38.139z" fill="#A1E2FF"/>
+<path d="M39.333,37.18h17.231c0.465,0,0.875,0.225,1.138,0.568c-0.029-0.041-0.05-0.082-0.084-0.121l-1.189-2.479  c0,0-0.269-0.707-1.109-0.842H40.567c-0.842,0.135-1.111,0.842-1.111,0.842l-1.188,2.479c-0.101,0.115-0.167,0.238-0.222,0.362  C38.28,37.512,38.765,37.18,39.333,37.18z" fill="#BDE3D3"/>
+<path d="M57.786,37.869c0.006,0.011,0.012,0.022,0.018,0.033C57.798,37.891,57.792,37.881,57.786,37.869z" fill="#BDE3D3"/>
+<path d="M37.985,38.139c-0.004,0.01-0.006,0.02-0.01,0.029C37.979,38.158,37.981,38.148,37.985,38.139z" fill="#BDE3D3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="47.9492" x2="47.9492" y1="37.0742" y2="57.0705">
-<stop offset="0" style="stop-color:#B1E5F2"/>
-<stop offset="0.4545" style="stop-color:#6CA6EB"/>
-<stop offset="0.6909" style="stop-color:#2B8BCF"/>
-<stop offset="1" style="stop-color:#33AFED"/>
+<stop offset="0" style="stop-color:#C5DED1"/>
+<stop offset="0.4545" style="stop-color:#92C0C5"/>
+<stop offset="0.6909" style="stop-color:#5C829E"/>
+<stop offset="1" style="stop-color:#6BA8B5"/>
 </linearGradient>
 <path d="M56.564,37.18H39.333c-0.793,0-1.436,0.643-1.436,1.436v16.513c0,0.793,0.643,1.436,1.436,1.436  h17.231c0.792,0,1.436-0.643,1.436-1.436V38.615C58,37.822,57.356,37.18,56.564,37.18z M57.282,55.128  c0,0.396-0.322,0.718-0.718,0.718H39.333c-0.395,0-0.718-0.322-0.718-0.718V38.615c0-0.396,0.323-0.719,0.718-0.719h17.231  c0.396,0,0.718,0.322,0.718,0.719V55.128z" fill="url(#SVGID_9_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_just_audio.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_just_audio.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_just_audio.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -19,8 +19,8 @@
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559  c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
 <path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0  c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
@@ -36,29 +36,29 @@
 <polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
 <path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06  c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0  l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204  c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+<stop offset="0" style="stop-color:#93BD66"/>
+<stop offset="1" style="stop-color:#22403B"/>
 </linearGradient>
 <path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729  c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493  c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#A6C87E"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#BCD39A"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4__)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.4667" style="stop-color:#347940"/>
+<stop offset="1" style="stop-color:#173636"/>
 </linearGradient>
 <path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229  c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84  c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5_)"/>
 <rect fill="none" height="30" width="30" y="0.487"/>
@@ -67,9 +67,9 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill-opacity="0.35" height="33.866" stroke-opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 670.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="260" x2="284" y1="655.9761" y2="655.9761">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="0.8424" style="stop-color:#CC1414"/>
-<stop offset="1" style="stop-color:#FF4D00"/>
+<stop offset="0" style="stop-color:#B36B4D"/>
+<stop offset="0.8424" style="stop-color:#954B50"/>
+<stop offset="1" style="stop-color:#B36B4D"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1___)" points="25.809,26.431 3,4.177 4.191,2.956 27,25.21 "/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_key_screen.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_key_screen.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_key_screen.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,25 +4,25 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07  c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11  c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304  v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001  z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" fill-opacity="0.6" height="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
@@ -31,183 +31,183 @@
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+<stop offset="0" style="stop-color:#AADAC6"/>
+<stop offset="1" style="stop-color:#6A99AA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
-<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
+<rect fill="#BCE2D2" height="0.767" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+<stop offset="1" style="stop-color:#D3D7D5"/>
 </linearGradient>
 <path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785  c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+<stop offset="0" style="stop-color:#6F7172"/>
+<stop offset="1" style="stop-color:#BFC2C1"/>
 </linearGradient>
 <path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51  c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951  h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183  h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606  c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
 <path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534  h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303  c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307  c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+<stop offset="0" style="stop-color:#C6B17B"/>
+<stop offset="0.7455" style="stop-color:#98604F"/>
+<stop offset="1" style="stop-color:#7F3736"/>
 </linearGradient>
 <path d="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307  c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
 <rect fill="none" height="60" width="60"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="7.6196" x2="7.6196" y1="1" y2="28.8433">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#B4DCCA"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </linearGradient>
 <rect fill="url(#SVGID_1__)" height="6" width="6" x="4.62" y="1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9536" x2="14.9536" y1="1" y2="28.8433">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#B4DCCA"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </linearGradient>
 <rect fill="url(#SVGID_2__)" height="6" width="6" x="11.954" y="1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="22.3809" x2="22.3809" y1="1" y2="28.8433">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#B4DCCA"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </linearGradient>
 <rect fill="url(#SVGID_3__)" height="6" width="6" x="19.381" y="1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="7.6196" x2="7.6196" y1="1.0005" y2="28.8461">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#B4DCCA"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </linearGradient>
 <rect fill="url(#SVGID_4__)" height="6" width="6" x="4.62" y="8.239"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="14.9536" x2="14.9536" y1="1.0005" y2="28.8461">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#B4DCCA"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </linearGradient>
 <rect fill="url(#SVGID_5__)" height="6" width="6" x="11.954" y="8.239"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="22.3809" x2="22.3809" y1="1.0005" y2="28.8461">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#B4DCCA"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </linearGradient>
 <rect fill="url(#SVGID_6__)" height="6" width="6" x="19.381" y="8.239"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7__" x1="7.6196" x2="7.6196" y1="1.0024" y2="28.8444">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#B4DCCA"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </linearGradient>
 <rect fill="url(#SVGID_7__)" height="5.999" width="6" x="4.62" y="15.572"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8__" x1="14.9536" x2="14.9536" y1="1.0024" y2="28.8444">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#B4DCCA"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </linearGradient>
 <rect fill="url(#SVGID_8__)" height="5.999" width="6" x="11.954" y="15.572"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9__" x1="14.9536" x2="14.9536" y1="1.0049" y2="28.845">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#B4DCCA"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </linearGradient>
 <rect fill="url(#SVGID_9__)" height="6" width="6" x="11.954" y="23"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10__" x1="22.3809" x2="22.3809" y1="1.0024" y2="28.8444">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+<stop offset="0" style="stop-color:#B4DCCA"/>
+<stop offset="1" style="stop-color:#416D98"/>
 </linearGradient>
 <rect fill="url(#SVGID_10__)" height="5.999" width="6" x="19.381" y="15.572"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11__" x1="7.6196" x2="7.6196" y1="1" y2="6.9042">
-<stop offset="0" style="stop-color:#73E3FF"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#9DD5C4"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M9.915,1.705v4.591h-4.59V1.705H9.915 M10.619,1h-6v6h6V1L10.619,1z" fill="url(#SVGID_11__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12__" x1="14.9536" x2="14.9536" y1="1" y2="6.9042">
-<stop offset="0" style="stop-color:#73E3FF"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#9DD5C4"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M17.249,1.705v4.591h-4.59V1.705H17.249 M17.954,1h-6v6h6V1L17.954,1z" fill="url(#SVGID_12__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13__" x1="22.3809" x2="22.3809" y1="1" y2="6.9042">
-<stop offset="0" style="stop-color:#73E3FF"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#9DD5C4"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M24.676,1.705v4.591h-4.59V1.705H24.676 M25.381,1h-6v6h6V1L25.381,1z" fill="url(#SVGID_13__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14__" x1="7.6196" x2="7.6196" y1="8.312" y2="14.2147">
-<stop offset="0" style="stop-color:#73E3FF"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#9DD5C4"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M9.915,8.943v4.591h-4.59V8.943H9.915 M10.619,8.239h-6v6h6V8.239L10.619,8.239z" fill="url(#SVGID_14__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15__" x1="14.9536" x2="14.9536" y1="8.312" y2="14.2147">
-<stop offset="0" style="stop-color:#73E3FF"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#9DD5C4"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M17.249,8.943v4.591h-4.59V8.943H17.249 M17.954,8.239h-6v6h6V8.239L17.954,8.239z" fill="url(#SVGID_15__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16__" x1="22.3809" x2="22.3809" y1="8.312" y2="14.2147">
-<stop offset="0" style="stop-color:#73E3FF"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#9DD5C4"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M24.676,8.943v4.591h-4.59V8.943H24.676 M25.381,8.239h-6v6h6V8.239L25.381,8.239z" fill="url(#SVGID_16__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17__" x1="7.6196" x2="7.6196" y1="15.7993" y2="21.6132">
-<stop offset="0" style="stop-color:#73E3FF"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#9DD5C4"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M9.915,16.275v4.592h-4.59v-4.592H9.915 M10.619,15.572h-6v5.999h6V15.572L10.619,15.572z" fill="url(#SVGID_17__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="14.9536" x2="14.9536" y1="15.7993" y2="21.6132">
-<stop offset="0" style="stop-color:#73E3FF"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#9DD5C4"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M17.249,16.275v4.592h-4.59v-4.592H17.249 M17.954,15.572h-6v5.999h6V15.572L17.954,15.572z" fill="url(#SVGID_18_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="14.9536" x2="14.9536" y1="23.0225" y2="28.8353">
-<stop offset="0" style="stop-color:#73E3FF"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#9DD5C4"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M17.249,23.705v4.59h-4.59v-4.59H17.249 M17.954,23h-6v6h6V23L17.954,23z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="22.3809" x2="22.3809" y1="15.7993" y2="21.6132">
-<stop offset="0" style="stop-color:#73E3FF"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#9DD5C4"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M24.676,16.275v4.592h-4.59v-4.592H24.676 M25.381,15.572h-6v5.999h6V15.572L25.381,15.572z" fill="url(#SVGID_20_)"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_keyboard.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_keyboard.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_keyboard.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,365 +4,365 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="14.5566" y2="45.5373">
-<stop offset="0" style="stop-color:#CED5D8"/>
-<stop offset="0.7308" style="stop-color:#818687"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#D1D5D3"/>
+<stop offset="0.7308" style="stop-color:#838585"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M1,43.384c0,1.133,0.912,2.06,2.03,2.06h53.937c1.117,0,2.033-0.927,2.033-2.06V16.616  c0-1.133-0.916-2.06-2.033-2.06H3.03c-1.118,0-2.03,0.927-2.03,2.06V43.384z" fill="url(#SVGID_1_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="15.5859" y2="44.5027">
-<stop offset="0" style="stop-color:#BCC3C5"/>
-<stop offset="0.8121" style="stop-color:#7A8285"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+<stop offset="0" style="stop-color:#BFC2C1"/>
+<stop offset="0.8121" style="stop-color:#7D8182"/>
+<stop offset="1" style="stop-color:#B9BDBC"/>
 </linearGradient>
 <path d="M56.967,44.415H3.03c-0.554,0-1.002-0.462-1.002-1.031V16.616c0-0.566,0.448-1.03,1.002-1.03h53.937  c0.553,0,1.003,0.464,1.003,1.03v26.768C57.97,43.953,57.52,44.415,56.967,44.415L56.967,44.415z" fill="url(#SVGID_2_)"/>
 <path d="M21.949,36.123c0,0.568-0.459,1.029-1.028,1.029h-3.089c-0.567,0-1.029-0.461-1.029-1.029v-3.088  c0-0.57,0.462-1.031,1.029-1.031h3.089c0.569,0,1.028,0.461,1.028,1.031V36.123z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="19.376" x2="19.376" y1="31.4229" y2="36.6183">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M21.949,35.565c0,0.568-0.459,1.028-1.028,1.028h-3.089c-0.567,0-1.029-0.46-1.029-1.028v-3.089  c0-0.567,0.462-1.03,1.029-1.03h3.089c0.569,0,1.028,0.463,1.028,1.03V35.565z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="21.5" x2="17.3381" y1="34.0205" y2="34.0205">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M17.832,36.08c-0.284,0-0.516-0.231-0.516-0.515v-3.089c0-0.284,0.231-0.516,0.516-0.516h3.089  c0.283,0,0.515,0.231,0.515,0.516v3.089c0,0.283-0.231,0.515-0.515,0.515H17.832z" fill="url(#SVGID_4_)"/>
 <path d="M28.128,36.123c0,0.568-0.462,1.029-1.029,1.029h-3.09c-0.568,0-1.028-0.461-1.028-1.029v-3.088  c0-0.57,0.46-1.031,1.028-1.031h3.09c0.567,0,1.029,0.461,1.029,1.031V36.123z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="25.5547" x2="25.5547" y1="31.4229" y2="36.6183">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M28.128,35.565c0,0.568-0.462,1.028-1.029,1.028h-3.09c-0.568,0-1.028-0.46-1.028-1.028v-3.089  c0-0.567,0.46-1.03,1.028-1.03h3.09c0.567,0,1.029,0.463,1.029,1.03V35.565z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="27.6777" x2="23.5168" y1="34.0205" y2="34.0205">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M24.009,36.08c-0.283,0-0.514-0.231-0.514-0.515v-3.089c0-0.284,0.23-0.516,0.514-0.516h3.09  c0.284,0,0.515,0.231,0.515,0.516v3.089c0,0.283-0.23,0.515-0.515,0.515H24.009z" fill="url(#SVGID_6_)"/>
 <path d="M34.305,36.123c0,0.568-0.461,1.029-1.029,1.029h-3.088c-0.568,0-1.031-0.461-1.031-1.029v-3.088  c0-0.57,0.463-1.031,1.031-1.031h3.088c0.568,0,1.029,0.461,1.029,1.031V36.123z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="31.7305" x2="31.7305" y1="31.4229" y2="36.6183">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M34.305,35.565c0,0.568-0.461,1.028-1.029,1.028h-3.088c-0.568,0-1.031-0.46-1.031-1.028v-3.089  c0-0.567,0.463-1.03,1.031-1.03h3.088c0.568,0,1.029,0.463,1.029,1.03V35.565z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="33.8545" x2="29.6936" y1="34.0205" y2="34.0205">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M30.188,36.08c-0.284,0-0.516-0.231-0.516-0.515v-3.089c0-0.284,0.231-0.516,0.516-0.516h3.088  c0.285,0,0.515,0.231,0.515,0.516v3.089c0,0.283-0.229,0.515-0.515,0.515H30.188z" fill="url(#SVGID_8_)"/>
 <path d="M40.482,36.123c0,0.568-0.46,1.029-1.028,1.029h-3.089c-0.57,0-1.03-0.461-1.03-1.029v-3.088  c0-0.57,0.46-1.031,1.03-1.031h3.089c0.568,0,1.028,0.461,1.028,1.031V36.123z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="37.9082" x2="37.9082" y1="31.4229" y2="36.6183">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M40.482,35.565c0,0.568-0.46,1.028-1.028,1.028h-3.089c-0.57,0-1.03-0.46-1.03-1.028v-3.089  c0-0.567,0.46-1.03,1.03-1.03h3.089c0.568,0,1.028,0.463,1.028,1.03V35.565z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="40.0332" x2="35.8713" y1="34.0205" y2="34.0205">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M36.365,36.08c-0.285,0-0.516-0.231-0.516-0.515v-3.089c0-0.284,0.23-0.516,0.516-0.516h3.089  c0.283,0,0.515,0.231,0.515,0.516v3.089c0,0.283-0.231,0.515-0.515,0.515H36.365z" fill="url(#SVGID_10_)"/>
 <path d="M15.559,36.123c0,0.568-0.46,1.029-1.029,1.029H5.393c-0.57,0-1.031-0.461-1.031-1.029v-3.088  c0-0.57,0.461-1.031,1.031-1.031h9.137c0.569,0,1.029,0.461,1.029,1.031V36.123z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="9.96" x2="9.96" y1="31.4229" y2="36.6183">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M15.559,35.565c0,0.568-0.46,1.028-1.029,1.028H5.393c-0.57,0-1.031-0.46-1.031-1.028v-3.089  c0-0.567,0.461-1.03,1.031-1.03h9.137c0.569,0,1.029,0.463,1.029,1.03V35.565z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="15.2031" x2="4.9306" y1="34.0205" y2="34.0205">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M5.393,36.08c-0.285,0-0.516-0.231-0.516-0.515v-3.089c0-0.284,0.23-0.516,0.516-0.516h9.137  c0.283,0,0.515,0.231,0.515,0.516v3.089c0,0.283-0.231,0.515-0.515,0.515H5.393z" fill="url(#SVGID_12_)"/>
 <path d="M21.949,24.089c0,0.57-0.459,1.03-1.028,1.03h-6.569c-0.567,0-1.029-0.46-1.029-1.03V21  c0-0.567,0.462-1.028,1.029-1.028h6.569c0.569,0,1.028,0.461,1.028,1.028V24.089z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.6357" x2="17.6357" y1="19.3906" y2="24.5861">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M21.949,23.532c0,0.568-0.459,1.029-1.028,1.029h-6.569c-0.567,0-1.029-0.461-1.029-1.029v-3.089  c0-0.569,0.462-1.029,1.029-1.029h6.569c0.569,0,1.028,0.46,1.028,1.029V23.532z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="21.5547" x2="13.8762" y1="21.9878" y2="21.9878">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M14.352,24.047c-0.284,0-0.516-0.23-0.516-0.515v-3.089c0-0.284,0.231-0.515,0.516-0.515h6.569  c0.283,0,0.515,0.23,0.515,0.515v3.089c0,0.284-0.231,0.515-0.515,0.515H14.352z" fill="url(#SVGID_14_)"/>
 <path d="M28.128,24.089c0,0.57-0.462,1.03-1.029,1.03h-3.09c-0.568,0-1.028-0.46-1.028-1.03V21  c0-0.567,0.46-1.028,1.028-1.028h3.09c0.567,0,1.029,0.461,1.029,1.028V24.089z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="25.5547" x2="25.5547" y1="19.3906" y2="24.5861">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M28.128,23.532c0,0.568-0.462,1.029-1.029,1.029h-3.09c-0.568,0-1.028-0.461-1.028-1.029v-3.089  c0-0.569,0.46-1.029,1.028-1.029h3.09c0.567,0,1.029,0.46,1.029,1.029V23.532z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="27.6777" x2="23.5168" y1="21.9878" y2="21.9878">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M24.009,24.047c-0.283,0-0.514-0.23-0.514-0.515v-3.089c0-0.284,0.23-0.515,0.514-0.515h3.09  c0.284,0,0.515,0.23,0.515,0.515v3.089c0,0.284-0.23,0.515-0.515,0.515H24.009z" fill="url(#SVGID_16_)"/>
 <path d="M34.305,24.089c0,0.57-0.461,1.03-1.029,1.03h-3.088c-0.568,0-1.031-0.46-1.031-1.03V21  c0-0.567,0.463-1.028,1.031-1.028h3.088c0.568,0,1.029,0.461,1.029,1.028V24.089z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="31.7305" x2="31.7305" y1="19.3906" y2="24.5861">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M34.305,23.532c0,0.568-0.461,1.029-1.029,1.029h-3.088c-0.568,0-1.031-0.461-1.031-1.029v-3.089  c0-0.569,0.463-1.029,1.031-1.029h3.088c0.568,0,1.029,0.46,1.029,1.029V23.532z" fill="url(#SVGID_17_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="33.8545" x2="29.6936" y1="21.9878" y2="21.9878">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M30.188,24.047c-0.284,0-0.516-0.23-0.516-0.515v-3.089c0-0.284,0.231-0.515,0.516-0.515h3.088  c0.285,0,0.515,0.23,0.515,0.515v3.089c0,0.284-0.229,0.515-0.515,0.515H30.188z" fill="url(#SVGID_18_)"/>
 <path d="M40.482,24.089c0,0.57-0.46,1.03-1.028,1.03h-3.089c-0.57,0-1.03-0.46-1.03-1.03V21  c0-0.567,0.46-1.028,1.03-1.028h3.089c0.568,0,1.028,0.461,1.028,1.028V24.089z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="37.9082" x2="37.9082" y1="19.3906" y2="24.5861">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M40.482,23.532c0,0.568-0.46,1.029-1.028,1.029h-3.089c-0.57,0-1.03-0.461-1.03-1.029v-3.089  c0-0.569,0.46-1.029,1.03-1.029h3.089c0.568,0,1.028,0.46,1.028,1.029V23.532z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="40.0332" x2="35.8713" y1="21.9878" y2="21.9878">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M36.365,24.047c-0.285,0-0.516-0.23-0.516-0.515v-3.089c0-0.284,0.23-0.515,0.516-0.515h3.089  c0.283,0,0.515,0.23,0.515,0.515v3.089c0,0.284-0.231,0.515-0.515,0.515H36.365z" fill="url(#SVGID_20_)"/>
 <path d="M46.725,24.089c0,0.57-0.46,1.03-1.029,1.03h-3.088c-0.57,0-1.03-0.46-1.03-1.03V21  c0-0.567,0.46-1.028,1.03-1.028h3.088c0.569,0,1.029,0.461,1.029,1.028V24.089z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="44.1504" x2="44.1504" y1="19.3906" y2="24.5861">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M46.725,23.532c0,0.568-0.46,1.029-1.029,1.029h-3.088c-0.57,0-1.03-0.461-1.03-1.029v-3.089  c0-0.569,0.46-1.029,1.03-1.029h3.088c0.569,0,1.029,0.46,1.029,1.029V23.532z" fill="url(#SVGID_21_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="46.2744" x2="42.1125" y1="21.9878" y2="21.9878">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M42.607,24.047c-0.285,0-0.517-0.23-0.517-0.515v-3.089c0-0.284,0.231-0.515,0.517-0.515h3.088  c0.283,0,0.515,0.23,0.515,0.515v3.089c0,0.284-0.231,0.515-0.515,0.515H42.607z" fill="url(#SVGID_22_)"/>
 <path d="M55.637,24.089c0,0.57-0.461,1.03-1.029,1.03h-5.823c-0.569,0-1.029-0.46-1.029-1.03V21  c0-0.567,0.46-1.028,1.029-1.028h5.823c0.568,0,1.029,0.461,1.029,1.028V24.089z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="51.6953" x2="51.6953" y1="19.3906" y2="24.5861">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M55.637,23.532c0,0.568-0.461,1.029-1.029,1.029h-5.823c-0.569,0-1.029-0.461-1.029-1.029v-3.089  c0-0.569,0.46-1.029,1.029-1.029h5.823c0.568,0,1.029,0.46,1.029,1.029V23.532z" fill="url(#SVGID_23_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="55.2305" x2="48.3058" y1="21.9878" y2="21.9878">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M48.784,24.047c-0.285,0-0.515-0.23-0.515-0.515v-3.089c0-0.284,0.229-0.515,0.515-0.515h5.823  c0.284,0,0.516,0.23,0.516,0.515v3.089c0,0.284-0.231,0.515-0.516,0.515H48.784z" fill="url(#SVGID_24_)"/>
 <path d="M49.459,30.073c0,0.569-0.461,1.03-1.029,1.03h-5.824c-0.568,0-1.028-0.461-1.028-1.03v-3.088  c0-0.568,0.46-1.03,1.028-1.03h5.824c0.568,0,1.029,0.462,1.029,1.03V30.073z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="45.5176" x2="45.5176" y1="25.375" y2="30.5705">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M49.459,29.517c0,0.568-0.461,1.029-1.029,1.029h-5.824c-0.568,0-1.028-0.461-1.028-1.029v-3.088  c0-0.569,0.46-1.03,1.028-1.03h5.824c0.568,0,1.029,0.461,1.029,1.03V29.517z" fill="url(#SVGID_25_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="49.0518" x2="42.1271" y1="27.9722" y2="27.9722">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M42.605,30.03c-0.284,0-0.515-0.229-0.515-0.514v-3.088c0-0.285,0.23-0.515,0.515-0.515h5.824  c0.283,0,0.515,0.229,0.515,0.515v3.088c0,0.284-0.231,0.514-0.515,0.514H42.605z" fill="url(#SVGID_26_)"/>
 <path d="M12.078,24.089c0,0.57-0.46,1.03-1.028,1.03H5.393c-0.57,0-1.031-0.46-1.031-1.03V21  c0-0.567,0.461-1.028,1.031-1.028h5.657c0.568,0,1.028,0.461,1.028,1.028V24.089z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="8.2197" x2="8.2197" y1="19.3906" y2="24.5861">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M12.078,23.532c0,0.568-0.46,1.029-1.028,1.029H5.393c-0.57,0-1.031-0.461-1.031-1.029v-3.089  c0-0.569,0.461-1.029,1.031-1.029h5.657c0.568,0,1.028,0.46,1.028,1.029V23.532z" fill="url(#SVGID_27_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="11.6689" x2="4.912" y1="21.9878" y2="21.9878">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M5.393,24.047c-0.285,0-0.516-0.23-0.516-0.515v-3.089c0-0.284,0.23-0.515,0.516-0.515h5.657  c0.283,0,0.515,0.23,0.515,0.515v3.089c0,0.284-0.231,0.515-0.515,0.515H5.393z" fill="url(#SVGID_28_)"/>
 <path d="M9.51,30.073c0,0.569-0.461,1.03-1.029,1.03H5.393c-0.57,0-1.031-0.461-1.031-1.03v-3.088  c0-0.568,0.461-1.029,1.031-1.029H8.48c0.568,0,1.029,0.461,1.029,1.029V30.073z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="6.9355" x2="6.9355" y1="25.375" y2="30.5705">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M9.51,29.517c0,0.568-0.461,1.029-1.029,1.029H5.393c-0.57,0-1.031-0.461-1.031-1.029v-3.088  c0-0.569,0.461-1.03,1.031-1.03H8.48c0.568,0,1.029,0.461,1.029,1.03V29.517z" fill="url(#SVGID_29_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="9.0596" x2="4.8987" y1="27.9727" y2="27.9727">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M5.393,30.032c-0.285,0-0.516-0.231-0.516-0.516v-3.088c0-0.286,0.23-0.516,0.516-0.516H8.48  c0.283,0,0.515,0.229,0.515,0.516v3.088c0,0.284-0.231,0.516-0.515,0.516H5.393z" fill="url(#SVGID_30_)"/>
 <path d="M15.688,30.073c0,0.569-0.461,1.03-1.031,1.03h-3.088c-0.568,0-1.028-0.461-1.028-1.03v-3.088  c0-0.568,0.46-1.029,1.028-1.029h3.088c0.57,0,1.031,0.461,1.031,1.029V30.073z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="13.1133" x2="13.1133" y1="25.375" y2="30.5705">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M15.688,29.517c0,0.568-0.461,1.029-1.031,1.029h-3.088c-0.568,0-1.028-0.461-1.028-1.029v-3.088  c0-0.569,0.46-1.03,1.028-1.03h3.088c0.57,0,1.031,0.461,1.031,1.03V29.517z" fill="url(#SVGID_31_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="15.2363" x2="11.0764" y1="27.9727" y2="27.9727">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M11.568,30.032c-0.283,0-0.514-0.231-0.514-0.516v-3.088c0-0.286,0.23-0.516,0.514-0.516h3.088  c0.286,0,0.516,0.229,0.516,0.516v3.088c0,0.284-0.229,0.516-0.516,0.516H11.568z" fill="url(#SVGID_32_)"/>
 <path d="M21.865,30.073c0,0.569-0.462,1.03-1.03,1.03h-3.088c-0.569,0-1.031-0.461-1.031-1.03v-3.088  c0-0.568,0.462-1.029,1.031-1.029h3.088c0.568,0,1.03,0.461,1.03,1.029V30.073z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="19.291" x2="19.291" y1="25.375" y2="30.5705">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M21.865,29.517c0,0.568-0.462,1.029-1.03,1.029h-3.088c-0.569,0-1.031-0.461-1.031-1.029v-3.088  c0-0.569,0.462-1.03,1.031-1.03h3.088c0.568,0,1.03,0.461,1.03,1.03V29.517z" fill="url(#SVGID_33_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="21.4141" x2="17.2541" y1="27.9727" y2="27.9727">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M17.747,30.032c-0.284,0-0.515-0.231-0.515-0.516v-3.088c0-0.286,0.23-0.516,0.515-0.516h3.088  c0.284,0,0.515,0.229,0.515,0.516v3.088c0,0.284-0.23,0.516-0.515,0.516H17.747z" fill="url(#SVGID_34_)"/>
 <path d="M28.042,30.073c0,0.569-0.46,1.03-1.028,1.03h-3.091c-0.567,0-1.028-0.461-1.028-1.03v-3.088  c0-0.568,0.461-1.029,1.028-1.029h3.091c0.568,0,1.028,0.461,1.028,1.029V30.073z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35_" x1="25.4688" x2="25.4688" y1="25.375" y2="30.5705">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M28.042,29.517c0,0.568-0.46,1.029-1.028,1.029h-3.091c-0.567,0-1.028-0.461-1.028-1.029v-3.088  c0-0.569,0.461-1.03,1.028-1.03h3.091c0.568,0,1.028,0.461,1.028,1.03V29.517z" fill="url(#SVGID_35_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_36_" x1="27.5918" x2="23.4309" y1="27.9727" y2="27.9727">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M23.923,30.032c-0.283,0-0.514-0.231-0.514-0.516v-3.088c0-0.286,0.23-0.516,0.514-0.516h3.091  c0.283,0,0.514,0.229,0.514,0.516v3.088c0,0.284-0.23,0.516-0.514,0.516H23.923z" fill="url(#SVGID_36_)"/>
 <path d="M34.284,30.073c0,0.569-0.46,1.03-1.029,1.03h-3.09c-0.566,0-1.028-0.461-1.028-1.03v-3.088  c0-0.568,0.462-1.029,1.028-1.029h3.09c0.569,0,1.029,0.461,1.029,1.029V30.073z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_37_" x1="31.7109" x2="31.7109" y1="25.375" y2="30.5705">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M34.284,29.517c0,0.568-0.46,1.029-1.029,1.029h-3.09c-0.566,0-1.028-0.461-1.028-1.029v-3.088  c0-0.569,0.462-1.03,1.028-1.03h3.09c0.569,0,1.029,0.461,1.029,1.03V29.517z" fill="url(#SVGID_37_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_38_" x1="33.834" x2="29.6721" y1="27.9727" y2="27.9727">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M30.165,30.032c-0.283,0-0.515-0.231-0.515-0.516v-3.088c0-0.286,0.231-0.516,0.515-0.516h3.09  c0.283,0,0.515,0.229,0.515,0.516v3.088c0,0.284-0.231,0.516-0.515,0.516H30.165z" fill="url(#SVGID_38_)"/>
 <path d="M40.482,30.073c0,0.569-0.46,1.03-1.028,1.03h-3.089c-0.57,0-1.03-0.461-1.03-1.03v-3.088  c0-0.568,0.46-1.029,1.03-1.029h3.089c0.568,0,1.028,0.461,1.028,1.029V30.073z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_39_" x1="37.9082" x2="37.9082" y1="25.375" y2="30.5705">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M40.482,29.517c0,0.568-0.46,1.029-1.028,1.029h-3.089c-0.57,0-1.03-0.461-1.03-1.029v-3.088  c0-0.569,0.46-1.03,1.03-1.03h3.089c0.568,0,1.028,0.461,1.028,1.03V29.517z" fill="url(#SVGID_39_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_40_" x1="40.0332" x2="35.8713" y1="27.9727" y2="27.9727">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M36.365,30.032c-0.285,0-0.516-0.231-0.516-0.516v-3.088c0-0.286,0.23-0.516,0.516-0.516h3.089  c0.283,0,0.515,0.229,0.515,0.516v3.088c0,0.284-0.231,0.516-0.515,0.516H36.365z" fill="url(#SVGID_40_)"/>
 <path d="M55.637,36.123c0,0.568-0.461,1.029-1.029,1.029h-12c-0.57,0-1.03-0.461-1.03-1.029v-3.088  c0-0.569,0.46-1.03,1.03-1.03h12c0.568,0,1.029,0.461,1.029,1.03V36.123z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_41_" x1="48.6074" x2="48.6074" y1="25.4102" y2="36.5772">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M54.608,25.398h-3.088c-0.571,0-1.03,0.461-1.03,1.03v5.02h-7.883c-0.57,0-1.03,0.461-1.03,1.029  v3.088c0,0.568,0.46,1.03,1.03,1.03h12c0.568,0,1.029-0.462,1.029-1.03v-9.137C55.637,25.859,55.178,25.398,54.608,25.398z" fill="url(#SVGID_41_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_42_" x1="48.6074" x2="48.6074" y1="25.8818" y2="36.0711">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M54.608,25.913h-3.088c-0.285,0-0.517,0.229-0.517,0.516v5.533h-8.396  c-0.285,0-0.517,0.23-0.517,0.516v3.088c0,0.284,0.231,0.516,0.517,0.516h12c0.284,0,0.516-0.231,0.516-0.516v-9.137  C55.123,26.143,54.892,25.913,54.608,25.913z" fill="url(#SVGID_42_)"/>
 <path d="M21.949,42.235c0,0.568-0.459,1.03-1.028,1.03h-3.089c-0.567,0-1.029-0.462-1.029-1.03v-3.088  c0-0.568,0.462-1.031,1.029-1.031h3.089c0.569,0,1.028,0.463,1.028,1.031V42.235z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_43_" x1="19.376" x2="19.376" y1="37.5371" y2="42.7326">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M21.949,41.679c0,0.568-0.459,1.029-1.028,1.029h-3.089c-0.567,0-1.029-0.461-1.029-1.029v-3.09  c0-0.567,0.462-1.028,1.029-1.028h3.089c0.569,0,1.028,0.461,1.028,1.028V41.679z" fill="url(#SVGID_43_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_44_" x1="21.5" x2="17.3381" y1="40.1343" y2="40.1343">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M17.832,42.192c-0.284,0-0.516-0.229-0.516-0.514v-3.09c0-0.284,0.231-0.513,0.516-0.513h3.089  c0.283,0,0.515,0.229,0.515,0.513v3.09c0,0.284-0.231,0.514-0.515,0.514H17.832z" fill="url(#SVGID_44_)"/>
 <path d="M15.73,42.235c0,0.568-0.462,1.03-1.031,1.03h-3.088c-0.568,0-1.028-0.462-1.028-1.03v-3.088  c0-0.568,0.46-1.031,1.028-1.031h3.088c0.569,0,1.031,0.463,1.031,1.031V42.235z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_45_" x1="13.1563" x2="13.1563" y1="37.5371" y2="42.7326">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M15.73,41.679c0,0.568-0.462,1.029-1.031,1.029h-3.088c-0.568,0-1.028-0.461-1.028-1.029v-3.09  c0-0.567,0.46-1.028,1.028-1.028h3.088c0.569,0,1.031,0.461,1.031,1.028V41.679z" fill="url(#SVGID_45_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_46_" x1="15.2793" x2="11.1194" y1="40.1343" y2="40.1343">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M11.611,42.192c-0.283,0-0.514-0.229-0.514-0.514v-3.09c0-0.284,0.23-0.513,0.514-0.513h3.088  c0.286,0,0.516,0.229,0.516,0.513v3.09c0,0.284-0.229,0.514-0.516,0.514H11.611z" fill="url(#SVGID_46_)"/>
 <path d="M9.51,42.235c0,0.568-0.461,1.03-1.029,1.03H5.393c-0.57,0-1.031-0.462-1.031-1.03v-3.088  c0-0.568,0.461-1.031,1.031-1.031H8.48c0.568,0,1.029,0.463,1.029,1.031V42.235z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_47_" x1="6.9355" x2="6.9355" y1="37.5371" y2="42.7326">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M9.51,41.679c0,0.568-0.461,1.029-1.029,1.029H5.393c-0.57,0-1.031-0.461-1.031-1.029v-3.09  c0-0.567,0.461-1.028,1.031-1.028H8.48c0.568,0,1.029,0.461,1.029,1.028V41.679z" fill="url(#SVGID_47_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_48_" x1="9.0596" x2="4.8987" y1="40.1343" y2="40.1343">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M5.393,42.192c-0.285,0-0.516-0.229-0.516-0.514v-3.09c0-0.284,0.23-0.513,0.516-0.513H8.48  c0.283,0,0.515,0.229,0.515,0.513v3.09c0,0.284-0.231,0.514-0.515,0.514H5.393z" fill="url(#SVGID_48_)"/>
 <path d="M49.557,42.235c0,0.568-0.463,1.03-1.03,1.03h-3.089c-0.568,0-1.028-0.462-1.028-1.03v-3.088  c0-0.568,0.46-1.031,1.028-1.031h3.089c0.567,0,1.03,0.463,1.03,1.031V42.235z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_49_" x1="46.9824" x2="46.9824" y1="37.5371" y2="42.7326">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M49.557,41.679c0,0.568-0.463,1.029-1.03,1.029h-3.089c-0.568,0-1.028-0.461-1.028-1.029v-3.09  c0-0.567,0.46-1.028,1.028-1.028h3.089c0.567,0,1.03,0.461,1.03,1.028V41.679z" fill="url(#SVGID_49_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_50_" x1="49.1064" x2="44.9445" y1="40.1343" y2="40.1343">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M45.438,42.192c-0.283,0-0.515-0.229-0.515-0.514v-3.09c0-0.284,0.231-0.513,0.515-0.513h3.089  c0.284,0,0.516,0.229,0.516,0.513v3.09c0,0.284-0.231,0.514-0.516,0.514H45.438z" fill="url(#SVGID_50_)"/>
 <path d="M55.637,42.235c0,0.568-0.461,1.03-1.029,1.03h-3.089c-0.569,0-1.028-0.462-1.028-1.03v-3.088  c0-0.568,0.459-1.031,1.028-1.031h3.089c0.568,0,1.029,0.463,1.029,1.031V42.235z" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_51_" x1="53.0635" x2="53.0635" y1="37.5371" y2="42.7326">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+<stop offset="0" style="stop-color:#F0F4F1"/>
+<stop offset="0.7939" style="stop-color:#A2A5A4"/>
+<stop offset="1" style="stop-color:#D3DBD7"/>
 </linearGradient>
 <path d="M55.637,41.679c0,0.568-0.461,1.029-1.029,1.029h-3.089c-0.569,0-1.028-0.461-1.028-1.029v-3.09  c0-0.567,0.459-1.028,1.028-1.028h3.089c0.568,0,1.029,0.461,1.029,1.028V41.679z" fill="url(#SVGID_51_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_52_" x1="55.1875" x2="51.0256" y1="40.1343" y2="40.1343">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.8364" style="stop-color:#C9CECC"/>
+<stop offset="0.9758" style="stop-color:#D5D8D6"/>
+<stop offset="1" style="stop-color:#D5D8D6"/>
 </linearGradient>
 <path d="M51.519,42.192c-0.283,0-0.515-0.229-0.515-0.514v-3.09c0-0.284,0.231-0.513,0.515-0.513h3.089  c0.284,0,0.516,0.229,0.516,0.513v3.09c0,0.284-0.231,0.514-0.516,0.514H51.519z" fill="url(#SVGID_52_)"/>
 <path d="M43.314,42.172c0,0.569-0.462,1.028-1.029,1.028H23.752c-0.567,0-1.029-0.459-1.029-1.028v-3.089  c0-0.568,0.462-1.029,1.029-1.029h18.533c0.567,0,1.029,0.461,1.029,1.029V42.172z" fill-opacity="0.25" stroke-opacity="0.25"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_language.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_language.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_language.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,17 +3,17 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="3.3105" x2="7.0752" y1="44.4668" y2="44.4668">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+<stop offset="0.7091" style="stop-color:#6A6C6E"/>
+<stop offset="1" style="stop-color:#AAAFAE"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="27.067" width="3.765" x="3.311" y="30.933"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="2.3691" x2="8.0166" y1="29.7603" y2="29.7603">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+<stop offset="0.7091" style="stop-color:#6A6C6E"/>
+<stop offset="1" style="stop-color:#AAAFAE"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="2.346" width="5.647" x="2.369" y="28.587"/>
 <rect fill-opacity="0.4" height="0.471" stroke-opacity="0.4" width="3.765" x="3.311" y="30.933"/>
@@ -21,33 +21,33 @@
 <rect fill-opacity="0.2" height="0.471" stroke-opacity="0.2" width="3.765" x="3.311" y="31.404"/>
 <rect fill-opacity="0.1" height="0.471" stroke-opacity="0.1" width="3.765" x="3.311" y="31.875"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="7.0752" x2="28.6899" y1="41.8154" y2="41.8154">
-<stop offset="0" style="stop-color:#1A5FCC"/>
-<stop offset="0.1697" style="stop-color:#3492E9"/>
-<stop offset="0.4" style="stop-color:#195BCB"/>
-<stop offset="0.7455" style="stop-color:#389AED"/>
-<stop offset="1" style="stop-color:#1E65D0"/>
+<stop offset="0" style="stop-color:#4F6697"/>
+<stop offset="0.1697" style="stop-color:#6A9AB3"/>
+<stop offset="0.4" style="stop-color:#4E6496"/>
+<stop offset="0.7455" style="stop-color:#6EA3B7"/>
+<stop offset="1" style="stop-color:#536C9B"/>
 </linearGradient>
 <path d="M7.075,31.404c0,0,7.318-0.909,9.905,1.303c4.323,3.695,8.959,3.246,11.709,2.859v16.748  c0,0-9.091,0.707-12.707-1.705c-2.198-1.465-8.908-0.969-8.908-0.969V31.404z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="23.3271" x2="44.9414" y1="15.1758" y2="15.1758">
-<stop offset="0" style="stop-color:#398F0D"/>
-<stop offset="0.1636" style="stop-color:#7BC84C"/>
-<stop offset="0.4" style="stop-color:#388E0D"/>
-<stop offset="0.7818" style="stop-color:#7AC943"/>
-<stop offset="1" style="stop-color:#3E930E"/>
+<stop offset="0" style="stop-color:#346844"/>
+<stop offset="0.1636" style="stop-color:#85A371"/>
+<stop offset="0.4" style="stop-color:#346744"/>
+<stop offset="0.7818" style="stop-color:#82A16B"/>
+<stop offset="1" style="stop-color:#366B44"/>
 </linearGradient>
 <path d="M23.327,4.764c0,0,7.318-0.906,9.903,1.304c4.324,3.694,8.959,3.246,11.711,2.858v16.75  c0,0-9.092,0.707-12.707-1.706c-2.197-1.467-8.907-0.968-8.907-0.968V4.764z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="19.5459" x2="23.3105" y1="18.2319" y2="18.2319">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+<stop offset="0.7091" style="stop-color:#6A6C6E"/>
+<stop offset="1" style="stop-color:#AAAFAE"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="27.774" width="3.765" x="19.546" y="4.345"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="18.6045" x2="24.252" y1="3.1724" y2="3.1724">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+<stop offset="0.7091" style="stop-color:#6A6C6E"/>
+<stop offset="1" style="stop-color:#AAAFAE"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="2.345" width="5.647" x="18.604" y="2"/>
 <rect fill-opacity="0.4" height="0.471" stroke-opacity="0.4" width="3.765" x="19.546" y="4.345"/>
@@ -55,25 +55,25 @@
 <rect fill-opacity="0.2" height="0.471" stroke-opacity="0.2" width="3.765" x="19.546" y="4.815"/>
 <rect fill-opacity="0.1" height="0.471" stroke-opacity="0.1" width="3.765" x="19.546" y="5.286"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="36.0156" x2="57.6309" y1="41.8154" y2="41.8154">
-<stop offset="0" style="stop-color:#CC1414"/>
-<stop offset="0.1758" style="stop-color:#F74403"/>
-<stop offset="0.4182" style="stop-color:#CC1414"/>
-<stop offset="0.7394" style="stop-color:#FF4D00"/>
-<stop offset="1" style="stop-color:#CC1414"/>
+<stop offset="0" style="stop-color:#954B50"/>
+<stop offset="0.1758" style="stop-color:#AE654C"/>
+<stop offset="0.4182" style="stop-color:#954B50"/>
+<stop offset="0.7394" style="stop-color:#B36B4D"/>
+<stop offset="1" style="stop-color:#954B50"/>
 </linearGradient>
 <path d="M36.016,31.404c0,0,7.32-0.909,9.904,1.303c4.324,3.695,8.959,3.246,11.711,2.859v16.748  c0,0-9.092,0.707-12.707-1.705c-2.197-1.465-8.908-0.969-8.908-0.969V31.404z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="32.252" x2="36.0156" y1="44.4668" y2="44.4668">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+<stop offset="0.7091" style="stop-color:#6A6C6E"/>
+<stop offset="1" style="stop-color:#AAAFAE"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="27.067" width="3.764" x="32.252" y="30.933"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="31.3105" x2="36.957" y1="29.7603" y2="29.7603">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+<stop offset="0.7091" style="stop-color:#6A6C6E"/>
+<stop offset="1" style="stop-color:#AAAFAE"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="2.346" width="5.646" x="31.311" y="28.587"/>
 <rect fill-opacity="0.4" height="0.471" stroke-opacity="0.4" width="3.764" x="32.252" y="30.933"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_location_new.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_location_new.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_location_new.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,36 +4,36 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="240.1621" x2="240.1621" y1="1779.4043" y2="1824.6136">
-<stop offset="0" style="stop-color:#4FB7EB"/>
-<stop offset="1" style="stop-color:#1755B3"/>
+<stop offset="0" style="stop-color:#7EB8BC"/>
+<stop offset="1" style="stop-color:#465684"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="49.361,9.213 57.039,10.264 57.039,53.138 43.52,54.988 30.002,52.297 22.284,53.751 "/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="237.2617" x2="237.2617" y1="1791.29" y2="1823.7784">
-<stop offset="0" style="stop-color:#8EFFF5"/>
-<stop offset="1" style="stop-color:#1D9DD8"/>
+<stop offset="0" style="stop-color:#B0DDC1"/>
+<stop offset="1" style="stop-color:#5586A0"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="43.52,21.685 43.52,54.988 30.002,52.297 30.002,41.25 "/>
 <polygon fill-opacity="0.25" points="50.26,9.347 43.52,23.584 30.002,43.172 23.378,53.564 20.226,54.149   47.881,9.016 " stroke-opacity="0.25"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="224.7246" x2="224.7246" y1="1777.3057" y2="1823.4724">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#E4E0C1"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="45.482,11.152 43.414,22.27 30.002,41.725 22.334,53.759 15.733,54.988 2.966,52.584   2.966,9.338 15.358,8.413 30.002,10.446 43.52,8.413 "/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="223.3672" x2="223.3672" y1="1821.5967" y2="1778.4828">
-<stop offset="0" style="stop-color:#E69400"/>
-<stop offset="1" style="stop-color:#F9DE4F"/>
+<stop offset="0" style="stop-color:#A17945"/>
+<stop offset="1" style="stop-color:#C6BD82"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4_)" points="30.002,10.446 30.002,41.725 22.334,53.759 15.733,54.988 15.733,8.466 "/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="246.9512" x2="246.9512" y1="1790.3203" y2="1777.6716">
-<stop offset="0" style="stop-color:#E69400"/>
-<stop offset="1" style="stop-color:#F9DE4F"/>
+<stop offset="0" style="stop-color:#A17945"/>
+<stop offset="1" style="stop-color:#C6BD82"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5_)" points="43.52,8.413 43.52,22.115 49.383,9.217 "/>
 <path d="M16.483,54.842l11.49-17.231l-4.842-2.408l-7.341,10.153  l-7.165,8.278l-2.291-0.423l9.408-11.076l5.523-7.851l-5.782-2.847L2.966,28.87v-1.32l12.995,2.686l6.069,2.979l6.841-9.601  l-13.34-6.657L2.966,14.749v-2.042l12.971,2.171l13.968,6.972l4.002-6.801l-3.909-1.375l-5.803-4.013l2.769,0.382l3.052,2.232  l4.547,1.656l2.688-4.564L39.88,8.99l-3.501,5.915l4.996,2.688l2.188-3.465l2.255-5.396l1.271,0.173l-3.554,7.663  c0,0-8.687,13.462-13.519,20.691L18.318,54.506L16.483,54.842z M28.84,36.606l-4.9-2.489l6.734-9.471l4.502,2.188L28.84,36.606z   M31.749,22.77l4.711,2.353l4.219-6.434l-4.955-2.665L31.749,22.77L31.749,22.77z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="225.3965" x2="225.3965" y1="1823.0439" y2="1789.2549">
-<stop offset="0" style="stop-color:#FCE28D"/>
-<stop offset="0.81" style="stop-color:#FEF7DF"/>
-<stop offset="1" style="stop-color:#FEF7DF"/>
+<stop offset="0" style="stop-color:#DBD3AE"/>
+<stop offset="0.81" style="stop-color:#F5F3E8"/>
+<stop offset="1" style="stop-color:#F5F3E8"/>
 </linearGradient>
 <path d="M46.023,8.754l-2.476,5.931c0,0-1.334,2.112-2.077,3.276l-5.482-2.949l3.524-5.947l-1.787,0.241  l-3.056,4.998l-4.625-1.697l-3.417-2.63l-2.114-0.292l5.51,3.755l4.268,1.503l-4.276,7.272l-14.135-7.055L2.966,12.979v1.483  l12.621,2.208l13.674,6.826l-0.164,0.277l-6.977,9.795l-6.365-3.099L2.961,27.85l0.005,0.742l12.754,2.651l5.965,2.939l-5.926,8.307  l-9.111,10.79l1.693,0.316l7.417-8.591l7.281-10.156l5.416,2.667L16.876,54.777l1.051-0.198l12.09-18.127l13.55-20.397l3.266-7.185  L46.023,8.754z M30.012,34.986l-1.265,1.946l-5.27-2.696l6.605-9.38l0.519-0.685l5.139,2.564L30.012,34.986z M36.559,25.482  l-5.202-2.598l4.261-7.232l5.453,2.936L36.559,25.482z" fill="url(#SVGID_6_)"/>
 <polygon fill="#FFFFFF" points="38.253,47.876 43.529,36.76 48.269,47.876 43.529,45.003 "/>
@@ -42,9 +42,9 @@
 <path d="M24.975,28.442c0,0.592-1.25,1.073-2.786,1.073  c-1.536,0-2.787-0.482-2.787-1.073c0-0.596,1.25-1.076,2.787-1.076C23.724,27.367,24.975,27.847,24.975,28.442z" fill="#333333" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M30.108,6.172c-1.354,0.957-3.687,2.304-4.689,2.304c-0.001,0-0.001,0-0.003,0  c-0.229-0.027-0.567-0.25-0.927-0.485c-0.718-0.468-1.704-1.113-3.139-1.124c-1.059,0-2.665,1.035-3.74,1.829l-0.667-1.729  L11.995,8.87l1.134,2.934l0.667-0.256l5.98,15.49l2.866,2.022l0.742-3.411l-1.496-3.874l0.268-0.689  c0.55-1.418,1.795-3.936,2.793-4.645c0.263-0.185,0.994-0.554,1.581-0.849c0.595-0.301,1.11-0.558,1.413-0.751  c2.499-1.603,3.411-7.21,3.505-7.845l0.296-1.983L30.108,6.172z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.9331 -0.3596 -0.3596 -0.9331 -489.4615 -2117.6033)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-293.0366" x2="-295.1697" y1="-2176.2671" y2="-2176.2671">
-<stop offset="0" style="stop-color:#8C8E8F"/>
+<stop offset="0" style="stop-color:#8D8E8E"/>
 <stop offset="0.65" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#AEB2B3"/>
+<stop offset="1" style="stop-color:#B0B2B1"/>
 </linearGradient>
 <polygon fill="url(#SVGID_7_)" points="14.286,10.442 16.297,9.666 22.493,25.715 22.077,27.618 20.482,26.49 "/>
 <linearGradient gradientTransform="matrix(0.9331 -0.3596 -0.3596 -0.9331 -489.4615 -2117.6033)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-292.3564" x2="-295.8871" y1="-2166.1377" y2="-2166.1377">
@@ -54,25 +54,35 @@
 </linearGradient>
 <polygon fill="url(#SVGID_8_)" points="13.103,9.361 16.452,8.072 16.968,9.411 13.619,10.699 "/>
 <rect fill-opacity="0.2" height="0.717" stroke-opacity="0.2" transform="matrix(-0.9328 0.3603 -0.3603 -0.9328 33.5485 14.5261)" width="2.155" x="14.343" y="10.032"/>
-<path d="M17.225,10.08c0,0,2.878-2.366,4.131-2.354c1.958,0.013,2.896,1.477,3.959,1.601  c1.55,0.183,5.289-2.455,5.289-2.455s-0.877,5.81-3.122,7.253c-0.59,0.375-2.456,1.218-3.026,1.624  c-1.583,1.123-3.099,5.035-3.099,5.035L17.225,10.08z" fill="#33A02C"/>
+<path d="M17.225,10.08c0,0,2.878-2.366,4.131-2.354c1.958,0.013,2.896,1.477,3.959,1.601  c1.55,0.183,5.289-2.455,5.289-2.455s-0.877,5.81-3.122,7.253c-0.59,0.375-2.456,1.218-3.026,1.624  c-1.583,1.123-3.099,5.035-3.099,5.035L17.225,10.08z" fill="#4F7D5A"/>
 <path d="M21.652,8.488c1.958,0.018,2.897,1.48,3.958,1.605  c1.2,0.139,3.708-1.408,4.78-2.114c0.14-0.665,0.209-1.11,0.209-1.11s-3.739,2.638-5.29,2.455c-1.059-0.124-1.999-1.588-3.957-1.602  c-1.252-0.009-4.13,2.355-4.13,2.355l0.297,0.768C17.521,10.848,20.398,8.48,21.652,8.488z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 </g>
 <g transform="matrix(1 0 0 1 30 0)">
-<rect fill="none" height="15" width="15" x="15"/>
-<rect fill-opacity="0.6" height="4.412" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(-0.2587 0.9659 -0.9659 -0.2587 29.2728 -12.3701)" width="7.941" x="15.41" y="2.841"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-70.19" x2="-73.15" y1="114.9" y2="107.7">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.26" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<polygon fill-opacity="0.35" points="23.487,5.563 16.725,12.331 19.341,2.565 12.047,0.611 8.829,12.621   14.825,14.229 12.973,16.083 18.312,21.421 28.829,10.901 " stroke-opacity="0.35"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -376.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="297.9736" x2="295.2261" y1="-378.1689" y2="-388.7774">
+<stop offset="0" style="stop-color:#CDB18B"/>
+<stop offset="0.703" style="stop-color:#985954"/>
+<stop offset="1" style="stop-color:#BE997B"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1__)" points="9.714,12.11 12.558,1.496 18.453,3.077 15.611,13.691 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -376.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="297.7822" x2="295.3409" y1="-378.8926" y2="-388.3527">
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1__)" points="20.17,8.913,16.76,8,18.59,1.181,22,2.094"/>
-<rect fill-opacity="0.6" height="4.411" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 48.0833 -1.2961)" width="9.707" x="19.46" y="7.104"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-63.01" x2="-70.68" y1="110.1" y2="104.1">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.26" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<polygon fill="url(#SVGID_2__)" points="15.18,12.942 10.463,11.679 12.989,2.246 17.706,3.508 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -376.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="308.0273" x2="298.6434" y1="-384.7505" y2="-394.3634">
+<stop offset="0" style="stop-color:#CDB18B"/>
+<stop offset="0.703" style="stop-color:#985954"/>
+<stop offset="1" style="stop-color:#BE997B"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2__)" points="22.44,13.68,19.94,11.18,26.18,4.942,28.68,7.438"/>
+<polygon fill="url(#SVGID_3__)" points="13.995,16.083 23.487,6.585 27.805,10.901 18.312,20.398 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -376.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="307.7012" x2="299.1582" y1="-385.1528" y2="-393.7721">
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
+</linearGradient>
+<polygon fill="url(#SVGID_4__)" points="18.312,19.532 14.858,16.083 23.487,7.449 26.944,10.901 "/>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_map_placeholder.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_map_placeholder.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="0.3882" y2="59.6489">
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="1" style="stop-color:#222021"/>
+</linearGradient>
+<path d="M0,60V0.306h60V60H0z M50.246,54.316L30,34.174L9.754,54.316H50.246z M54.286,50.297  V10.011L34.04,30.152L54.286,50.297z M5.714,50.297L25.96,30.152L5.714,10.011V50.297z M30,26.133L50.246,5.991H9.754L30,26.133z" fill="url(#SVGID_1_)" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.0005" x2="30.0005" y1="1.0972" y2="58.9473">
+<stop offset="0" style="stop-color:#AAABAC"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M0.714,59.29V1.017h58.573V59.29 M51.97,55.026L30,33.169L8.03,55.026H51.97z   M55.001,52.011V8.295L33.03,30.152L55.001,52.011z M5,52.011l21.97-21.858L5,8.295V52.011z M30,27.138L51.97,5.281H8.03L30,27.138z  " fill="url(#SVGID_2_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.9995" x2="29.9995" y1="1.0952" y2="57.5348">
+<stop offset="0" style="stop-color:#F7FCF8"/>
+<stop offset="0.6242" style="stop-color:#CBCFCD"/>
+<stop offset="1" style="stop-color:#9FA4A4"/>
+</linearGradient>
+<path d="M1.428,1.017v56.853h57.145V1.017H1.428z M27.98,29.442L4.285,53.018V5.869L27.98,29.442z   M6.305,3.859h47.39L30,27.433L6.305,3.859z M30,31.452l23.695,23.574H6.305L30,31.452z M32.021,29.442L55.715,5.869v47.148  L32.021,29.442z" fill="url(#SVGID_3_)"/>
+<g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30.0005" x2="30.0005" y1="4.5698" y2="53.605">
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="1" style="stop-color:#222021"/>
+</linearGradient>
+<path d="M20,53.604c-1.924,0-3.583-1.555-3.698-3.462L15.17,32.285H15   c-1.576,0-2.856-1.276-2.856-2.843v-4.264c0-1.567,1.281-2.842,2.856-2.842H27.5v-3.604c-0.361,0.029-0.728,0.043-1.099,0.043   c-2.795,0-5.822-0.82-8.524-2.312c-4.18-2.304-7.19-6.002-7.856-9.653L9.806,5.62l1.147-0.402c1.227-0.43,2.592-0.647,4.056-0.647   c2.797,0,5.831,0.823,8.541,2.317c2.809,1.548,5.054,3.648,6.45,6.008c1.396-2.36,3.642-4.461,6.45-6.009   c2.709-1.494,5.743-2.317,8.54-2.317c1.464,0,2.829,0.218,4.056,0.647l1.149,0.402l-0.217,1.192   c-0.666,3.65-3.676,7.349-7.855,9.654c-2.703,1.49-5.73,2.31-8.523,2.31c-0.372,0-0.738-0.014-1.1-0.043v3.604h12.501   c1.575,0,2.855,1.275,2.855,2.842v4.264c0,1.567-1.28,2.843-2.855,2.843H44.83l-1.132,17.857c-0.115,1.907-1.773,3.462-3.698,3.462   H20z" fill="url(#SVGID_4_)" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="5.2808" y2="52.896">
+<stop offset="0" style="stop-color:#AAABAC"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M33.598,18.065c0.002,0,0.002,0,0.002,0c2.675,0,5.578-0.788,8.177-2.221   c3.998-2.204,6.871-5.714,7.499-9.159l0.107-0.596L48.81,5.888c-1.151-0.403-2.437-0.607-3.819-0.607   c-2.678,0-5.589,0.791-8.194,2.228C33.617,9.26,31.198,11.758,30,14.444c-1.199-2.687-3.617-5.185-6.795-6.936   c-2.607-1.438-5.518-2.228-8.195-2.228c-1.383,0-2.668,0.204-3.819,0.607l-0.573,0.201l0.107,0.596   c0.628,3.445,3.501,6.955,7.499,9.159c2.599,1.433,5.503,2.221,8.178,2.221c0.622,0,1.229-0.042,1.813-0.125v5.106H15   c-1.182,0-2.143,0.957-2.143,2.132v4.264c0,1.176,0.961,2.131,2.143,2.131h0.843L17.014,50.1c0.094,1.54,1.434,2.796,2.986,2.796   h20c1.553,0,2.893-1.256,2.986-2.796l1.171-18.526h0.844c1.181,0,2.143-0.955,2.143-2.131v-4.264c0-1.175-0.962-2.132-2.143-2.132   H31.785V17.94C32.37,18.023,32.976,18.065,33.598,18.065z" fill="url(#SVGID_5_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="43.3672" x2="16.6225" y1="39.7471" y2="39.7471">
+<stop offset="0" style="stop-color:#844D38"/>
+<stop offset="0.3" style="stop-color:#713631"/>
+<stop offset="1" style="stop-color:#92603E"/>
+</linearGradient>
+<path d="M43.572,28.021H16.428l1.299,21.323c0.072,1.17,1.094,2.129,2.273,2.129h20   c1.18,0,2.201-0.959,2.273-2.129L43.572,28.021z" fill="url(#SVGID_6_)"/>
+<path d="M40.272,50.762H19.728c-0.795,0-1.515-0.419-1.939-1.04c0.242,0.992,1.162,1.752,2.211,1.752   h20c1.05,0,1.97-0.76,2.212-1.752C41.788,50.343,41.068,50.762,40.272,50.762z" fill="#46232D" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M30,30.864c6.11,0,10.076,0.573,13.367,1.227l0.205-3.359H16.428l0.205,3.359   C19.924,31.438,23.89,30.864,30,30.864z" fill="#46232D" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="28.8701" x2="31.0122" y1="21.27" y2="21.27">
+<stop offset="0" style="stop-color:#869D67"/>
+<stop offset="0.3758" style="stop-color:#476358"/>
+<stop offset="0.6303" style="stop-color:#182637"/>
+<stop offset="1" style="stop-color:#234851"/>
+</linearGradient>
+<rect fill="url(#SVGID_7_)" height="9.238" width="2.142" x="28.929" y="16.651"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="46.4297" x2="13.5703" y1="26.5991" y2="26.5991">
+<stop offset="0" style="stop-color:#844D38"/>
+<stop offset="0.3" style="stop-color:#713631"/>
+<stop offset="1" style="stop-color:#92603E"/>
+</linearGradient>
+<path d="M46.43,28.732c0,0.781-0.645,1.42-1.429,1.42H15c-0.785,0-1.429-0.639-1.429-1.42v-4.264   c0-0.782,0.644-1.421,1.429-1.421h30.001c0.784,0,1.429,0.64,1.429,1.421V28.732z" fill="url(#SVGID_8_)"/>
+<path d="M45.001,29.442H15c-0.785,0-1.429-0.64-1.429-1.42v0.71c0,0.781,0.644,1.42,1.429,1.42   h30.001c0.784,0,1.429-0.639,1.429-1.42v-0.71C46.43,28.802,45.785,29.442,45.001,29.442z" fill="#46232D" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M45.001,23.046H15c-0.785,0-1.429,0.64-1.429,1.421v0.71c0-0.781,0.644-1.421,1.429-1.421   h30.001c0.784,0,1.429,0.64,1.429,1.421v-0.71C46.43,23.686,45.785,23.046,45.001,23.046z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="10.4175" x2="30.0361" y1="5.9038" y2="16.902">
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
+</linearGradient>
+<path d="M22.858,8.13c-3.974-2.19-8.299-2.669-11.43-1.572c0.57,3.138,3.167,6.474,7.142,8.665   c3.973,2.19,8.299,2.669,11.43,1.572C29.429,13.657,26.833,10.32,22.858,8.13z" fill="url(#SVGID_9_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="42.1152" x2="39.5384" y1="18.2144" y2="12.261">
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
+</linearGradient>
+<path d="M37.142,8.13c3.974-2.19,8.299-2.669,11.43-1.572c-0.569,3.138-3.167,6.474-7.142,8.665   c-3.973,2.19-8.299,2.669-11.43,1.572C30.571,13.657,33.167,10.32,37.142,8.13z" fill="url(#SVGID_10_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="18.8848" x2="20.6575" y1="18.1733" y2="11.8801">
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
+</linearGradient>
+<path d="M18.57,15.223c3.973,2.19,8.299,2.669,11.43,1.572c0,0-7.308-3.236-9.777-4.551   c-3.304-1.759-8.794-5.685-8.794-5.685C11.999,9.696,14.596,13.032,18.57,15.223z" fill="url(#SVGID_11_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="48.8037" x2="29.4835" y1="4.1372" y2="15.7295">
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
+</linearGradient>
+<path d="M37.142,8.13c-3.975,2.19-6.57,5.527-7.142,8.665c0,0,6.843-2.558,9.867-4.285   c3.393-1.937,8.704-5.952,8.704-5.952C45.44,5.461,41.115,5.94,37.142,8.13z" fill="url(#SVGID_12_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="20.7144" x2="20.7144" y1="6.3657" y2="15.8773">
+<stop offset="0" style="stop-color:#CFDCAD"/>
+<stop offset="1" style="stop-color:#2B644B"/>
+</linearGradient>
+<path d="M22.858,8.13c-3.974-2.19-8.299-2.669-11.43-1.572c3.953-0.562,7.701,0.2,11.083,2.193   c3.334,1.965,5.657,4.691,7.488,8.043C29.429,13.657,26.833,10.32,22.858,8.13z" fill="url(#SVGID_13_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="39.2861" x2="39.2861" y1="6.0693" y2="16.0647">
+<stop offset="0" style="stop-color:#CFDCAD"/>
+<stop offset="1" style="stop-color:#2B644B"/>
+</linearGradient>
+<path d="M37.487,8.751c5.281-3.037,11.084-2.193,11.084-2.193C45.44,5.461,41.115,5.94,37.142,8.13   c-3.975,2.19-6.57,5.527-7.142,8.665C30,16.794,31.95,11.937,37.487,8.751z" fill="url(#SVGID_14_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="18.8848" x2="20.6575" y1="18.1733" y2="11.8801">
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="0.2303" style="stop-color:#C2D090"/>
+<stop offset="1" style="stop-color:#2B644B"/>
+</linearGradient>
+<path d="M18.916,14.601c-5.35-2.86-7.487-8.042-7.487-8.042   c0.57,3.138,3.167,6.474,7.142,8.665c3.973,2.19,8.299,2.669,11.43,1.572C30,16.794,25,17.854,18.916,14.601z" fill="url(#SVGID_15_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="40.8457" x2="39.6931" y1="17.7969" y2="13.275">
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="0.2303" style="stop-color:#C2D090"/>
+<stop offset="1" style="stop-color:#2B644B"/>
+</linearGradient>
+<path d="M41.085,14.601c-3.312,1.95-6.667,2.734-11.085,2.194   c3.131,1.097,7.457,0.618,11.43-1.572c3.975-2.19,6.572-5.527,7.142-8.665C47.307,9.783,45.313,12.11,41.085,14.601z" fill="url(#SVGID_16_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+</g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="29.9995" x2="29.9995" y1="1.0952" y2="57.5348">
+<stop offset="0" style="stop-color:#CBCDCC"/>
+<stop offset="1" style="stop-color:#6F7172"/>
+</linearGradient>
+<path d="M1.428,1.017v56.853h57.145V1.017H1.428z M57.858,57.157H2.142V1.727h55.716V57.157z" fill="url(#SVGID_17_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="30" x2="30" y1="1.8057" y2="57.1214">
+<stop offset="0" style="stop-color:#E7E8E7"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
+</linearGradient>
+<path d="M2.142,1.727v55.43h55.716V1.727H2.142z M57.144,56.447H2.856V2.438h54.287V56.447z" fill="url(#SVGID_18_)"/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,36 +4,36 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="240.1621" x2="240.1621" y1="1779.4043" y2="1824.6136">
-<stop offset="0" style="stop-color:#4FB7EB"/>
-<stop offset="1" style="stop-color:#1755B3"/>
+<stop offset="0" style="stop-color:#7EB8BC"/>
+<stop offset="1" style="stop-color:#465684"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="49.361,9.213 57.039,10.264 57.039,53.138 43.52,54.988 30.002,52.297 22.284,53.751 "/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="237.2617" x2="237.2617" y1="1791.29" y2="1823.7784">
-<stop offset="0" style="stop-color:#8EFFF5"/>
-<stop offset="1" style="stop-color:#1D9DD8"/>
+<stop offset="0" style="stop-color:#B0DDC1"/>
+<stop offset="1" style="stop-color:#5586A0"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="43.52,21.685 43.52,54.988 30.002,52.297 30.002,41.25 "/>
 <polygon fill-opacity="0.25" points="50.26,9.347 43.52,23.584 30.002,43.172 23.378,53.564 20.226,54.149   47.881,9.016 " stroke-opacity="0.25"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="224.7246" x2="224.7246" y1="1777.3057" y2="1823.4724">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#E4E0C1"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="45.482,11.152 43.414,22.27 30.002,41.725 22.334,53.759 15.733,54.988 2.966,52.584   2.966,9.338 15.358,8.413 30.002,10.446 43.52,8.413 "/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="223.3672" x2="223.3672" y1="1821.5967" y2="1778.4828">
-<stop offset="0" style="stop-color:#E69400"/>
-<stop offset="1" style="stop-color:#F9DE4F"/>
+<stop offset="0" style="stop-color:#A17945"/>
+<stop offset="1" style="stop-color:#C6BD82"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4_)" points="30.002,10.446 30.002,41.725 22.334,53.759 15.733,54.988 15.733,8.466 "/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="246.9512" x2="246.9512" y1="1790.3203" y2="1777.6716">
-<stop offset="0" style="stop-color:#E69400"/>
-<stop offset="1" style="stop-color:#F9DE4F"/>
+<stop offset="0" style="stop-color:#A17945"/>
+<stop offset="1" style="stop-color:#C6BD82"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5_)" points="43.52,8.413 43.52,22.115 49.383,9.217 "/>
 <path d="M16.483,54.842l11.49-17.231l-4.842-2.408l-7.341,10.153  l-7.165,8.278l-2.291-0.423l9.408-11.076l5.523-7.851l-5.782-2.847L2.966,28.87v-1.32l12.995,2.686l6.069,2.979l6.841-9.601  l-13.34-6.657L2.966,14.749v-2.042l12.971,2.171l13.968,6.972l4.002-6.801l-3.909-1.375l-5.803-4.013l2.769,0.382l3.052,2.232  l4.547,1.656l2.688-4.564L39.88,8.99l-3.501,5.915l4.996,2.688l2.188-3.465l2.255-5.396l1.271,0.173l-3.554,7.663  c0,0-8.687,13.462-13.519,20.691L18.318,54.506L16.483,54.842z M28.84,36.606l-4.9-2.489l6.734-9.471l4.502,2.188L28.84,36.606z   M31.749,22.77l4.711,2.353l4.219-6.434l-4.955-2.665L31.749,22.77L31.749,22.77z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="225.3965" x2="225.3965" y1="1823.0439" y2="1789.2549">
-<stop offset="0" style="stop-color:#FCE28D"/>
-<stop offset="0.81" style="stop-color:#FEF7DF"/>
-<stop offset="1" style="stop-color:#FEF7DF"/>
+<stop offset="0" style="stop-color:#DBD3AE"/>
+<stop offset="0.81" style="stop-color:#F5F3E8"/>
+<stop offset="1" style="stop-color:#F5F3E8"/>
 </linearGradient>
 <path d="M46.023,8.754l-2.476,5.931c0,0-1.334,2.112-2.077,3.276l-5.482-2.949l3.524-5.947l-1.787,0.241  l-3.056,4.998l-4.625-1.697l-3.417-2.63l-2.114-0.292l5.51,3.755l4.268,1.503l-4.276,7.272l-14.135-7.055L2.966,12.979v1.483  l12.621,2.208l13.674,6.826l-0.164,0.277l-6.977,9.795l-6.365-3.099L2.961,27.85l0.005,0.742l12.754,2.651l5.965,2.939l-5.926,8.307  l-9.111,10.79l1.693,0.316l7.417-8.591l7.281-10.156l5.416,2.667L16.876,54.777l1.051-0.198l12.09-18.127l13.55-20.397l3.266-7.185  L46.023,8.754z M30.012,34.986l-1.265,1.946l-5.27-2.696l6.605-9.38l0.519-0.685l5.139,2.564L30.012,34.986z M36.559,25.482  l-5.202-2.598l4.261-7.232l5.453,2.936L36.559,25.482z" fill="url(#SVGID_6_)"/>
 <polygon fill="#FFFFFF" points="38.253,47.876 43.529,36.76 48.269,47.876 43.529,45.003 "/>
@@ -42,9 +42,9 @@
 <path d="M24.975,28.442c0,0.592-1.25,1.073-2.786,1.073  c-1.536,0-2.787-0.482-2.787-1.073c0-0.596,1.25-1.076,2.787-1.076C23.724,27.367,24.975,27.847,24.975,28.442z" fill="#333333" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M30.108,6.172c-1.354,0.957-3.687,2.304-4.689,2.304c-0.001,0-0.001,0-0.003,0  c-0.229-0.027-0.567-0.25-0.927-0.485c-0.718-0.468-1.704-1.113-3.139-1.124c-1.059,0-2.665,1.035-3.74,1.829l-0.667-1.729  L11.995,8.87l1.134,2.934l0.667-0.256l5.98,15.49l2.866,2.022l0.742-3.411l-1.496-3.874l0.268-0.689  c0.55-1.418,1.795-3.936,2.793-4.645c0.263-0.185,0.994-0.554,1.581-0.849c0.595-0.301,1.11-0.558,1.413-0.751  c2.499-1.603,3.411-7.21,3.505-7.845l0.296-1.983L30.108,6.172z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.9331 -0.3596 -0.3596 -0.9331 -489.4615 -2117.6033)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-293.0366" x2="-295.1697" y1="-2176.2671" y2="-2176.2671">
-<stop offset="0" style="stop-color:#8C8E8F"/>
+<stop offset="0" style="stop-color:#8D8E8E"/>
 <stop offset="0.65" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#AEB2B3"/>
+<stop offset="1" style="stop-color:#B0B2B1"/>
 </linearGradient>
 <polygon fill="url(#SVGID_7_)" points="14.286,10.442 16.297,9.666 22.493,25.715 22.077,27.618 20.482,26.49 "/>
 <linearGradient gradientTransform="matrix(0.9331 -0.3596 -0.3596 -0.9331 -489.4615 -2117.6033)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-292.3564" x2="-295.8871" y1="-2166.1377" y2="-2166.1377">
@@ -54,7 +54,7 @@
 </linearGradient>
 <polygon fill="url(#SVGID_8_)" points="13.103,9.361 16.452,8.072 16.968,9.411 13.619,10.699 "/>
 <rect fill-opacity="0.2" height="0.717" stroke-opacity="0.2" transform="matrix(-0.9328 0.3603 -0.3603 -0.9328 33.5485 14.5261)" width="2.155" x="14.343" y="10.032"/>
-<path d="M17.225,10.08c0,0,2.878-2.366,4.131-2.354c1.958,0.013,2.896,1.477,3.959,1.601  c1.55,0.183,5.289-2.455,5.289-2.455s-0.877,5.81-3.122,7.253c-0.59,0.375-2.456,1.218-3.026,1.624  c-1.583,1.123-3.099,5.035-3.099,5.035L17.225,10.08z" fill="#33A02C"/>
+<path d="M17.225,10.08c0,0,2.878-2.366,4.131-2.354c1.958,0.013,2.896,1.477,3.959,1.601  c1.55,0.183,5.289-2.455,5.289-2.455s-0.877,5.81-3.122,7.253c-0.59,0.375-2.456,1.218-3.026,1.624  c-1.583,1.123-3.099,5.035-3.099,5.035L17.225,10.08z" fill="#4F7D5A"/>
 <path d="M21.652,8.488c1.958,0.018,2.897,1.48,3.958,1.605  c1.2,0.139,3.708-1.408,4.78-2.114c0.14-0.665,0.209-1.11,0.209-1.11s-3.739,2.638-5.29,2.455c-1.059-0.124-1.999-1.588-3.957-1.602  c-1.252-0.009-4.13,2.355-4.13,2.355l0.297,0.768C17.521,10.848,20.398,8.48,21.652,8.488z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mass_storage.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mass_storage.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mass_storage.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -117,13 +117,13 @@
 <path d="M16.182,43.816c0,0.605-0.487,1.094-1.09,1.094c-0.604,0-1.09-0.488-1.09-1.094  c0-0.598,0.486-1.09,1.09-1.09C15.694,42.727,16.182,43.219,16.182,43.816z" fill="url(#SVGID_19_)"/>
 <path d="M33.564,56.036c-1.056,0-1.914-0.859-1.914-1.915v-4.75c0-1.057,0.858-1.917,1.914-1.917h14.254  c1.056,0,1.915,0.86,1.915,1.917v3.749l-0.642,0.077c-0.781,0.093-1.37,0.75-1.37,1.529c0,0.119,0.02,0.251,0.058,0.394l0.247,0.916  H33.564z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="40.6914" x2="40.6914" y1="48.2568" y2="55.137">
-<stop offset="0" style="stop-color:#FAFFC7"/>
-<stop offset="1" style="stop-color:#EE971E"/>
+<stop offset="0" style="stop-color:#EDEED8"/>
+<stop offset="1" style="stop-color:#B08E5C"/>
 </linearGradient>
 <path d="M49.006,52.475v-3.104c0-0.658-0.529-1.189-1.188-1.189H33.564c-0.658,0-1.188,0.531-1.188,1.189  v4.75c0,0.656,0.529,1.188,1.188,1.188h13.513c-0.05-0.185-0.083-0.381-0.083-0.582C46.994,53.564,47.874,52.609,49.006,52.475z" fill="url(#SVGID_20_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="40.6914" x2="40.6914" y1="48.9683" y2="54.4456">
-<stop offset="0" style="stop-color:#F9E169"/>
-<stop offset="1" style="stop-color:#ED8C0D"/>
+<stop offset="0" style="stop-color:#CEC694"/>
+<stop offset="1" style="stop-color:#AA8250"/>
 </linearGradient>
 <path d="M33.564,54.582c-0.254,0-0.46-0.207-0.46-0.461v-4.75c0-0.256,0.206-0.463,0.46-0.463h14.254  c0.254,0,0.46,0.207,0.46,0.463V51.9c-1.137,0.398-1.948,1.45-2.008,2.682H33.564z" fill="url(#SVGID_21_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_media_transfer.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_media_transfer.svg	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2164" x2="-2164" y1="3649.3477" y2="3604.5469">
-<stop offset="0" style="stop-color:#757575"/>
-<stop offset="0.2424" style="stop-color:#000000"/>
-<stop offset="0.8606" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#363636"/>
-</linearGradient>
-<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v41.813C2,51.732,2.666,52.4,3.493,52.4h53.013  C57.33,52.4,58,51.732,58,50.906V9.094C58,8.27,57.33,7.6,56.506,7.6z M8.719,49.413c0,0.412-0.336,0.748-0.745,0.748H4.986  c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.987c0.409,0,0.745,0.336,0.745,0.746V49.413z   M8.719,12.08c0,0.41-0.336,0.746-0.745,0.746H4.986c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748  h2.987c0.409,0,0.745,0.339,0.745,0.748V12.08z M15.438,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987  c-0.412,0-0.747-0.336-0.747-0.748V47.92c0-0.41,0.335-0.746,0.747-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z   M15.438,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.747-0.336-0.747-0.746v-1.493c0-0.409,0.335-0.748,0.747-0.748  h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M22.159,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986  c-0.41,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z   M22.159,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.41,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748  h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M28.88,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986  c-0.411,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z   M28.88,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.411,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748  h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M35.6,49.413c0,0.412-0.338,0.748-0.747,0.748h-2.985  c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.985c0.409,0,0.747,0.336,0.747,0.746V49.413z   M35.6,12.08c0,0.41-0.338,0.746-0.747,0.746h-2.985c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748  h2.985c0.409,0,0.747,0.339,0.747,0.748V12.08z M42.318,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987  c-0.412,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.334-0.746,0.746-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z   M42.318,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.334-0.748,0.746-0.748  h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M49.039,49.413c0,0.412-0.336,0.748-0.746,0.748h-2.987  c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.41,0,0.746,0.336,0.746,0.746V49.413z   M49.039,12.08c0,0.41-0.336,0.746-0.746,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748  h2.987c0.41,0,0.746,0.339,0.746,0.748V12.08z M55.761,49.413c0,0.412-0.339,0.748-0.748,0.748h-2.987  c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.409,0,0.748,0.336,0.748,0.746V49.413z   M55.761,12.08c0,0.41-0.339,0.746-0.748,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748  h2.987c0.409,0,0.748,0.339,0.748,0.748V12.08z" fill="url(#SVGID_1_)"/>
-<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745  c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745  c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="3641.7637" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
-</linearGradient>
-<path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559  c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
-<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0  c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2164.0005" x2="-2164.0005" y1="3641.8828" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#404040"/>
-</linearGradient>
-<path d="M54.268,15.813c0.41,0,0.745,0.336,0.745,0.745v26.883c0,0.412-0.335,0.745-0.745,0.745H5.732  c-0.411,0-0.746-0.333-0.746-0.745V16.559c0-0.409,0.335-0.745,0.746-0.745H54.268 M54.268,15.064H5.732  c-0.82,0-1.494,0.675-1.494,1.494v26.883c0,0.821,0.674,1.494,1.494,1.494h48.535c0.82,0,1.493-0.673,1.493-1.494V16.559  C55.761,15.739,55.088,15.064,54.268,15.064L54.268,15.064z" fill="url(#SVGID_4_)"/>
-<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226  c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<rect fill="none" height="60" width="60"/>
-</g>
-<g transform="matrix(1 0 0 1 30 30)">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="17.44" x2="17.44" y1="11.62" y2="23.26">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="0.7273" stop-color="#66A00E"/>
-<stop offset="1" stop-color="#387300"/>
-</linearGradient>
-<path d="M9,21l8.392-4.184v2.635l0.379-0.072c3.278-0.629,5.699-2.189,6.479-4.178,0.428-1.096,0.368-2.309-0.166-3.576,0.945,1.015,1.97,2.541,1.76,4.252-0.307,2.496-3.08,4.732-8.244,6.648l-0.21,0.07v2.58l-8.39-4.18z" fill="url(#SVGID_1__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.02" x2="15.02" y1="25.71" y2="21.02">
-<stop offset="0" stop-color="#C6FF45"/>
-<stop offset="1" stop-color="#66A00E"/>
-</linearGradient>
-<path d="M8.396,21.05l9.315,4.646v-2.875c1.562-0.58,2.855-1.173,3.926-1.771h-13.24z" fill="url(#SVGID_2__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="12.56" x2="12.56" y1="18.16" y2="4.52">
-<stop offset="0" stop-color="#45E8FF"/>
-<stop offset="0.5" stop-color="#30A4D5"/>
-<stop offset="1" stop-color="#1347BA"/>
-</linearGradient>
-<path d="M5.916,17.78c-0.945-1.015-1.97-2.541-1.76-4.251,0.307-2.496,3.08-4.734,8.243-6.65l0.208-0.076v-2.581l8.391,4.185-8.391,4.183v-2.635l-0.379,0.072c-3.278,0.629-5.7,2.191-6.478,4.178-0.431,1.09-0.371,2.31,0.164,3.57z" fill="url(#SVGID_3__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.98" x2="14.98" y1="4.235" y2="7.602">
-<stop offset="0" stop-color="#45E8FF"/>
-<stop offset="1" stop-color="#30A4D5"/>
-</linearGradient>
-<path d="M21.6,8.352l-9.315-4.645v2.875c-1.561,0.579-2.855,1.172-3.925,1.77h13.25z" fill="url(#SVGID_4__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="12.76" x2="12.76" y1="4.036" y2="13.82">
-<stop offset="0" stop-color="#93E1FF"/>
-<stop offset="0.0061" stop-color="#93E1FF"/>
-<stop offset="1" stop-color="#1185BF"/>
-</linearGradient>
-<path d="M12.61,4.223l8.391,4.185-8.391,4.183v-2.633l-0.379,0.072c-3.278,0.629-5.699,2.191-6.478,4.178-0.429,1.098-0.369,2.313,0.167,3.581-0.946-1.013-1.971-2.538-1.762-4.253,0.305-2.497,3.079-4.735,8.243-6.652l0.208-0.076v-2.589m-0.32-0.516v2.875c-15.41,5.718-5.108,12.75-5.108,12.75-3.553-4.822,0.214-8.051,5.106-8.988v2.766l9.427-4.7-9.43-4.703z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="17.24" x2="17.24" y1="14.93" y2="25.69">
-<stop offset="0" stop-color="#C5FE45"/>
-<stop offset="1" stop-color="#4B8B00"/>
-</linearGradient>
-<path d="M22.82,10.07c3.553,4.821-0.214,8.05-5.106,8.987v-2.765l-9.426,4.7,9.426,4.701v-2.875c15.41-5.72,5.11-12.75,5.11-12.75zm-5.22,12.45l-0.21,0.08v2.58l-8.39-4.18,8.392-4.184v2.635l0.379-0.072c3.278-0.629,5.7-2.189,6.479-4.178,0.428-1.096,0.368-2.309-0.166-3.576,0.945,1.015,1.971,2.541,1.76,4.252-0.3,2.49-3.08,4.72-8.24,6.64z" fill="url(#SVGID_6_)"/>
-<rect fill="none" height="30" width="30"/>
-</g>
-</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_meeting.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_meeting.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_meeting.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,46 +3,46 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="23.5464" x2="23.5464" y1="13.1836" y2="47.804">
-<stop offset="0" style="stop-color:#E8B888"/>
-<stop offset="1" style="stop-color:#8D5837"/>
+<stop offset="0" style="stop-color:#CBBCA5"/>
+<stop offset="1" style="stop-color:#735851"/>
 </linearGradient>
 <path d="M1,30.709l6.997-17.846l7.236,3.014c0,0,7.392-2.457,9.202-2.545c0.512-0.024,0.941,0.068,1.294,0.16  c1.076,0.275,9.452,5.293,13.415,9.238c3.965,3.946,6.643,10.371,6.842,11.024c0.279,0.906,0.271,4.289-3.42,4.344  c0.434,1.955-1.031,4.778-3.91,4.67c0.598,2.063-1.629,5.321-4.563,4.453c0.297,0.914-0.426,2.207-1.1,2.644  c-1.131,0.732-1.598,0.732-2.596,0.399c-2.929-0.978-9.198-3.904-12.384-6.222c-3.494-2.54-6.045-4.525-7.53-7.096  c-0.768-1.33-2.823-3.258-3.765-3.909C5.59,32.255,1,30.709,1,30.709z" fill="url(#SVGID_1_)"/>
 <radialGradient cx="1006.4844" cy="-265.7949" gradientTransform="matrix(0.7982 0 0 0.7982 -783.5864 230.4873)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="42.1015">
-<stop offset="0" style="stop-color:#F8E0C8"/>
-<stop offset="0.0909" style="stop-color:#F8E0C8"/>
-<stop offset="0.4182" style="stop-color:#F0C8A0"/>
-<stop offset="0.6364" style="stop-color:#E8B888"/>
-<stop offset="1" style="stop-color:#BE7749"/>
+<stop offset="0" style="stop-color:#EAE4D6"/>
+<stop offset="0.0909" style="stop-color:#EAE4D6"/>
+<stop offset="0.4182" style="stop-color:#D8CDB8"/>
+<stop offset="0.6364" style="stop-color:#CBBCA5"/>
+<stop offset="1" style="stop-color:#9B7F6C"/>
 </radialGradient>
 <path d="M31.424,49.681c-0.18,0-0.402-0.051-0.771-0.173c-2.771-0.926-9.038-3.834-12.168-6.11  c-3.385-2.461-5.89-4.393-7.309-6.849c-0.882-1.528-3.074-3.525-4.002-4.168c-0.926-0.641-3.716-1.66-5.128-2.154l6.397-16.313  l6.759,2.815l0.283-0.094c2.027-0.674,7.594-2.438,8.988-2.505l0.13-0.003c0.344,0,0.647,0.065,0.926,0.138  c0.985,0.272,9.18,5.176,13.053,9.031c3.814,3.798,6.428,9.995,6.643,10.693c0.102,0.331,0.188,1.507-0.434,2.36  c-0.447,0.615-1.201,0.936-2.236,0.951l-0.98,0.015l0.213,0.956c0.186,0.834-0.084,1.857-0.688,2.609  c-0.4,0.499-1.121,1.093-2.283,1.093l-1.234-0.045l0.307,1.062c0.197,0.677-0.045,1.604-0.615,2.363  c-0.58,0.771-1.385,1.214-2.211,1.214c-0.242,0-0.492-0.037-0.74-0.111l-1.453-0.43l0.467,1.44c0.158,0.49-0.32,1.434-0.775,1.729  C31.938,49.598,31.656,49.681,31.424,49.681L31.424,49.681z" fill="url(#SVGID_2_)"/>
 <path d="M6.375,31.583c-0.744-0.516-2.684-1.271-4.152-1.807l-0.177,0.45  c1.412,0.494,4.202,1.514,5.128,2.154c0.389,0.27,1.001,0.782,1.645,1.393C7.916,32.822,6.925,31.964,6.375,31.583z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
 <path d="M45.225,33.989c-0.215-0.698-2.828-6.896-6.643-10.693c-0.127-0.125-0.27-0.255-0.404-0.383  c3.598,3.817,6.041,9.604,6.248,10.278c0.102,0.331,0.189,1.507-0.432,2.36c-0.449,0.615-1.201,0.935-2.238,0.95l-0.98,0.016  l0.213,0.956c0.186,0.833-0.084,1.857-0.688,2.609c-0.4,0.498-1.119,1.093-2.283,1.093l-1.232-0.045l0.307,1.062  c0.195,0.677-0.047,1.604-0.617,2.362c-0.578,0.771-1.385,1.215-2.211,1.215c-0.242,0-0.492-0.037-0.74-0.111l-1.451-0.43  l0.465,1.44c0.158,0.489-0.32,1.434-0.775,1.728c-0.623,0.403-0.904,0.486-1.137,0.486c-0.18,0-0.403-0.051-0.771-0.174  c-2.771-0.925-9.037-3.833-12.167-6.109c-1.894-1.377-3.5-2.588-4.806-3.818c1.422,1.515,3.304,2.944,5.604,4.616  c3.13,2.276,9.396,5.185,12.168,6.11c0.369,0.122,0.592,0.173,0.771,0.173c0.232,0,0.514-0.083,1.137-0.485  c0.455-0.295,0.934-1.238,0.775-1.729l-0.467-1.44l1.453,0.43c0.248,0.074,0.498,0.111,0.74,0.111c0.826,0,1.631-0.442,2.211-1.214  c0.57-0.759,0.813-1.687,0.615-2.363l-0.307-1.062l1.234,0.045c1.162,0,1.883-0.594,2.283-1.093  c0.604-0.752,0.873-1.775,0.688-2.609l-0.213-0.956l0.98-0.015c1.035-0.016,1.789-0.336,2.236-0.951  C45.412,35.496,45.326,34.32,45.225,33.989z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
 <path d="M45.986,33.755c-0.199-0.653-2.877-7.078-6.842-11.024c-3.963-3.945-12.339-8.963-13.415-9.238  c-0.353-0.092-0.782-0.185-1.294-0.16c-0.219,0.01-0.521,0.057-0.878,0.128c-0.379,0.268-0.681,0.506-0.853,0.688l-0.221,0.234  c-0.548,0.579-0.943,0.997-1.234,1.684c-0.734,1.733-0.737,3.109-0.741,4.565c-0.002,1.01-0.005,2.053-0.25,3.343l-0.074,0.386  c-0.488,2.497-0.874,5.024,0.204,6.103c0.537,0.537,1.349,0.833,2.285,0.833c0.669,0,1.31-0.153,1.801-0.43  c0.87-0.488,2.979-1.837,3.788-3.815c0.616-1.509,0.699-2.717,0.766-3.688c0.049-0.721,0.089-1.291,0.335-1.741  c0.157-0.287,0.257-0.345,0.827-0.646c0.156-0.083,0.333-0.176,0.538-0.29c0.57-0.318,1.422-0.882,1.67-1.048  c0.113-0.044,0.162-0.049,0.178-0.049c0.102,0,0.457,0.214,0.77,0.403c0.057,0.034,0.158,0.088,0.305,0.161  c0.906,0.461,3.668,1.861,6.061,4.917c4.135,5.275,4.887,7.494,5.248,8.56c0.135,0.394,0.148,0.75,0.162,1.298  c0.018,0.685-0.426,1.299-0.762,1.701l-0.34,0.438l0.215,0.459c0.021,0.047,0.068,0.114,0.127,0.183  C46.244,36.786,46.209,34.479,45.986,33.755z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.8706" x2="45.9676" y1="11.2334" y2="36.3762">
-<stop offset="0" style="stop-color:#E8B888"/>
-<stop offset="1" style="stop-color:#8D5837"/>
+<stop offset="0" style="stop-color:#CBBCA5"/>
+<stop offset="1" style="stop-color:#735851"/>
 </linearGradient>
 <path d="M59,27.916l-8.115-16.495l-7.504,3.165c0,0-7.693-4.752-9.484-5.024  c-0.508-0.076-0.945-0.026-1.305,0.028c-1.098,0.164-8.218,3.945-9.304,5.104c-0.66,0.704-1.037,1.056-1.303,1.685  c-1.16,2.737-0.326,4.507-0.942,7.746c-0.278,1.47-1.034,4.831-0.09,5.774c0.76,0.761,2.31,0.734,3.131,0.271  c0.579-0.325,2.698-1.605,3.439-3.421c1.05-2.57,0.419-4.194,1.141-5.512c0.347-0.632,0.697-0.704,1.675-1.249  c0.64-0.356,1.683-1.059,1.683-1.059c0.643-0.272,0.869-0.146,1.738,0.38c0.389,0.235,3.746,1.652,6.58,5.268  c4.199,5.357,4.996,7.675,5.375,8.797c0.178,0.521,0.191,0.993,0.205,1.534c0.023,0.988-0.584,1.796-0.947,2.23  c-0.098,0.119,0.234,0.078,0.336,0.064c1.34-0.19,3.068-2.092,3.395-2.58c0.324-0.488,2.117-2.229,2.66-2.715  C52.395,30.984,59,27.916,59,27.916z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="39.6035" x2="39.6035" y1="11.3853" y2="33.4196">
-<stop offset="0" style="stop-color:#F8E0C8"/>
-<stop offset="0.1455" style="stop-color:#F8E0C8"/>
-<stop offset="0.3576" style="stop-color:#F0C8A0"/>
-<stop offset="0.5697" style="stop-color:#E8B888"/>
-<stop offset="1" style="stop-color:#BE7749"/>
+<stop offset="0" style="stop-color:#EAE4D6"/>
+<stop offset="0.1455" style="stop-color:#EAE4D6"/>
+<stop offset="0.3576" style="stop-color:#D8CDB8"/>
+<stop offset="0.5697" style="stop-color:#CBBCA5"/>
+<stop offset="1" style="stop-color:#9B7F6C"/>
 </linearGradient>
 <path d="M46.656,35.595c0.043-0.224,0.066-0.46,0.061-0.706c-0.014-0.554-0.027-1.127-0.244-1.77  c-0.391-1.15-1.201-3.545-5.504-9.034c-2.613-3.333-5.611-4.854-6.598-5.354c-0.094-0.048-0.16-0.082-0.199-0.104  c-0.631-0.382-1.049-0.634-1.596-0.634c-0.268,0-0.535,0.063-0.865,0.202l-0.07,0.029l-0.064,0.043  c-0.01,0.007-1.024,0.688-1.627,1.025c-0.191,0.106-0.358,0.194-0.505,0.272c-0.632,0.334-1.089,0.574-1.48,1.289  c-0.416,0.76-0.47,1.557-0.528,2.401c-0.062,0.901-0.132,1.922-0.65,3.192c-0.506,1.235-1.929,2.373-3.091,3.026  c-0.248,0.14-0.638,0.226-1.021,0.226c-0.495,0-0.928-0.137-1.156-0.365c-0.377-0.376-0.298-1.946,0.233-4.668l0.076-0.394  c0.273-1.436,0.275-2.604,0.278-3.637c0.003-1.347,0.006-2.51,0.614-3.947c0.179-0.421,0.428-0.684,0.924-1.209l0.227-0.24  c0.938-1.001,7.839-4.691,8.843-4.859c0.197-0.03,0.414-0.059,0.652-0.059c0.129,0,0.268,0.009,0.412,0.03  c1.186,0.18,6.264,3.109,9.184,4.914l0.35,0.217l7.191-3.033l7.422,15.089c-1.912,0.902-6.18,2.959-7.094,3.775  c-0.432,0.387-2.379,2.246-2.791,2.867C47.857,34.452,47.287,35.074,46.656,35.595L46.656,35.595z" fill="url(#SVGID_4_)"/>
 <path d="M26.854,43.412c0.38-0.857,0.549-2.018-1.039-3.516c-1.023-0.965-1.958-1.436-2.854-1.436  c-0.119,0-0.234,0.009-0.344,0.024c0.087-0.882-0.194-1.889-1.489-2.972c-0.917-0.768-1.969-1.189-2.962-1.189  c-0.208,0-0.411,0.019-0.606,0.056c-0.023-1.094-0.664-2.025-1.983-3.006c-0.747-0.556-1.516-0.837-2.283-0.837  c-0.83,0-1.648,0.329-2.433,0.979l-0.127,0.104c-0.866,0.717-2.014,1.67-2.574,2.625c0.89,0.835,1.853,1.881,2.325,2.701  c1.485,2.57,4.036,4.556,7.53,7.096c2.586,1.881,7.201,4.162,10.414,5.478c1.007-1.348,1.659-3.19,0.548-4.461  C28.188,44.157,27.498,43.62,26.854,43.412z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="10.3682" x2="27.0654" y1="32.7324" y2="49.4296">
-<stop offset="0" style="stop-color:#E8B888"/>
-<stop offset="1" style="stop-color:#8D5837"/>
+<stop offset="0" style="stop-color:#CBBCA5"/>
+<stop offset="1" style="stop-color:#735851"/>
 </linearGradient>
 <path d="M8.715,34.899c0.399-0.931,1.771-2.036,2.655-2.769c1.198-0.993,2.428-1.084,3.73-0.116  c1.846,1.372,2.013,2.401,1.197,4.066c1.015-1.415,2.894-1.147,4.318,0.045c1.843,1.542,1.169,2.698,0.684,3.902  c0.734-0.506,1.74-1.65,3.968,0.449c2.019,1.905,0.559,2.737,0.199,3.994c0.559-0.559,1.358-0.659,2.909,1.113  c0.96,1.098-0.105,2.851-0.661,3.565c-0.476,0.612-1.67,1.419-2.908,0.85c-2.462-1.132-6.817-3.681-11.059-7.068  C7.627,38.04,8.159,36.197,8.715,34.899z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="21.4702" x2="16.5483" y1="37.8623" y2="44.0481">
-<stop offset="0" style="stop-color:#F8E0C8"/>
-<stop offset="0.1091" style="stop-color:#F8E0C8"/>
-<stop offset="0.3212" style="stop-color:#F0C8A0"/>
-<stop offset="0.5273" style="stop-color:#E8B888"/>
-<stop offset="1" style="stop-color:#BE7749"/>
+<stop offset="0" style="stop-color:#EAE4D6"/>
+<stop offset="0.1091" style="stop-color:#EAE4D6"/>
+<stop offset="0.3212" style="stop-color:#D8CDB8"/>
+<stop offset="0.5273" style="stop-color:#CBBCA5"/>
+<stop offset="1" style="stop-color:#9B7F6C"/>
 </linearGradient>
 <path d="M25.68,49.396c-0.186,0-0.362-0.039-0.539-0.12c-2.361-1.087-6.632-3.563-10.895-6.967  c-5.838-4.666-5.187-6.186-4.798-7.095c0.305-0.71,1.556-1.744,2.303-2.362l0.128-0.107c0.497-0.41,0.959-0.61,1.414-0.61  c0.423,0,1.226,0.357,1.683,0.729c1.072,0.873,1.247,1.347,1.297,1.796c0.05,0.448-0.299,1.596-0.398,2.045  c0.474-0.324,1.78-0.784,2.292-0.784c0.61,0,1.316,0.299,1.938,0.818c1.259,1.054,1.182,1.163,1.057,2.161  c0,0-0.448,1.321-0.573,1.796c1.197-0.1,1.646-0.873,2.373-0.638c0.434,0.14,1.064,0.346,1.759,1.001  c1.071,1.011,1.071,1.202,0.807,2.056c-0.225,0.724-0.848,2.096-0.848,2.096s1.247-0.449,1.546-0.424  c0.309,0.025,0.55,0.181,1.551,1.324c0.54,0.618-0.216,1.938-0.69,2.551C26.855,48.957,26.291,49.396,25.68,49.396L25.68,49.396z" fill="url(#SVGID_6_)"/>
 <path d="M26.274,45.385c0.324,0.149,0.5,0.38,1.501,1.523c0.055,0.063,0.087,0.137,0.116,0.211  c0.104-0.389,0.104-0.758-0.116-1.009c-1.001-1.144-1.242-1.299-1.551-1.324c-0.188-0.016-0.747,0.154-1.139,0.284  C25.526,45.234,26.002,45.259,26.274,45.385z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
@@ -50,34 +50,34 @@
 <path d="M9.448,36.012c0.305-0.71,1.556-1.744,2.303-2.362l0.128-0.106  c0.497-0.411,0.959-0.611,1.414-0.611c0.423,0,1.226,0.357,1.683,0.729c0.881,0.717,1.153,1.163,1.251,1.549  c0.038-0.22,0.061-0.418,0.046-0.551c-0.05-0.449-0.225-0.923-1.297-1.796c-0.457-0.372-1.26-0.729-1.683-0.729  c-0.455,0-0.917,0.2-1.414,0.61l-0.128,0.107c-0.747,0.618-1.998,1.652-2.303,2.362c-0.143,0.334-0.317,0.751-0.197,1.375  C9.298,36.366,9.378,36.178,9.448,36.012z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <path d="M18.166,36.719c0.61,0,1.316,0.298,1.938,0.817c0.704,0.589,0.983,0.885,1.077,1.204  c0.107-0.846,0.107-1.011-1.077-2.002c-0.622-0.52-1.328-0.818-1.938-0.818c-0.442,0-1.479,0.345-2.059,0.647  C16.771,36.555,17.654,36.719,18.166,36.719z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="13.9106" x2="16.3579" y1="38.6328" y2="36.1855">
-<stop offset="0" style="stop-color:#C78456"/>
-<stop offset="1" style="stop-color:#CE9C70"/>
+<stop offset="0" style="stop-color:#A58C78"/>
+<stop offset="1" style="stop-color:#B2A08C"/>
 </linearGradient>
 <path d="M16.04,36.188c0,0-1.247,1.945-2.146,2.594c0,0,1.796-1.396,2.495-2.494L16.04,36.188z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="18.6655" x2="21.0459" y1="42.6221" y2="40.2417">
-<stop offset="0" style="stop-color:#C78456"/>
-<stop offset="1" style="stop-color:#B6845C"/>
+<stop offset="0" style="stop-color:#A58C78"/>
+<stop offset="1" style="stop-color:#9B8877"/>
 </linearGradient>
 <path d="M20.729,40.246c0,0-1.247,1.945-2.146,2.594c0,0,1.796-1.396,2.494-2.494L20.729,40.246z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="22.8228" x2="25.2036" y1="47.1455" y2="44.7647">
-<stop offset="0" style="stop-color:#C78456"/>
-<stop offset="1" style="stop-color:#A8744F"/>
+<stop offset="0" style="stop-color:#A58C78"/>
+<stop offset="1" style="stop-color:#8D786A"/>
 </linearGradient>
 <path d="M24.853,44.802c0,0-1.247,1.946-2.145,2.595c0,0,1.796-1.397,2.494-2.494L24.853,44.802z" fill="url(#SVGID_9_)"/>
 <path d="M22.899,17.684c0,0,0.799-2.322,2.378-2.139c1.578,0.184-0.22,2.297-0.767,2.945  C23.965,19.139,22.056,19.74,22.899,17.684z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="31.6387" x2="31.6387" y1="42.3877" y2="46.5357">
-<stop offset="0" style="stop-color:#C78456"/>
-<stop offset="1" style="stop-color:#8F5B39"/>
+<stop offset="0" style="stop-color:#A58C78"/>
+<stop offset="1" style="stop-color:#755B53"/>
 </linearGradient>
 <path d="M33.209,46.856l0.367-0.499c0,0-3.244-3.044-3.876-4.008L33.209,46.856z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="39.9697" x2="39.9697" y1="33.8926" y2="37.6532">
-<stop offset="0" style="stop-color:#C78456"/>
-<stop offset="1" style="stop-color:#A8744F"/>
+<stop offset="0" style="stop-color:#A58C78"/>
+<stop offset="1" style="stop-color:#8D786A"/>
 </linearGradient>
 <path d="M41.689,37.943l0.367-0.499c0,0-2.91-2.401-4.174-3.587L41.689,37.943z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="36.0439" x2="36.0439" y1="38.4482" y2="42.2097">
-<stop offset="0" style="stop-color:#C78456"/>
-<stop offset="1" style="stop-color:#9B6744"/>
+<stop offset="0" style="stop-color:#A58C78"/>
+<stop offset="1" style="stop-color:#81695E"/>
 </linearGradient>
 <path d="M37.766,42.5l0.365-0.499c0,0-2.908-2.402-4.174-3.588L37.766,42.5z" fill="url(#SVGID_12_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="9.8965" y2="49.8018">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="0.5091" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#F6A800"/>
+<stop offset="0" style="stop-color:#E4E0C1"/>
+<stop offset="0.5091" style="stop-color:#B39C4D"/>
+<stop offset="1" style="stop-color:#AC8A4A"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="58,50.4 2,50.4 2,9.6 30.463,10.4 58,9.6 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="9.7017" y2="50.6398">
-<stop offset="0" style="stop-color:#F7AC00"/>
-<stop offset="0.3394" style="stop-color:#FFF8DB"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+<stop offset="0" style="stop-color:#AD8C4A"/>
+<stop offset="0.3394" style="stop-color:#F4F3E6"/>
+<stop offset="1" style="stop-color:#D1C794"/>
 </linearGradient>
 <path d="M57.385,10.22v39.56H2.613V10.22H57.385 M58,9.6L29.802,9.936L2,9.6v40.8h56V9.6L58,9.6z" fill="url(#SVGID_2_)"/>
-<polygon fill="#FBAB13" fill-opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 " stroke-opacity="0.3"/>
-<polygon fill="#F18800" fill-opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 " stroke-opacity="0.3"/>
+<polygon fill="#B59659" fill-opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 " stroke-opacity="0.3"/>
+<polygon fill="#A97B48" fill-opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 " stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(-1 0 0 -1 -1801.0049 1240.3164)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1831.0049" x2="-1831.0049" y1="1214.7607" y2="1190.0703">
-<stop offset="0" style="stop-color:#F98A00"/>
-<stop offset="0.7273" style="stop-color:#FCBC3C"/>
-<stop offset="1" style="stop-color:#FFE36A"/>
+<stop offset="0" style="stop-color:#AE804B"/>
+<stop offset="0.7273" style="stop-color:#C2AC76"/>
+<stop offset="1" style="stop-color:#D2C997"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="58,50.38 29.998,25.689 2,50.38 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="25.4995" y2="51.0736">
-<stop offset="0" style="stop-color:#FFF1B5"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+<stop offset="0" style="stop-color:#E9E5CB"/>
+<stop offset="1" style="stop-color:#D1C794"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4_)" points="58,50.38 29.998,25.689 2,50.38 29.998,26.563 "/>
-<polygon fill="#F18800" fill-opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 " stroke-opacity="0.3"/>
-<polygon fill="#C26D00" fill-opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 " stroke-opacity="0.4"/>
-<polygon fill="#AB6100" fill-opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 " stroke-opacity="0.4"/>
+<polygon fill="#A97B48" fill-opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 " stroke-opacity="0.3"/>
+<polygon fill="#88573A" fill-opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 " stroke-opacity="0.4"/>
+<polygon fill="#784833" fill-opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 " stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="32.9619" y2="8.0088">
-<stop offset="0" style="stop-color:#FFDA33"/>
-<stop offset="0.25" style="stop-color:#FFE692"/>
-<stop offset="1" style="stop-color:#FFFBF8"/>
+<stop offset="0" style="stop-color:#C2B470"/>
+<stop offset="0.25" style="stop-color:#DED7B3"/>
+<stop offset="1" style="stop-color:#FDFCFA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5_)" points="2,9.6 29.998,34.29 58,9.6 "/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_group.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_group.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_group.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="9.8965" y2="49.8018">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="0.5091" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#F6A800"/>
+<stop offset="0" style="stop-color:#E4E0C1"/>
+<stop offset="0.5091" style="stop-color:#B39C4D"/>
+<stop offset="1" style="stop-color:#AC8A4A"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="58,50.4 2,50.4 2,9.6 30.463,10.4 58,9.6 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="9.7017" y2="50.6398">
-<stop offset="0" style="stop-color:#F7AC00"/>
-<stop offset="0.3394" style="stop-color:#FFF8DB"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+<stop offset="0" style="stop-color:#AD8C4A"/>
+<stop offset="0.3394" style="stop-color:#F4F3E6"/>
+<stop offset="1" style="stop-color:#D1C794"/>
 </linearGradient>
 <path d="M57.385,10.22v39.56H2.613V10.22H57.385 M58,9.6L29.802,9.936L2,9.6v40.8h56V9.6L58,9.6z" fill="url(#SVGID_2_)"/>
-<polygon fill="#FBAB13" fill-opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 " stroke-opacity="0.3"/>
-<polygon fill="#F18800" fill-opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 " stroke-opacity="0.3"/>
+<polygon fill="#B59659" fill-opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 " stroke-opacity="0.3"/>
+<polygon fill="#A97B48" fill-opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 " stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(-1 0 0 -1 -1801.0049 1240.3164)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1831.0049" x2="-1831.0049" y1="1214.7607" y2="1190.0703">
-<stop offset="0" style="stop-color:#F98A00"/>
-<stop offset="0.7273" style="stop-color:#FCBC3C"/>
-<stop offset="1" style="stop-color:#FFE36A"/>
+<stop offset="0" style="stop-color:#AE804B"/>
+<stop offset="0.7273" style="stop-color:#C2AC76"/>
+<stop offset="1" style="stop-color:#D2C997"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="58,50.38 29.998,25.689 2,50.38 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="25.4995" y2="51.0736">
-<stop offset="0" style="stop-color:#FFF1B5"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+<stop offset="0" style="stop-color:#E9E5CB"/>
+<stop offset="1" style="stop-color:#D1C794"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4_)" points="58,50.38 29.998,25.689 2,50.38 29.998,26.563 "/>
-<polygon fill="#F18800" fill-opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 " stroke-opacity="0.3"/>
-<polygon fill="#C26D00" fill-opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 " stroke-opacity="0.4"/>
-<polygon fill="#AB6100" fill-opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 " stroke-opacity="0.4"/>
+<polygon fill="#A97B48" fill-opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 " stroke-opacity="0.3"/>
+<polygon fill="#88573A" fill-opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 " stroke-opacity="0.4"/>
+<polygon fill="#784833" fill-opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 " stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="32.9619" y2="8.0088">
-<stop offset="0" style="stop-color:#FFDA33"/>
-<stop offset="0.25" style="stop-color:#FFE692"/>
-<stop offset="1" style="stop-color:#FFFBF8"/>
+<stop offset="0" style="stop-color:#C2B470"/>
+<stop offset="0.25" style="stop-color:#DED7B3"/>
+<stop offset="1" style="stop-color:#FDFCFA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5_)" points="2,9.6 29.998,34.29 58,9.6 "/>
 <rect fill="none" height="60" width="60"/>
@@ -42,179 +42,179 @@
 <g transform="matrix(1 0 0 1 30 30)">
 <rect fill="none" height="30" width="30"/>
 <radialGradient cx="669.4" cy="-594.3" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="11.1">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.2" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<stop offset="0" stop-color="#DDC4B0"/>
+<stop offset="0.2" stop-color="#DDC4B0"/>
+<stop offset="0.96" stop-color="#A57665"/>
+<stop offset="1" stop-color="#A57665"/>
 </radialGradient>
 <path d="M23.46,18.68c-0.521-0.226-0.506-1.339-0.291-1.675,0.038-0.059,0.072-0.117,0.107-0.176h-4.365c0.035,0.059,0.069,0.116,0.107,0.176,0.215,0.336,0.23,1.448-0.291,1.675-0.522,0.228,2.428,2.202,2.428,2.202s2.81-1.98,2.29-2.2z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="669.2" x2="669.2" y1="-588.9" y2="-598.1">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="0.39" stop-color="#2D9BD2"/>
-<stop offset="0.89" stop-color="#1347BA"/>
-<stop offset="1" stop-color="#1347BA"/>
+<stop offset="0" stop-color="#70B4B6"/>
+<stop offset="0.39" stop-color="#5F8BA1"/>
+<stop offset="0.89" stop-color="#455188"/>
+<stop offset="1" stop-color="#455188"/>
 </linearGradient>
 <path d="M26.59,19.84c-0.549-0.286-3.27-1.238-3.322-1.299l-2.078,1.729-2.233-1.795c-0.063,0.092-2.752,1.035-3.374,1.365-0.713,0.377-1.877,1.246-1.877,3.207h14.76c0-1.97-1.33-2.93-1.88-3.21z" fill="url(#SVGID_2__)"/>
 <polygon fill="#020202" fill-opacity="0.3" points="18.45,18.69,21.19,20.88,23.77,18.74,23.27,18.54,21.19,20.27,18.96,18.47" stroke-opacity="0.3" style="enable-background:new;"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="669.2" x2="669.2" y1="-594.1" y2="-589.1">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#2D9BD2"/>
+<stop offset="0" stop-color="#70B4B6"/>
+<stop offset="1" stop-color="#5F8BA1"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3__)" points="21.19,20.88,18.45,18.69,18.29,18.76,21.19,21.07,23.93,18.8,23.77,18.74"/>
 <radialGradient cx="669.9" cy="-573.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="14.9">
-<stop offset="0" stop-color="#FFE2D9"/>
-<stop offset="0.51" stop-color="#FFC6B3"/>
-<stop offset="0.76" stop-color="#FFA98E"/>
-<stop offset="1" stop-color="#E88160"/>
+<stop offset="0" stop-color="#F4EDE4"/>
+<stop offset="0.51" stop-color="#E8D9CA"/>
+<stop offset="0.76" stop-color="#DDC4B0"/>
+<stop offset="1" stop-color="#BF9C89"/>
 </radialGradient>
 <path d="M24.71,13.56c-0.019-0.008-0.04-0.009-0.06-0.015v-0.001c-0.004-0.001-0.006-0.002-0.006-0.002-0.033-0.008-0.063-0.014-0.094-0.016-3.644-0.635-5.317-2.654-5.442-2.119-0.101,0.425-1.122,1.346-1.657,1.805,0.004,0.021,0.008,0.039,0.012,0.06,0,0,0.02,0.094,0.06,0.254-0.042,0.005-0.084,0.014-0.124,0.03-0.341,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.198,0.445,0.44,0.922,0.739,1.4,0.498,0.594,1.262,1.287,2.105,1.287,1.02,0,1.645-0.559,2.072-1.121,0.012-0.023,0.022-0.047,0.034-0.064,0.317-0.497,0.575-0.996,0.785-1.46,0.333,0.115,0.761-0.194,0.974-0.719,0.23-0.53,0.14-1.09-0.2-1.25z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="666.5" x2="672.8" y1="-589.1" y2="-582.8">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<stop offset="0" stop-color="#E8D9CA"/>
+<stop offset="1" stop-color="#DDC4B0"/>
 </linearGradient>
 <path d="M20.91,17.9c-0.621,0-1.246-0.289-1.707-0.727,0.486,0.514,1.143,1.012,1.857,1.012,1.02,0,1.645-0.559,2.072-1.121,0.011-0.023,0.021-0.047,0.034-0.064,0.317-0.497,0.575-0.996,0.785-1.46-1.15,2.03-2.01,2.36-3.03,2.36z" fill="url(#SVGID_5__)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="669.1" x2="669.1" y1="-569.1" y2="-578.4">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M20.95,8.483c-1.265,0-1.872,0.574-2.341,1.175-0.764,0.117-1.974,0.817-1.119,3.882,0.535-0.459,1.514-1.703,1.614-2.128,0.128-0.54,1.828,1.521,5.542,2.137,0.045-0.172,0.063-0.272,0.063-0.272,0.6-2.62-0.67-4.694-3.75-4.797z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="672.2" x2="663.8" y1="-578" y2="-573">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.36" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M19.11,11.16s1.818,2.389,5.512,2.384c0,0-1.73-0.27-5.51-2.38z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="663.1" x2="663.1" y1="-572" y2="-577.3">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M18.68,9.836s-1.78,0.106-1.12,3.123c0,0-0.22-2.07,1.12-3.124z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="670.2" x2="670" y1="-569.9" y2="-572.3">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<stop offset="0" stop-color="#8D7B6A"/>
+<stop offset="1" stop-color="#451F1E"/>
 </linearGradient>
 <path d="M21.82,10.25c-0.828-0.118-2.23-0.853-2.779-0.59,0,0,1.799-2.053,4.971,0.284,0,0.004-0.76,0.516-2.19,0.306z" fill="url(#SVGID_9_)"/>
 <radialGradient cx="645" cy="-594.3" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="11.1">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.2" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<stop offset="0" stop-color="#DDC4B0"/>
+<stop offset="0.2" stop-color="#DDC4B0"/>
+<stop offset="0.96" stop-color="#A57665"/>
+<stop offset="1" stop-color="#A57665"/>
 </radialGradient>
 <path d="M11.28,18.68c-0.521-0.226-0.505-1.339-0.29-1.675,0.037-0.059,0.072-0.117,0.108-0.176h-4.371c0.035,0.059,0.069,0.116,0.107,0.176,0.215,0.336,0.23,1.448-0.29,1.675-0.523,0.228,2.427,2.202,2.427,2.202s2.827-1.98,2.307-2.2z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="644.8" x2="644.8" y1="-588.9" y2="-598.1">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="0.39" stop-color="#2D9BD2"/>
-<stop offset="0.89" stop-color="#1347BA"/>
-<stop offset="1" stop-color="#1347BA"/>
+<stop offset="0" stop-color="#70B4B6"/>
+<stop offset="0.39" stop-color="#5F8BA1"/>
+<stop offset="0.89" stop-color="#455188"/>
+<stop offset="1" stop-color="#455188"/>
 </linearGradient>
 <path d="M14.42,19.84c-0.549-0.286-3.271-1.238-3.322-1.299l-2.079,1.729-2.233-1.795c-0.063,0.092-2.752,1.035-3.375,1.365-0.712,0.377-1.876,1.246-1.876,3.207h14.76c-0.01-1.97-1.34-2.93-1.88-3.21z" fill="url(#SVGID_11_)"/>
 <polygon fill="#020202" fill-opacity="0.3" points="6.272,18.69,9.015,20.88,11.59,18.74,11.09,18.54,9.015,20.27,6.781,18.47" stroke-opacity="0.3" style="enable-background:new;"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="644.9" x2="644.9" y1="-594.1" y2="-589.1">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="1" stop-color="#2D9BD2"/>
+<stop offset="0" stop-color="#70B4B6"/>
+<stop offset="1" stop-color="#5F8BA1"/>
 </linearGradient>
 <polygon fill="url(#SVGID_12_)" points="9.015,20.88,6.271,18.69,6.113,18.76,9.015,21.07,11.75,18.8,11.59,18.74"/>
 <radialGradient cx="645.6" cy="-573.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="14.9">
-<stop offset="0" stop-color="#FFE2D9"/>
-<stop offset="0.51" stop-color="#FFC6B3"/>
-<stop offset="0.76" stop-color="#FFA98E"/>
-<stop offset="1" stop-color="#E88160"/>
+<stop offset="0" stop-color="#F4EDE4"/>
+<stop offset="0.51" stop-color="#E8D9CA"/>
+<stop offset="0.76" stop-color="#DDC4B0"/>
+<stop offset="1" stop-color="#BF9C89"/>
 </radialGradient>
 <path d="M12.53,13.56c-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-3.645-0.635-5.317-2.654-5.443-2.119-0.102,0.425-1.123,1.346-1.658,1.805,0.004,0.021,0.008,0.039,0.012,0.06,0,0,0.02,0.094,0.06,0.254-0.043,0.005-0.085,0.014-0.124,0.03-0.341,0.145-0.447,0.702-0.239,1.248,0.209,0.545,0.653,0.871,0.995,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.198,0.445,0.44,0.922,0.738,1.4,0.499,0.594,1.263,1.287,2.106,1.287,1.02,0,1.645-0.559,2.073-1.121,0.011-0.023,0.022-0.047,0.034-0.064,0.318-0.497,0.576-0.996,0.785-1.46,0.334,0.115,0.761-0.194,0.973-0.719,0.23-0.53,0.14-1.09-0.2-1.25z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="642.2" x2="648.5" y1="-589.1" y2="-582.8">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<stop offset="0" stop-color="#E8D9CA"/>
+<stop offset="1" stop-color="#DDC4B0"/>
 </linearGradient>
 <path d="M8.729,17.9c-0.621,0-1.247-0.289-1.708-0.727,0.487,0.514,1.144,1.012,1.858,1.012,1.02,0,1.645-0.559,2.073-1.121,0.011-0.023,0.022-0.047,0.034-0.064,0.318-0.497,0.576-0.996,0.785-1.46-1.15,2.03-2.011,2.36-3.031,2.36z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="644.7" x2="644.7" y1="-569.1" y2="-578.4">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M8.776,8.483c-1.265,0-1.872,0.574-2.342,1.175-0.763,0.117-1.973,0.817-1.118,3.882,0.535-0.459,1.514-1.703,1.615-2.128,0.127-0.54,1.828,1.521,5.542,2.137,0.043-0.172,0.063-0.272,0.063-0.272,0.59-2.62-0.68-4.694-3.754-4.797z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="647.9" x2="639.5" y1="-578" y2="-573">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.36" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M6.936,11.16s1.818,2.389,5.513,2.384c0,0-1.74-0.27-5.514-2.38z" fill="url(#SVGID_16_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="638.7" x2="638.8" y1="-572.3" y2="-577.7">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M6.498,9.836s-1.779,0.106-1.119,3.123c0,0-0.218-2.07,1.119-3.124z" fill="url(#SVGID_17_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="645.9" x2="645.6" y1="-569.9" y2="-572.3">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<stop offset="0" stop-color="#8D7B6A"/>
+<stop offset="1" stop-color="#451F1E"/>
 </linearGradient>
 <path d="M9.639,10.25c-0.828-0.118-2.23-0.853-2.78-0.59,0,0,1.8-2.053,4.973,0.284,0,0.004-0.76,0.516-2.191,0.306z" fill="url(#SVGID_18_)"/>
-<path d="M23.32,20.43c-0.506-0.264-2.081-0.849-3.348-1.317l-0.711-0.265-0.128-0.053-0.166-0.063-0.317-0.128-0.196,0.086c-0.001,0.002-0.003,0.002-0.004,0.003h-0.001c-0.826,0.323-2.406,0.897-2.865,1.143-0.178,0.095-0.385,0.222-0.596,0.388-0.221-0.183-0.426-0.311-0.573-0.388-0.395-0.205-1.904-0.753-2.746-1.067l-0.078-0.031-0.002,0.001-0.349-0.142-0.317,0.139c-0.311,0.122-0.693,0.268-1.103,0.424l-0.038,0.014c-1.21,0.461-2.582,0.982-3.107,1.262-1.177,0.625-2.025,1.51-2.525,2.609h21.66c-0.77-1.62-2.12-2.41-2.48-2.6z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M9.052,11.44c-0.561,0.477-0.712,1.432-0.349,2.38,0.342,0.894,1.048,1.494,1.758,1.494h0.002c0.106,0.221,0.217,0.439,0.331,0.654h-0.033l0.271,0.448s0.071,0.115,0.154,0.253c0.226-0.383,0.424-0.765,0.586-1.123,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.583-2.617-0.686-4.69-3.761-4.793-0.006,0-0.01,0.001-0.017,0.001-0.072,0.839,0.021,1.822,0.3,2.962z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.165,0.371,0.364,0.766,0.599,1.163,0.263-0.441,0.512-0.897,0.736-1.369,0.646-0.077,1.279-0.639,1.605-1.444,0.371-0.919,0.253-1.873-0.272-2.37,0.235-1.062,0.272-2.073,0.117-2.993-0.015-0.001-0.028-0.003-0.043-0.003-1.26-0.001-1.87,0.574-2.34,1.174zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M23.19,20.69c-0.49-0.256-2.057-0.836-3.314-1.305l-0.719-0.266-0.123-0.051-0.172-0.065-0.484-0.194c-0.016-0.021-0.027-0.051-0.041-0.073-0.85,0.327-2.31,0.862-2.746,1.097-0.179,0.094-0.386,0.221-0.597,0.387-0.221-0.182-0.426-0.311-0.573-0.387-0.395-0.205-1.904-0.754-2.746-1.068l-0.042-0.018-0.596,0.261c-0.32,0.125-0.719,0.276-1.144,0.438-1.202,0.457-2.565,0.975-3.074,1.244-1.071,0.568-1.857,1.363-2.338,2.35h21.01c-0.76-1.46-1.98-2.18-2.3-2.35z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
-<path d="M8.979,13.71c0.298,0.78,0.894,1.304,1.481,1.304,0.062,0,0.122-0.005,0.181-0.017,0.202,0.433,0.419,0.854,0.651,1.261h-0.009l0.068,0.113c0.155-0.283,0.3-0.563,0.419-0.829,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.564-2.535-0.613-4.556-3.483-4.772-0.08,0.847,0.026,1.864,0.336,3.057-0.57,0.33-0.751,1.24-0.404,2.15z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
-<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.124,0.278,0.269,0.569,0.429,0.864,0.256-0.439,0.497-0.891,0.715-1.357,0.014,0.001,0.025,0.001,0.039,0.001,0.58,0,1.177-0.511,1.483-1.27,0.358-0.884,0.21-1.785-0.325-2.144,0.025-0.106,0.036-0.166,0.036-0.166,0.233-1.043,0.267-2.035,0.11-2.931-1.08,0.083-1.64,0.612-2.08,1.169zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
+<path d="M23.32,20.43c-0.506-0.264-2.081-0.849-3.348-1.317l-0.711-0.265-0.128-0.053-0.166-0.063-0.317-0.128-0.196,0.086c-0.001,0.002-0.003,0.002-0.004,0.003h-0.001c-0.826,0.323-2.406,0.897-2.865,1.143-0.178,0.095-0.385,0.222-0.596,0.388-0.221-0.183-0.426-0.311-0.573-0.388-0.395-0.205-1.904-0.753-2.746-1.067l-0.078-0.031-0.002,0.001-0.349-0.142-0.317,0.139c-0.311,0.122-0.693,0.268-1.103,0.424l-0.038,0.014c-1.21,0.461-2.582,0.982-3.107,1.262-1.177,0.625-2.025,1.51-2.525,2.609h21.66c-0.77-1.62-2.12-2.41-2.48-2.6z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
+<path d="M9.052,11.44c-0.561,0.477-0.712,1.432-0.349,2.38,0.342,0.894,1.048,1.494,1.758,1.494h0.002c0.106,0.221,0.217,0.439,0.331,0.654h-0.033l0.271,0.448s0.071,0.115,0.154,0.253c0.226-0.383,0.424-0.765,0.586-1.123,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.583-2.617-0.686-4.69-3.761-4.793-0.006,0-0.01,0.001-0.017,0.001-0.072,0.839,0.021,1.822,0.3,2.962z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
+<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.165,0.371,0.364,0.766,0.599,1.163,0.263-0.441,0.512-0.897,0.736-1.369,0.646-0.077,1.279-0.639,1.605-1.444,0.371-0.919,0.253-1.873-0.272-2.37,0.235-1.062,0.272-2.073,0.117-2.993-0.015-0.001-0.028-0.003-0.043-0.003-1.26-0.001-1.87,0.574-2.34,1.174zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#222021" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
+<path d="M23.19,20.69c-0.49-0.256-2.057-0.836-3.314-1.305l-0.719-0.266-0.123-0.051-0.172-0.065-0.484-0.194c-0.016-0.021-0.027-0.051-0.041-0.073-0.85,0.327-2.31,0.862-2.746,1.097-0.179,0.094-0.386,0.221-0.597,0.387-0.221-0.182-0.426-0.311-0.573-0.387-0.395-0.205-1.904-0.754-2.746-1.068l-0.042-0.018-0.596,0.261c-0.32,0.125-0.719,0.276-1.144,0.438-1.202,0.457-2.565,0.975-3.074,1.244-1.071,0.568-1.857,1.363-2.338,2.35h21.01c-0.76-1.46-1.98-2.18-2.3-2.35z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
+<path d="M8.979,13.71c0.298,0.78,0.894,1.304,1.481,1.304,0.062,0,0.122-0.005,0.181-0.017,0.202,0.433,0.419,0.854,0.651,1.261h-0.009l0.068,0.113c0.155-0.283,0.3-0.563,0.419-0.829,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.564-2.535-0.613-4.556-3.483-4.772-0.08,0.847,0.026,1.864,0.336,3.057-0.57,0.33-0.751,1.24-0.404,2.15z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
+<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.124,0.278,0.269,0.569,0.429,0.864,0.256-0.439,0.497-0.891,0.715-1.357,0.014,0.001,0.025,0.001,0.039,0.001,0.58,0,1.177-0.511,1.483-1.27,0.358-0.884,0.21-1.785-0.325-2.144,0.025-0.106,0.036-0.166,0.036-0.166,0.233-1.043,0.267-2.035,0.11-2.931-1.08,0.083-1.64,0.612-2.08,1.169zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
 <radialGradient cx="657.3" cy="-597.7" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_19_" r="16.23">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.2" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<stop offset="0" stop-color="#DDC4B0"/>
+<stop offset="0.2" stop-color="#DDC4B0"/>
+<stop offset="0.96" stop-color="#A57665"/>
+<stop offset="1" stop-color="#A57665"/>
 </radialGradient>
 <path d="M18.46,19.26c-0.764-0.332-0.738-1.957-0.424-2.448,0.055-0.086,0.104-0.172,0.156-0.258h-6.385c0.053,0.086,0.103,0.172,0.157,0.258,0.315,0.491,0.34,2.116-0.424,2.448-0.764,0.331,3.549,3.219,3.549,3.219s4.11-2.89,3.35-3.22z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="657" x2="657" y1="-589.9" y2="-603.3">
-<stop offset="0" stop-color="#FF7236"/>
-<stop offset="1" stop-color="#BA1212"/>
+<stop offset="0" stop-color="#C39072"/>
+<stop offset="1" stop-color="#88444B"/>
 </linearGradient>
 <path d="M23.05,20.96c-0.803-0.418-4.781-1.811-4.857-1.896l-3.04,2.524-3.266-2.623c-0.09,0.134-4.023,1.512-4.934,1.995-1.042,0.553-2.743,1.822-2.743,4.688h21.59c0-2.87-1.94-4.28-2.74-4.69z" fill="url(#SVGID_20_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="657.1" x2="657.1" y1="-589" y2="-596.9">
-<stop offset="0" stop-color="#BC1C24"/>
-<stop offset="1" stop-color="#6B1C24"/>
+<stop offset="0" stop-color="#8C4C54"/>
+<stop offset="1" stop-color="#53343E"/>
 </linearGradient>
 <polygon fill="url(#SVGID_21_)" points="11.14,19.28,15.15,22.48,18.92,19.35,18.19,19.06,15.15,21.58,11.89,18.96"/>
-<path d="M11.33,19.79s-5.72,1.493-5.72,5.502h-0.823c0-2.46,1.922-4.38,6.543-5.5z" fill="#FF7B56"/>
-<path d="M18.6,19.7s5.72,1.494,5.72,5.502h0.824c0-2.47-1.92-4.38-6.54-5.5z" fill="#FF7B56"/>
+<path d="M11.33,19.79s-5.72,1.493-5.72,5.502h-0.823c0-2.46,1.922-4.38,6.543-5.5z" fill="#CCA089"/>
+<path d="M18.6,19.7s5.72,1.494,5.72,5.502h0.824c0-2.47-1.92-4.38-6.54-5.5z" fill="#CCA089"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="657.1" x2="657.1" y1="-597.5" y2="-590.2">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<stop offset="0" stop-color="#DDC4B0"/>
+<stop offset="0.96" stop-color="#A57665"/>
+<stop offset="1" stop-color="#A57665"/>
 </linearGradient>
 <polygon fill="url(#SVGID_22_)" points="15.15,22.48,11.14,19.28,10.91,19.39,15.15,22.77,19.15,19.44,18.92,19.35"/>
 <radialGradient cx="658.1" cy="-567.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_23_" r="21.78">
-<stop offset="0" stop-color="#FFE2D9"/>
-<stop offset="0.51" stop-color="#FFC6B3"/>
-<stop offset="0.76" stop-color="#FFA98E"/>
-<stop offset="1" stop-color="#E88160"/>
+<stop offset="0" stop-color="#F4EDE4"/>
+<stop offset="0.51" stop-color="#E8D9CA"/>
+<stop offset="0.76" stop-color="#DDC4B0"/>
+<stop offset="1" stop-color="#BF9C89"/>
 </radialGradient>
 <path d="M20.29,11.79c-0.026-0.013-0.058-0.015-0.086-0.022v-0.002c-0.005-0.001-0.01-0.002-0.017-0.003-0.041-0.011-0.084-0.021-0.127-0.022-5.331-0.928-7.775-3.88-7.959-3.099-0.147,0.622-1.641,1.968-2.424,2.639,0.007,0.03,0.01,0.057,0.018,0.087,0,0,0.027,0.138,0.086,0.372-0.062,0.007-0.123,0.02-0.182,0.045-0.498,0.21-0.654,1.026-0.349,1.823,0.305,0.798,0.956,1.274,1.454,1.065,0.03-0.014,0.057-0.035,0.085-0.054,0.289,0.65,0.645,1.348,1.079,2.047,0.729,0.866,1.846,1.883,3.079,1.883,1.49,0,2.404-0.815,3.031-1.64,0.017-0.033,0.031-0.066,0.053-0.095,0.465-0.728,0.842-1.455,1.145-2.134,0.488,0.168,1.113-0.284,1.424-1.051,0.35-0.81,0.21-1.63-0.29-1.85z" fill="url(#SVGID_23_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="653.2" x2="662.4" y1="-590.1" y2="-580.9">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<stop offset="0" stop-color="#E8D9CA"/>
+<stop offset="1" stop-color="#DDC4B0"/>
 </linearGradient>
 <path d="M14.73,18.13c-0.908,0-1.822-0.423-2.496-1.06,0.713,0.748,1.672,1.478,2.716,1.478,1.491,0,2.403-0.815,3.032-1.64,0.016-0.033,0.031-0.066,0.051-0.095,0.465-0.728,0.842-1.455,1.146-2.134-1.7,2.95-2.96,3.44-4.45,3.44z" fill="url(#SVGID_24_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="656.8" x2="656.8" y1="-560.9" y2="-574.5">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M14.8,4.357c-1.847,0-2.736,0.84-3.423,1.718-1.12,0.172-2.884,1.195-1.636,5.675,0.783-0.67,2.214-2.489,2.361-3.111,0.186-0.788,2.672,2.226,8.103,3.124,0.063-0.251,0.093-0.398,0.093-0.398,0.86-3.821-0.99-6.853-5.49-7.003z" fill="url(#SVGID_25_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="661.5" x2="649.2" y1="-573.9" y2="-566.6">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.36" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M12.11,8.272s2.658,3.492,8.059,3.485c0,0-2.54-0.4-8.06-3.488z" fill="url(#SVGID_26_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="648.1" x2="648.2" y1="-565.2" y2="-573">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M11.47,6.335s-2.603,0.155-1.637,4.566c0.003,0-0.315-3.019,1.637-4.565z" fill="url(#SVGID_27_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="658.5" x2="658.2" y1="-562.1" y2="-565.6">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<stop offset="0" stop-color="#8D7B6A"/>
+<stop offset="1" stop-color="#451F1E"/>
 </linearGradient>
 <path d="M16.06,6.946c-1.212-0.173-3.263-1.247-4.065-0.863,0,0,2.63-3,7.271,0.415,0,0-1.11,0.747-3.21,0.448z" fill="url(#SVGID_28_)"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_home.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="9.8965" y2="49.8018">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="0.5091" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#F6A800"/>
+<stop offset="0" style="stop-color:#E4E0C1"/>
+<stop offset="0.5091" style="stop-color:#B39C4D"/>
+<stop offset="1" style="stop-color:#AC8A4A"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="58,50.4 2,50.4 2,9.6 30.463,10.4 58,9.6 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="9.7017" y2="50.6398">
-<stop offset="0" style="stop-color:#F7AC00"/>
-<stop offset="0.3394" style="stop-color:#FFF8DB"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+<stop offset="0" style="stop-color:#AD8C4A"/>
+<stop offset="0.3394" style="stop-color:#F4F3E6"/>
+<stop offset="1" style="stop-color:#D1C794"/>
 </linearGradient>
 <path d="M57.385,10.22v39.56H2.613V10.22H57.385 M58,9.6L29.802,9.936L2,9.6v40.8h56V9.6L58,9.6z" fill="url(#SVGID_2_)"/>
-<polygon fill="#FBAB13" fill-opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 " stroke-opacity="0.3"/>
-<polygon fill="#F18800" fill-opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 " stroke-opacity="0.3"/>
+<polygon fill="#B59659" fill-opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 " stroke-opacity="0.3"/>
+<polygon fill="#A97B48" fill-opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 " stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(-1 0 0 -1 -1801.0049 1240.3164)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1831.0049" x2="-1831.0049" y1="1214.7607" y2="1190.0703">
-<stop offset="0" style="stop-color:#F98A00"/>
-<stop offset="0.7273" style="stop-color:#FCBC3C"/>
-<stop offset="1" style="stop-color:#FFE36A"/>
+<stop offset="0" style="stop-color:#AE804B"/>
+<stop offset="0.7273" style="stop-color:#C2AC76"/>
+<stop offset="1" style="stop-color:#D2C997"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="58,50.38 29.998,25.689 2,50.38 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="25.4995" y2="51.0736">
-<stop offset="0" style="stop-color:#FFF1B5"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+<stop offset="0" style="stop-color:#E9E5CB"/>
+<stop offset="1" style="stop-color:#D1C794"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4_)" points="58,50.38 29.998,25.689 2,50.38 29.998,26.563 "/>
-<polygon fill="#F18800" fill-opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 " stroke-opacity="0.3"/>
-<polygon fill="#C26D00" fill-opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 " stroke-opacity="0.4"/>
-<polygon fill="#AB6100" fill-opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 " stroke-opacity="0.4"/>
+<polygon fill="#A97B48" fill-opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 " stroke-opacity="0.3"/>
+<polygon fill="#88573A" fill-opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 " stroke-opacity="0.4"/>
+<polygon fill="#784833" fill-opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 " stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="32.9619" y2="8.0088">
-<stop offset="0" style="stop-color:#FFDA33"/>
-<stop offset="0.25" style="stop-color:#FFE692"/>
-<stop offset="1" style="stop-color:#FFFBF8"/>
+<stop offset="0" style="stop-color:#C2B470"/>
+<stop offset="0.25" style="stop-color:#DED7B3"/>
+<stop offset="1" style="stop-color:#FDFCFA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5_)" points="2,9.6 29.998,34.29 58,9.6 "/>
 <rect fill="none" height="60" width="60"/>
@@ -44,37 +44,37 @@
 <path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962  c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706  l-2.747,2.749v12.253H2.749z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.415" x2="15.415" y1="28.6694" y2="12.5688">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+<stop offset="0.6606" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#BABCBB"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="27.081,28.823 3.749,28.823 3.749,14.473 15.414,5.489 27.081,14.473 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.415" x2="15.415" y1="17.313" y2="28.6013">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+<stop offset="0.6606" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#BABCBB"/>
 </linearGradient>
 <path d="M15.414,6.668l10.736,8.264V27.89H4.682V14.932L15.414,6.668 M15.414,5.489L3.749,14.473v14.351  h23.333V14.473L15.414,5.489L15.414,5.489z" fill="url(#SVGID_2__)"/>
 <polygon fill-opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 " stroke-opacity="0.2"/>
 <polygon fill="#727272" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,6.655 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15.416" x2="15.416" y1="17.9946" y2="29.1519">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <rect fill="url(#SVGID_3__)" height="10.501" width="7.001" x="11.916" y="18.322"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15.416" x2="15.416" y1="28.7466" y2="18.3602">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <path d="M17.98,19.257v8.633h-5.133v-8.633H17.98 M18.917,18.322h-7.001v10.501h7.001V18.322L18.917,18.322z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15.4136" x2="15.4136" y1="0.0352" y2="17.7271">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<stop offset="0" style="stop-color:#A8835F"/>
+<stop offset="0.2606" style="stop-color:#A86F5F"/>
+<stop offset="1" style="stop-color:#9A5047"/>
 </linearGradient>
 <path d="M15.414,5.489l11.667,11.667l2.333-2.333c0,0-12.586-12.554-13.171-13.175  c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14l2.335,2.333L15.414,5.489z" fill="url(#SVGID_5__)"/>
 <radialGradient cx="15.2969" cy="1.7559" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="18.6679">
-<stop offset="0" style="stop-color:#F7D481"/>
-<stop offset="1" style="stop-color:#F5340A"/>
+<stop offset="0" style="stop-color:#D4C9A4"/>
+<stop offset="1" style="stop-color:#AF6151"/>
 </radialGradient>
 <path d="M14.553,2.616c0.724-0.688,1.102-0.653,1.689-0.034c0.516,0.549,10.433,10.442,12.705,12.709  l0.467-0.468c0,0-12.586-12.554-13.171-13.175c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14  l0.467,0.465C4.134,13.029,13.917,3.225,14.553,2.616z" fill="url(#SVGID_6_)"/>
 <rect fill-opacity="0.2" height="1.168" stroke-opacity="0.2" width="7.001" x="11.916" y="18.322"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_work.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_work.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_work.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="9.8965" y2="49.8018">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="0.5091" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#F6A800"/>
+<stop offset="0" style="stop-color:#E4E0C1"/>
+<stop offset="0.5091" style="stop-color:#B39C4D"/>
+<stop offset="1" style="stop-color:#AC8A4A"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="58,50.4 2,50.4 2,9.6 30.463,10.4 58,9.6 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="9.7017" y2="50.6398">
-<stop offset="0" style="stop-color:#F7AC00"/>
-<stop offset="0.3394" style="stop-color:#FFF8DB"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+<stop offset="0" style="stop-color:#AD8C4A"/>
+<stop offset="0.3394" style="stop-color:#F4F3E6"/>
+<stop offset="1" style="stop-color:#D1C794"/>
 </linearGradient>
 <path d="M57.385,10.22v39.56H2.613V10.22H57.385 M58,9.6L29.802,9.936L2,9.6v40.8h56V9.6L58,9.6z" fill="url(#SVGID_2_)"/>
-<polygon fill="#FBAB13" fill-opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 " stroke-opacity="0.3"/>
-<polygon fill="#F18800" fill-opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 " stroke-opacity="0.3"/>
+<polygon fill="#B59659" fill-opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 " stroke-opacity="0.3"/>
+<polygon fill="#A97B48" fill-opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 " stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(-1 0 0 -1 -1801.0049 1240.3164)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1831.0049" x2="-1831.0049" y1="1214.7607" y2="1190.0703">
-<stop offset="0" style="stop-color:#F98A00"/>
-<stop offset="0.7273" style="stop-color:#FCBC3C"/>
-<stop offset="1" style="stop-color:#FFE36A"/>
+<stop offset="0" style="stop-color:#AE804B"/>
+<stop offset="0.7273" style="stop-color:#C2AC76"/>
+<stop offset="1" style="stop-color:#D2C997"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="58,50.38 29.998,25.689 2,50.38 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="25.4995" y2="51.0736">
-<stop offset="0" style="stop-color:#FFF1B5"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+<stop offset="0" style="stop-color:#E9E5CB"/>
+<stop offset="1" style="stop-color:#D1C794"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4_)" points="58,50.38 29.998,25.689 2,50.38 29.998,26.563 "/>
-<polygon fill="#F18800" fill-opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 " stroke-opacity="0.3"/>
-<polygon fill="#C26D00" fill-opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 " stroke-opacity="0.4"/>
-<polygon fill="#AB6100" fill-opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 " stroke-opacity="0.4"/>
+<polygon fill="#A97B48" fill-opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 " stroke-opacity="0.3"/>
+<polygon fill="#88573A" fill-opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 " stroke-opacity="0.4"/>
+<polygon fill="#784833" fill-opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 " stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="32.9619" y2="8.0088">
-<stop offset="0" style="stop-color:#FFDA33"/>
-<stop offset="0.25" style="stop-color:#FFE692"/>
-<stop offset="1" style="stop-color:#FFFBF8"/>
+<stop offset="0" style="stop-color:#C2B470"/>
+<stop offset="0.25" style="stop-color:#DED7B3"/>
+<stop offset="1" style="stop-color:#FDFCFA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5_)" points="2,9.6 29.998,34.29 58,9.6 "/>
 <rect fill="none" height="60" width="60"/>
@@ -43,93 +43,93 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill="none" height="30" width="30"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="654.6" x2="654.6" y1="-558.3" y2="-601.7">
-<stop offset="0" stop-color="#DFE1E6"/>
-<stop offset="1" stop-color="#BDBEC3"/>
+<stop offset="0" stop-color="#E1E4E3"/>
+<stop offset="1" stop-color="#BFC1C1"/>
 </linearGradient>
 <rect fill="url(#SVGID_1__)" height="21.5" width="17.33" x="5.158" y="3.499"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="654.6" x2="654.6" y1="-558.9" y2="-602.2">
-<stop offset="0" stop-color="#E7E9EF"/>
-<stop offset="1" stop-color="#C8C9CE"/>
+<stop offset="0" stop-color="#E9EDEB"/>
+<stop offset="1" stop-color="#CACCCC"/>
 </linearGradient>
 <path d="M21.99,3.999v20.5h-16.33v-20.5h16.33m0.5-0.501h-17.33v21.5h17.33v-21.5z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="642.6" x2="642.6" y1="-567.9" y2="-562.2">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_3__)" height="3" width="3" x="6.324" y="5.146"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="650.6" x2="650.6" y1="-567.9" y2="-562.2">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_4__)" height="3" width="3" x="10.32" y="5.146"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="666.6" x2="666.6" y1="-567.9" y2="-562.2">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_5__)" height="3" width="3" x="18.32" y="5.146"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="658.6" x2="658.6" y1="-567.9" y2="-562.2">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="3" width="3" x="14.32" y="5.146"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="642.6" x2="642.6" y1="-576.5" y2="-570.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="3" width="3" x="6.324" y="9.458"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="650.6" x2="650.6" y1="-576.5" y2="-570.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="3" width="3" x="10.32" y="9.458"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="666.6" x2="666.6" y1="-576.5" y2="-570.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="3" width="3" x="18.32" y="9.458"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="658.6" x2="658.6" y1="-576.5" y2="-570.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="3" width="3" x="14.32" y="9.458"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="642.6" x2="642.6" y1="-594.5" y2="-588.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_11_)" height="3" width="3" x="6.324" y="18.46"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="650.6" x2="650.6" y1="-594.5" y2="-588.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_12_)" height="3" width="3" x="10.32" y="18.46"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="666.6" x2="666.6" y1="-594.5" y2="-588.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_13_)" height="3" width="3" x="18.32" y="18.46"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="658.6" x2="658.6" y1="-594.5" y2="-588.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_14_)" height="3" width="3" x="14.32" y="18.46"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="642.6" x2="642.6" y1="-585.5" y2="-579.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_15_)" height="3" width="3" x="6.324" y="13.96"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="650.6" x2="650.6" y1="-585.5" y2="-579.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_16_)" height="3" width="3" x="10.32" y="13.96"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="666.6" x2="666.6" y1="-585.5" y2="-579.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_17_)" height="3" width="3" x="18.32" y="13.96"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="658.6" x2="658.6" y1="-585.5" y2="-579.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_18_)" height="3" width="3" x="14.32" y="13.96"/>
 <polygon fill-opacity="0.3" points="22.49,25,22.49,14.85,12.51,11.92,12.51,25" stroke-opacity="0.3" style="enable-background:new;"/>
@@ -139,8 +139,8 @@
 </linearGradient>
 <polygon fill="url(#SVGID_19_)" points="24.84,16.25,13.51,12.92,13.51,26.5,24.84,26.5"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="665.4" x2="665.4" y1="-582" y2="-605.1">
-<stop offset="0" stop-color="#DBDDE2"/>
-<stop offset="1" stop-color="#B5B6BA"/>
+<stop offset="0" stop-color="#DDE0DF"/>
+<stop offset="1" stop-color="#B7B8B9"/>
 </linearGradient>
 <path d="M14.01,13.58l10.33,3.039v9.38h-10.33v-12.42m-0.5-0.665v13.58h11.33v-10.25l-11.33-3.33z" fill="url(#SVGID_20_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_video_call_unseen.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_video_call_unseen.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_video_call_unseen.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -44,51 +44,51 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M20.74,16.008L21.732,17L30,8.733l-4.488-4.486l-4.131,4.132l1.613-6.023l-6.129-1.643l-2.32,8.654  l-4.027-4.185L0,16.008h5.752v3.212c0,6.398,4.527,10.067,12.42,10.067h0.943v-8.079h-0.943c-0.998,0-2.881-0.416-2.881-1.988  v-3.212H20.74z M18.381,11.377l-0.969,0.969l-1.594-1.655L18.381,11.377z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3121.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2183.5244" x2="-2183.5244" y1="3114.3159" y2="3092.6184">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C6957B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <path d="M14.346,19.22v-4.157h4.369l-8.201-8.521l-8.277,8.521h4.461v4.157c0,7.027,5.848,9.122,11.475,9.122  v-6.188C16.438,22.154,14.346,21.298,14.346,19.22z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="10.4756" x2="10.4756" y1="6.6836" y2="23.1265">
-<stop offset="0" style="stop-color:#FA9D53"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C8A885"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="10.514,7.505 17.787,15.063 18.715,15.063 10.514,6.542 2.236,15.063 3.172,15.063 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="16.2588" x2="16.2588" y1="6.6821" y2="23.1266">
-<stop offset="0" style="stop-color:#FA9D53"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C8A885"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <path d="M14.346,19.22v0.964c0,2.077,2.092,2.934,3.826,2.934v-0.963  C16.438,22.154,14.346,21.298,14.346,19.22z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="19.6777" x2="17.6734" y1="2.3481" y2="10.087">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+<stop offset="0" style="stop-color:#CDB18B"/>
+<stop offset="0.703" style="stop-color:#985954"/>
+<stop offset="1" style="stop-color:#BE997B"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4__)" points="15.459,9.616 17.533,1.871 21.836,3.024 19.762,10.768 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="19.5371" x2="17.755" y1="2.8726" y2="9.7783">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5__)" points="19.445,10.223 16.004,9.3 17.85,2.416 21.291,3.338 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="27.0137" x2="20.1654" y1="7.1484" y2="14.1638">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+<stop offset="0" style="stop-color:#CDB18B"/>
+<stop offset="0.703" style="stop-color:#985954"/>
+<stop offset="1" style="stop-color:#BE997B"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6__)" points="18.582,12.513 25.512,5.584 28.662,8.733 21.732,15.663 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="26.7764" x2="20.5396" y1="7.4414" y2="13.7339">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
 </linearGradient>
 <polygon fill="url(#SVGID_7_)" points="21.732,15.034 19.213,12.513 25.512,6.213 28.031,8.733 "/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="12.38" x2="17.62" y1="23.65" y2="23.65">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <rect fill="url(#SVGID_1___)" height="7.853" width="5.105" x="12.45" y="19.72"/>
 <path d="M12.45,24.66c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.285z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -100,16 +100,16 @@
 </linearGradient>
 <path d="M15,23.7c-5.98,0-10.85-4.867-10.85-10.85s4.87-10.85,10.85-10.85c5.982,0,10.85,4.866,10.85,10.85s-4.87,10.85-10.85,10.85z" fill="url(#SVGID_2___)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3___" x1="15" x2="15" y1="2.614" y2="23.03">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.0667" stop-color="#D1D7D9"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#7C8487"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<stop offset="0" stop-color="#D3D7D5"/>
+<stop offset="0.0667" stop-color="#D3D7D5"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#7F8384"/>
+<stop offset="1" stop-color="#AFB3B2"/>
 </linearGradient>
 <circle cx="15" cy="12.85" fill="url(#SVGID_3___)" r="10.21"/>
 <path d="M15,21.99c-5.315,0-9.657-4.23-9.843-9.5-0.004,0.116-0.009,0.231-0.009,0.349,0,5.431,4.419,9.851,9.852,9.851s9.852-4.42,9.852-9.851c0-0.117-0.005-0.232-0.009-0.349-0.18,5.27-4.52,9.5-9.84,9.5z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#222021" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4___" x1="15" x2="15" y1="3.721" y2="20.35">
 <stop offset="0" stop-color="#CFCFCF"/>
 <stop offset="0.1091" stop-color="#CFCFCF"/>
@@ -119,7 +119,7 @@
 <path d="M15,20.43c-2.216-0.002-4.298-0.864-5.864-2.432-1.567-1.566-2.428-3.65-2.427-5.866,0-4.573,3.723-8.293,8.296-8.293,2.218,0.001,4.3,0.864,5.866,2.432s2.43,3.651,2.428,5.867c-0.001,4.573-3.723,8.292-8.295,8.292h-0.004z" fill="url(#SVGID_4___)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5___" x1="15" x2="15" y1="4.368" y2="19.72">
 <stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="1" stop-color="#606769"/>
+<stop offset="1" stop-color="#636566"/>
 </linearGradient>
 <circle cx="15" cy="12.13" fill="url(#SVGID_5___)" r="7.657"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6___" x1="15" x2="15" y1="5.772" y2="18.45">
@@ -146,29 +146,29 @@
 </radialGradient>
 <circle cx="15" cy="12.13" fill="url(#SVGID_8_)" r="4.712"/>
 <radialGradient cx="23.96" cy="3.55" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.36">
-<stop offset="0" stop-color="#A700F5"/>
-<stop offset="0.3091" stop-color="#A700F5"/>
-<stop offset="0.4364" stop-color="#5E008A"/>
-<stop offset="0.8061" stop-color="#0E1402"/>
-<stop offset="1" stop-color="#0E1402"/>
+<stop offset="0" stop-color="#8D4AAB"/>
+<stop offset="0.3091" stop-color="#8D4AAB"/>
+<stop offset="0.4364" stop-color="#532961"/>
+<stop offset="0.8061" stop-color="#070F0F"/>
+<stop offset="1" stop-color="#070F0F"/>
 </radialGradient>
 <path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0.004-2.327,1.89-4.21,4.213-4.21,2.33,0.003,4.21,1.888,4.21,4.21z" fill="url(#SVGID_9_)"/>
 <radialGradient cx="25.17" cy="13.25" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.611">
-<stop offset="0" stop-color="#48630C"/>
+<stop offset="0" stop-color="#264932"/>
 <stop offset="0.7879" stop-color="#000000"/>
 <stop offset="1" stop-color="#000000"/>
 </radialGradient>
 <path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0,0,1.444,2.569,4.213,2.569,2.77,0,4.21-2.57,4.21-2.57z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.98" x2="14.98" y1="7.065" y2="12.09">
-<stop offset="0" stop-color="#F8FBFF"/>
+<stop offset="0" stop-color="#FAFDFB"/>
 <stop offset="1" stop-color="#808080"/>
 </linearGradient>
 <path d="M14.98,12.07c1.828,0,3.549-0.277,5.067-0.765-0.431-2.41-2.532-4.239-5.067-4.239-2.532,0-4.632,1.83-5.065,4.239,1.515,0.49,3.235,0.77,5.065,0.77z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.762" x2="24.29" y1="26.72" y2="26.72">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <path d="M24.24,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879h-14.72c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639h18.44z" fill="url(#SVGID_12_)"/>
 <path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626h-17.53c-0.164,0.19-0.293,0.4-0.377,0.63z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -43,18 +43,18 @@
 <polygon fill="none" points="15.053,0 14.626,0.439 0,0.439 0,30.439 30,30.439 30,0.439 15.476,0.439 "/>
 <path d="M24.884,30.438c-10.001,0-15.735-4.635-15.735-12.715v-4.339H2.053L15.053,0l12.88,13.385h-6.962v4.339  c0,2.189,2.56,2.768,3.913,2.768h1v9.947H24.884z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3014.6338)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179" x2="-2179" y1="3012.1528" y2="2984.2842">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C6957B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <path d="M19.971,17.724v-5.339h5.611L15.049,1.438L4.418,12.385h5.73v5.339  c0,9.024,7.509,11.715,14.735,11.715v-7.947C22.658,21.491,19.971,20.392,19.971,17.724z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.7129" y2="22.5894">
-<stop offset="0" style="stop-color:#FFB259"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#CDB48B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="15.049,2.438 24.62,12.385 25.582,12.385 15.049,1.438 4.418,12.385 5.389,12.385 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="22.4268" x2="22.4268" y1="1.7129" y2="22.5894">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C6957B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <path d="M19.971,17.724v1c0,2.668,2.688,3.768,4.913,3.768v-1C22.658,21.491,19.971,20.392,19.971,17.724z" fill="url(#SVGID_3__)"/>
 <rect fill="none" height="30" width="30" y="0.439"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call_unseen.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call_unseen.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call_unseen.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -44,42 +44,42 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M20.74,16.008L21.732,17L30,8.733l-4.488-4.486l-4.131,4.132l1.613-6.023l-6.129-1.643l-2.32,8.654  l-4.027-4.185L0,16.008h5.752v3.212c0,6.398,4.527,10.067,12.42,10.067h0.943v-8.079h-0.943c-0.998,0-2.881-0.416-2.881-1.988  v-3.212H20.74z M18.381,11.377l-0.969,0.969l-1.594-1.655L18.381,11.377z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3121.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2183.5244" x2="-2183.5244" y1="3114.3159" y2="3092.6184">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C6957B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <path d="M14.346,19.22v-4.157h4.369l-8.201-8.521l-8.277,8.521h4.461v4.157c0,7.027,5.848,9.122,11.475,9.122  v-6.188C16.438,22.154,14.346,21.298,14.346,19.22z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="10.4756" x2="10.4756" y1="6.6836" y2="23.1265">
-<stop offset="0" style="stop-color:#FA9D53"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C8A885"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="10.514,7.505 17.787,15.063 18.715,15.063 10.514,6.542 2.236,15.063 3.172,15.063 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="16.2588" x2="16.2588" y1="6.6821" y2="23.1266">
-<stop offset="0" style="stop-color:#FA9D53"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C8A885"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <path d="M14.346,19.22v0.964c0,2.077,2.092,2.934,3.826,2.934v-0.963  C16.438,22.154,14.346,21.298,14.346,19.22z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="19.6777" x2="17.6734" y1="2.3481" y2="10.087">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+<stop offset="0" style="stop-color:#CDB18B"/>
+<stop offset="0.703" style="stop-color:#985954"/>
+<stop offset="1" style="stop-color:#BE997B"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4__)" points="15.459,9.616 17.533,1.871 21.836,3.024 19.762,10.768 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="19.5371" x2="17.755" y1="2.8726" y2="9.7783">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5__)" points="19.445,10.223 16.004,9.3 17.85,2.416 21.291,3.338 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="27.0137" x2="20.1654" y1="7.1484" y2="14.1638">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+<stop offset="0" style="stop-color:#CDB18B"/>
+<stop offset="0.703" style="stop-color:#985954"/>
+<stop offset="1" style="stop-color:#BE997B"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6__)" points="18.582,12.513 25.512,5.584 28.662,8.733 21.732,15.663 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="26.7764" x2="20.5396" y1="7.4414" y2="13.7339">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
 </linearGradient>
 <polygon fill="url(#SVGID_7_)" points="21.732,15.034 19.213,12.513 25.512,6.213 28.031,8.733 "/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voip_call_unseen.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voip_call_unseen.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voip_call_unseen.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -44,42 +44,42 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M20.74,16.008L21.732,17L30,8.733l-4.488-4.486l-4.131,4.132l1.613-6.023l-6.129-1.643l-2.32,8.654  l-4.027-4.185L0,16.008h5.752v3.212c0,6.398,4.527,10.067,12.42,10.067h0.943v-8.079h-0.943c-0.998,0-2.881-0.416-2.881-1.988  v-3.212H20.74z M18.381,11.377l-0.969,0.969l-1.594-1.655L18.381,11.377z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3121.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2183.5244" x2="-2183.5244" y1="3114.3159" y2="3092.6184">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C6957B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <path d="M14.346,19.22v-4.157h4.369l-8.201-8.521l-8.277,8.521h4.461v4.157c0,7.027,5.848,9.122,11.475,9.122  v-6.188C16.438,22.154,14.346,21.298,14.346,19.22z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="10.4756" x2="10.4756" y1="6.6836" y2="23.1265">
-<stop offset="0" style="stop-color:#FA9D53"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C8A885"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="10.514,7.505 17.787,15.063 18.715,15.063 10.514,6.542 2.236,15.063 3.172,15.063 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="16.2588" x2="16.2588" y1="6.6821" y2="23.1266">
-<stop offset="0" style="stop-color:#FA9D53"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C8A885"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <path d="M14.346,19.22v0.964c0,2.077,2.092,2.934,3.826,2.934v-0.963  C16.438,22.154,14.346,21.298,14.346,19.22z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="19.6777" x2="17.6734" y1="2.3481" y2="10.087">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+<stop offset="0" style="stop-color:#CDB18B"/>
+<stop offset="0.703" style="stop-color:#985954"/>
+<stop offset="1" style="stop-color:#BE997B"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4__)" points="15.459,9.616 17.533,1.871 21.836,3.024 19.762,10.768 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="19.5371" x2="17.755" y1="2.8726" y2="9.7783">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5__)" points="19.445,10.223 16.004,9.3 17.85,2.416 21.291,3.338 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="27.0137" x2="20.1654" y1="7.1484" y2="14.1638">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+<stop offset="0" style="stop-color:#CDB18B"/>
+<stop offset="0.703" style="stop-color:#985954"/>
+<stop offset="1" style="stop-color:#BE997B"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6__)" points="18.582,12.513 25.512,5.584 28.662,8.733 21.732,15.663 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="26.7764" x2="20.5396" y1="7.4414" y2="13.7339">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
 </linearGradient>
 <polygon fill="url(#SVGID_7_)" points="21.732,15.034 19.213,12.513 25.512,6.213 28.031,8.733 "/>
 </g>
@@ -87,30 +87,30 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5  c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1___" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1___)" r="13.464"/>
 <path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15  l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691  l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586  c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156  l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979  l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202  l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848  L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212  l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15  c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428  C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15  C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2___)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3___" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094  c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3___)"/>
 <radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4___" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383  l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15  l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85  l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164  l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552  l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443  L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247  l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4___)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -13,16 +13,16 @@
 </linearGradient>
 <path d="M45.77,8.571c0.338,0,0.611,0.274,0.611,0.612v39.8c0,0.338-0.273,0.612-0.611,0.612h-32.45c-0.338,0-0.612-0.274-0.612-0.612v-30.13c0-0.49,0.344-1.222,0.721-1.535l9.78-8.105c0.412-0.342,1.242-0.642,1.777-0.642h20.79m0.004-0.614h-20.79c-0.674,0-1.648,0.352-2.167,0.781l-9.78,8.107c-0.519,0.43-0.943,1.332-0.943,2.006v30.13c0,0.673,0.551,1.225,1.225,1.225h32.45c0.673,0,1.225-0.552,1.225-1.225v-39.82c-0.01-0.674-0.56-1.225-1.23-1.225z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.54" x2="29.54" y1="9.65" y2="48.37">
-<stop offset="0" stop-color="#A0A3A6"/>
-<stop offset="0.2606" stop-color="#7B7E80"/>
-<stop offset="0.8182" stop-color="#474B4D"/>
-<stop offset="1" stop-color="#707577"/>
+<stop offset="0" stop-color="#A2A4A4"/>
+<stop offset="0.2606" stop-color="#7D7E7F"/>
+<stop offset="0.8182" stop-color="#494A4B"/>
+<stop offset="1" stop-color="#727475"/>
 </linearGradient>
 <path d="M15.15,48.37c-0.673,0-1.224-0.551-1.224-1.225v-27.35c0-0.673,0.423-1.577,0.94-2.009l8.629-7.198c0.517-0.432,1.491-0.784,2.165-0.784h18.26c0.673,0,1.224,0.552,1.224,1.225v36.12c0,0.674-0.551,1.225-1.224,1.225h-28.77z" fill="url(#SVGID_3_)"/>
 <path d="M43.93,47.76h-28.78c-0.673,0-1.224-0.552-1.224-1.224v0.611c0,0.674,0.551,1.225,1.224,1.225h28.78c0.673,0,1.224-0.551,1.224-1.225v-0.611c0,0.65-0.55,1.21-1.22,1.21z" fill="#808080"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.54" x2="29.54" y1="39.8" y2="45.46">
-<stop offset="0" stop-color="#242626"/>
-<stop offset="1" stop-color="#585C5E"/>
+<stop offset="0" stop-color="#252525"/>
+<stop offset="1" stop-color="#5A5B5C"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="5.511" width="27.55" x="15.76" y="39.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="42.09" x2="42.09" y1="19.59" y2="11.02">
@@ -31,10 +31,10 @@
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="8.571" width="3.674" x="40.26" y="11.02"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="42.09" x2="42.09" y1="11.49" y2="19.86">
-<stop offset="0" stop-color="#FFF173"/>
-<stop offset="0.33" stop-color="#F1BC35"/>
-<stop offset="0.66" stop-color="#E5B029"/>
-<stop offset="1" stop-color="#FFA102"/>
+<stop offset="0" stop-color="#D5D19D"/>
+<stop offset="0.33" stop-color="#B9A56D"/>
+<stop offset="0.66" stop-color="#AD9861"/>
+<stop offset="1" stop-color="#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="7.959" width="2.449" x="40.87" y="11.63"/>
 <rect fill="#CBCBCB" height="0.612" width="3.674" x="40.26" y="18.98"/>
@@ -44,10 +44,10 @@
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="8.571" width="3.673" x="34.74" y="11.02"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="36.58" x2="36.58" y1="11.49" y2="19.86">
-<stop offset="0" stop-color="#FFF173"/>
-<stop offset="0.33" stop-color="#F1BC35"/>
-<stop offset="0.66" stop-color="#E5B029"/>
-<stop offset="1" stop-color="#FFA102"/>
+<stop offset="0" stop-color="#D5D19D"/>
+<stop offset="0.33" stop-color="#B9A56D"/>
+<stop offset="0.66" stop-color="#AD9861"/>
+<stop offset="1" stop-color="#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="7.959" width="2.449" x="35.36" y="11.63"/>
 <rect fill="#CBCBCB" height="0.612" width="3.673" x="34.74" y="18.98"/>
@@ -57,10 +57,10 @@
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="8.571" width="3.673" x="29.24" y="11.02"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="31.07" x2="31.07" y1="11.49" y2="19.86">
-<stop offset="0" stop-color="#FFF173"/>
-<stop offset="0.33" stop-color="#F1BC35"/>
-<stop offset="0.66" stop-color="#E5B029"/>
-<stop offset="1" stop-color="#FFA102"/>
+<stop offset="0" stop-color="#D5D19D"/>
+<stop offset="0.33" stop-color="#B9A56D"/>
+<stop offset="0.66" stop-color="#AD9861"/>
+<stop offset="1" stop-color="#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="7.959" width="2.449" x="29.85" y="11.63"/>
 <rect fill="#CBCBCB" height="0.612" width="3.673" x="29.24" y="18.98"/>
@@ -70,10 +70,10 @@
 </linearGradient>
 <rect fill="url(#SVGID_11_)" height="8.571" width="3.673" x="23.72" y="11.02"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="25.56" x2="25.56" y1="11.49" y2="19.86">
-<stop offset="0" stop-color="#FFF173"/>
-<stop offset="0.33" stop-color="#F1BC35"/>
-<stop offset="0.66" stop-color="#E5B029"/>
-<stop offset="1" stop-color="#FFA102"/>
+<stop offset="0" stop-color="#D5D19D"/>
+<stop offset="0.33" stop-color="#B9A56D"/>
+<stop offset="0.66" stop-color="#AD9861"/>
+<stop offset="1" stop-color="#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_12_)" height="7.959" width="2.449" x="24.34" y="11.63"/>
 <rect fill="#CBCBCB" height="0.612" width="3.673" x="23.72" y="18.98"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc_removed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc_removed.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc_removed.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -20,22 +20,22 @@
 <path d="M45.77,8.571c0.338,0,0.611,0.274,0.611,0.612v39.8c0,0.338-0.273,0.612-0.611,0.612h-32.45c-0.338,0-0.612-0.274-0.612-0.612v-30.13c0-0.49,0.344-1.222,0.721-1.535l9.78-8.105c0.412-0.342,1.242-0.642,1.777-0.642h20.79m0.004-0.614h-20.79c-0.674,0-1.648,0.352-2.167,0.781l-9.78,8.107c-0.519,0.43-0.943,1.332-0.943,2.006v30.13c0,0.673,0.551,1.225,1.225,1.225h32.45c0.673,0,1.225-0.552,1.225-1.225v-39.82c-0.01-0.674-0.56-1.225-1.23-1.225z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.54" x2="29.54" y1="9.65" y2="48.37">
 
-<stop offset="0" stop-color="#A0A3A6"/>
+<stop offset="0" stop-color="#A2A4A4"/>
 
-<stop offset="0.2606" stop-color="#7B7E80"/>
+<stop offset="0.2606" stop-color="#7D7E7F"/>
 
-<stop offset="0.8182" stop-color="#474B4D"/>
+<stop offset="0.8182" stop-color="#494A4B"/>
 
-<stop offset="1" stop-color="#707577"/>
+<stop offset="1" stop-color="#727475"/>
 
 </linearGradient>
 <path d="M15.15,48.37c-0.673,0-1.224-0.551-1.224-1.225v-27.35c0-0.673,0.423-1.577,0.94-2.009l8.629-7.198c0.517-0.432,1.491-0.784,2.165-0.784h18.26c0.673,0,1.224,0.552,1.224,1.225v36.12c0,0.674-0.551,1.225-1.224,1.225h-28.77z" fill="url(#SVGID_3_)"/>
 <path d="M43.93,47.76h-28.78c-0.673,0-1.224-0.552-1.224-1.224v0.611c0,0.674,0.551,1.225,1.224,1.225h28.78c0.673,0,1.224-0.551,1.224-1.225v-0.611c0,0.65-0.55,1.21-1.22,1.21z" fill="#808080"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.54" x2="29.54" y1="39.8" y2="45.46">
 
-<stop offset="0" stop-color="#242626"/>
+<stop offset="0" stop-color="#252525"/>
 
-<stop offset="1" stop-color="#585C5E"/>
+<stop offset="1" stop-color="#5A5B5C"/>
 
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="5.511" width="27.55" x="15.76" y="39.8"/>
@@ -49,13 +49,13 @@
 <rect fill="url(#SVGID_5_)" height="8.571" width="3.674" x="40.26" y="11.02"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="42.09" x2="42.09" y1="11.49" y2="19.86">
 
-<stop offset="0" stop-color="#FFF173"/>
+<stop offset="0" stop-color="#D5D19D"/>
 
-<stop offset="0.33" stop-color="#F1BC35"/>
+<stop offset="0.33" stop-color="#B9A56D"/>
 
-<stop offset="0.66" stop-color="#E5B029"/>
+<stop offset="0.66" stop-color="#AD9861"/>
 
-<stop offset="1" stop-color="#FFA102"/>
+<stop offset="1" stop-color="#B38E4E"/>
 
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="7.959" width="2.449" x="40.87" y="11.63"/>
@@ -70,13 +70,13 @@
 <rect fill="url(#SVGID_7_)" height="8.571" width="3.673" x="34.74" y="11.02"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="36.58" x2="36.58" y1="11.49" y2="19.86">
 
-<stop offset="0" stop-color="#FFF173"/>
+<stop offset="0" stop-color="#D5D19D"/>
 
-<stop offset="0.33" stop-color="#F1BC35"/>
+<stop offset="0.33" stop-color="#B9A56D"/>
 
-<stop offset="0.66" stop-color="#E5B029"/>
+<stop offset="0.66" stop-color="#AD9861"/>
 
-<stop offset="1" stop-color="#FFA102"/>
+<stop offset="1" stop-color="#B38E4E"/>
 
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="7.959" width="2.449" x="35.36" y="11.63"/>
@@ -91,13 +91,13 @@
 <rect fill="url(#SVGID_9_)" height="8.571" width="3.673" x="29.24" y="11.02"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="31.07" x2="31.07" y1="11.49" y2="19.86">
 
-<stop offset="0" stop-color="#FFF173"/>
+<stop offset="0" stop-color="#D5D19D"/>
 
-<stop offset="0.33" stop-color="#F1BC35"/>
+<stop offset="0.33" stop-color="#B9A56D"/>
 
-<stop offset="0.66" stop-color="#E5B029"/>
+<stop offset="0.66" stop-color="#AD9861"/>
 
-<stop offset="1" stop-color="#FFA102"/>
+<stop offset="1" stop-color="#B38E4E"/>
 
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="7.959" width="2.449" x="29.85" y="11.63"/>
@@ -112,13 +112,13 @@
 <rect fill="url(#SVGID_11_)" height="8.571" width="3.673" x="23.72" y="11.02"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="25.56" x2="25.56" y1="11.49" y2="19.86">
 
-<stop offset="0" stop-color="#FFF173"/>
+<stop offset="0" stop-color="#D5D19D"/>
 
-<stop offset="0.33" stop-color="#F1BC35"/>
+<stop offset="0.33" stop-color="#B9A56D"/>
 
-<stop offset="0.66" stop-color="#E5B029"/>
+<stop offset="0.66" stop-color="#AD9861"/>
 
-<stop offset="1" stop-color="#FFA102"/>
+<stop offset="1" stop-color="#B38E4E"/>
 
 </linearGradient>
 <rect fill="url(#SVGID_12_)" height="7.959" width="2.449" x="24.34" y="11.63"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,25 +4,25 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07  c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11  c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304  v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001  z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" fill-opacity="0.6" height="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
@@ -31,80 +31,80 @@
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+<stop offset="0" style="stop-color:#AADAC6"/>
+<stop offset="1" style="stop-color:#6A99AA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
-<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
+<rect fill="#BCE2D2" height="0.767" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+<stop offset="1" style="stop-color:#D3D7D5"/>
 </linearGradient>
 <path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785  c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+<stop offset="0" style="stop-color:#6F7172"/>
+<stop offset="1" style="stop-color:#BFC2C1"/>
 </linearGradient>
 <path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51  c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951  h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183  h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606  c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
 <path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534  h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303  c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307  c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+<stop offset="0" style="stop-color:#C6B17B"/>
+<stop offset="0.7455" style="stop-color:#98604F"/>
+<stop offset="1" style="stop-color:#7F3736"/>
 </linearGradient>
 <path d="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307  c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile_tv.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile_tv.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile_tv.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -11,26 +11,26 @@
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="6.4082" y2="50.2251">
 <stop offset="0" style="stop-color:#F2F2F2"/>
 <stop offset="0.1212" style="stop-color:#F2F2F2"/>
-<stop offset="0.5515" style="stop-color:#ADB2B5"/>
-<stop offset="1" style="stop-color:#E6E9E8"/>
+<stop offset="0.5515" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#E7E8E7"/>
 </linearGradient>
 <path d="M58,48.666c0,0.86-0.697,1.556-1.557,1.556H3.557C2.695,50.222,2,49.526,2,48.666V8.223  c0-0.858,0.695-1.556,1.557-1.556h52.887C57.303,6.667,58,7.364,58,8.223V48.666z" fill="url(#SVGID_2_)"/>
-<path d="M56.443,49.445H3.557C2.695,49.445,2,48.748,2,47.889v0.777c0,0.86,0.695,1.556,1.557,1.556  h52.887c0.859,0,1.557-0.695,1.557-1.556v-0.777C58,48.748,57.303,49.445,56.443,49.445z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M56.443,49.445H3.557C2.695,49.445,2,48.748,2,47.889v0.777c0,0.86,0.695,1.556,1.557,1.556  h52.887c0.859,0,1.557-0.695,1.557-1.556v-0.777C58,48.748,57.303,49.445,56.443,49.445z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="41.4072" y2="10.4689">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="31.888" width="49.777" x="5.111" y="9.778"/>
 <rect fill="#FFFFFF" height="0.778" width="49.777" x="5.111" y="40.888"/>
 <polygon fill="#FFFFFF" fill-opacity="0.2" points="5.901,26.112 54.11,19.753 54.11,10.555 5.889,10.555 " stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="48.5547" y2="42.6262">
-<stop offset="0" style="stop-color:#57CDEA"/>
-<stop offset="1" style="stop-color:#196BDE"/>
+<stop offset="0" style="stop-color:#83BEB9"/>
+<stop offset="1" style="stop-color:#5473A3"/>
 </linearGradient>
 <path d="M30,43.611c1.074,0,1.943,0.871,1.943,1.943c0,1.071-0.869,1.945-1.943,1.945  c-1.071,0-1.944-0.874-1.944-1.945C28.056,44.482,28.929,43.611,30,43.611 M30,42.443c-1.719,0-3.111,1.395-3.111,3.111  c0,1.719,1.393,3.111,3.111,3.111s3.111-1.393,3.111-3.111C33.111,43.838,31.719,42.443,30,42.443L30,42.443z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.5732" y2="48.7959">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+<stop offset="0" style="stop-color:#E7E8E7"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M55.666,7.443H4.333c-0.858,0-1.556,0.697-1.556,1.556V47.11c0,0.86,0.697,1.556,1.556,1.556h22.736  c-0.827-0.779-1.347-1.884-1.347-3.111c0-1.226,0.52-2.33,1.347-3.111H4.333V8.999h51.333v33.444H32.93  c0.828,0.781,1.348,1.886,1.348,3.111c0,1.228-0.52,2.332-1.348,3.111h22.736c0.859,0,1.556-0.695,1.556-1.556V8.999  C57.222,8.141,56.525,7.443,55.666,7.443z" fill="url(#SVGID_5_)"/>
 <path d="M43.223,52.554H16.779c-0.701,0-1.287-0.496-1.456-1.166c-0.03,0.126-0.054,0.256-0.054,0.39  c0,0.86,0.676,1.556,1.51,1.556h26.443c0.832,0,1.508-0.695,1.508-1.556c0-0.134-0.021-0.264-0.054-0.39  C44.51,52.058,43.926,52.554,43.223,52.554z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mouse.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mouse.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mouse.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,92 +5,92 @@
 <radialGradient cx="30.1362" cy="20.3848" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="35.3912">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.303" style="stop-color:#FFFFFF"/>
-<stop offset="0.6667" style="stop-color:#BDC2C5"/>
-<stop offset="1" style="stop-color:#EAEBEC"/>
+<stop offset="0.6667" style="stop-color:#BFC3C2"/>
+<stop offset="1" style="stop-color:#EBEBEB"/>
 </radialGradient>
 <path d="M30,57.201c-10.93,0-20.163-8.713-20.163-19.025V13.439c0-9.115,6.905-9.869,14.599-9.869  c0.865,0,1.755,0.008,2.665,0.018c0.946,0.01,1.915,0.02,2.899,0.02s1.952-0.01,2.898-0.02c0.91-0.01,1.802-0.018,2.666-0.018  c7.693,0,14.598,0.754,14.598,9.869v24.736C50.162,48.488,40.93,57.201,30,57.201L30,57.201z" fill="url(#SVGID_1_)"/>
 <radialGradient cx="17.4287" cy="-2.4482" gradientTransform="matrix(0.9655 0 0 0.9655 13.3019 23.1178)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="35.1983">
-<stop offset="0" style="stop-color:#CBD2D5"/>
-<stop offset="0.303" style="stop-color:#CBD2D5"/>
-<stop offset="0.703" style="stop-color:#8C9599"/>
-<stop offset="0.8909" style="stop-color:#B3BCBF"/>
-<stop offset="1" style="stop-color:#DBE2E6"/>
+<stop offset="0" style="stop-color:#CED2D0"/>
+<stop offset="0.303" style="stop-color:#CED2D0"/>
+<stop offset="0.703" style="stop-color:#909495"/>
+<stop offset="0.8909" style="stop-color:#B7BBBA"/>
+<stop offset="1" style="stop-color:#DEE3E0"/>
 </radialGradient>
 <path d="M49.17,38.176c0,9.961-8.847,18.033-19.17,18.033c-10.32,0-19.17-8.072-19.17-18.033V13.439  C10.83,3.48,19.481,4.6,30,4.6s19.17-1.119,19.17,8.84V38.176z" fill="url(#SVGID_2_)"/>
 <radialGradient cx="17.4282" cy="-12.0474" gradientTransform="matrix(0.9655 0 0 0.9655 13.3019 23.1178)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="26.0563">
-<stop offset="0" style="stop-color:#CBD2D5"/>
-<stop offset="0.3273" style="stop-color:#CBD2D5"/>
-<stop offset="0.8" style="stop-color:#949DA1"/>
-<stop offset="0.9333" style="stop-color:#B9C1C4"/>
-<stop offset="1" style="stop-color:#CBD2D5"/>
+<stop offset="0" style="stop-color:#CED2D0"/>
+<stop offset="0.3273" style="stop-color:#CED2D0"/>
+<stop offset="0.8" style="stop-color:#989D9D"/>
+<stop offset="0.9333" style="stop-color:#BCC1BF"/>
+<stop offset="1" style="stop-color:#CED2D0"/>
 </radialGradient>
 <path d="M49.17,22.729v-9.289c0-9.918-8.58-8.85-19.039-8.84v18.129H49.17z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="45.9238" x2="34.694" y1="7.1699" y2="18.7923">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#B9BFC1"/>
+<stop offset="1" style="stop-color:#BBBFBE"/>
 </linearGradient>
 <path d="M30.719,22.139V5.186c0.744-0.002,1.477-0.01,2.197-0.018  c0.9-0.008,1.781-0.018,2.64-0.018c7.626,0,13.026,0.594,13.026,8.289v8.699H30.719z" fill="url(#SVGID_4_)" fill-opacity="0.15" stroke-opacity="0.15"/>
 <radialGradient cx="17.4297" cy="-12.0474" gradientTransform="matrix(0.9655 0 0 0.9655 13.3019 23.1178)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="26.0574">
-<stop offset="0" style="stop-color:#CBD2D5"/>
-<stop offset="0.3273" style="stop-color:#CBD2D5"/>
-<stop offset="0.8" style="stop-color:#949DA1"/>
-<stop offset="0.9333" style="stop-color:#B9C1C4"/>
-<stop offset="1" style="stop-color:#CBD2D5"/>
+<stop offset="0" style="stop-color:#CED2D0"/>
+<stop offset="0.3273" style="stop-color:#CED2D0"/>
+<stop offset="0.8" style="stop-color:#989D9D"/>
+<stop offset="0.9333" style="stop-color:#BCC1BF"/>
+<stop offset="1" style="stop-color:#CED2D0"/>
 </radialGradient>
 <path d="M10.92,22.729v-9.289c0-9.918,8.579-8.85,19.039-8.84v18.129H10.92z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.0469" x2="28.9546" y1="7.2695" y2="22.1773">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#B9BFC1"/>
+<stop offset="1" style="stop-color:#BBBFBE"/>
 </linearGradient>
 <path d="M11.509,22.139v-8.699c0-7.695,5.398-8.289,13.026-8.289  c0.857,0,1.736,0.01,2.639,0.018c0.719,0.008,1.453,0.016,2.196,0.018v16.953H11.509z" fill="url(#SVGID_6_)" fill-opacity="0.15" stroke-opacity="0.15"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="29.5425" x2="29.5425" y1="4.5718" y2="22.785">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D6D9DB"/>
+<stop offset="1" style="stop-color:#D8DAD9"/>
 </linearGradient>
 <path d="M30.131,4.594c-0.389,0.002-0.781,0.004-1.177,0.004v18.1h1.177V4.594z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="10.9199" x2="49.1699" y1="22.1396" y2="22.1396">
-<stop offset="0" style="stop-color:#737475"/>
+<stop offset="0" style="stop-color:#747474"/>
 <stop offset="0.5" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#737475"/>
+<stop offset="1" style="stop-color:#747474"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="1.178" width="38.25" x="10.92" y="21.551"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.7192" x2="30.7192" y1="4.5718" y2="22.8164">
-<stop offset="0" style="stop-color:#737475"/>
+<stop offset="0" style="stop-color:#747474"/>
 <stop offset="0.9697" style="stop-color:#4E4E4E"/>
 <stop offset="1" style="stop-color:#4D4D4D"/>
 </linearGradient>
 <path d="M31.309,4.594c-0.39,0.002-0.782,0.004-1.178,0.006v18.129h1.178V4.594z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="10.9199" x2="49.1699" y1="23.3164" y2="23.3164">
-<stop offset="0" style="stop-color:#C4C9CB"/>
+<stop offset="0" style="stop-color:#C6C9C8"/>
 <stop offset="0.5" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#C4C9CB"/>
+<stop offset="1" style="stop-color:#C6C9C8"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="1.176" width="38.25" x="10.92" y="22.729"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="30.0015" x2="30.0015" y1="19.0859" y2="4.4878">
-<stop offset="0" style="stop-color:#A2ABAE"/>
-<stop offset="1" style="stop-color:#454244"/>
+<stop offset="0" style="stop-color:#A6AAAA"/>
+<stop offset="1" style="stop-color:#444344"/>
 </linearGradient>
 <path d="M34.609,14.773V4.564c-1.479,0.01-7.738,0.01-9.217,0v10.209c0,2.545,2.063,4.607,4.607,4.607  S34.609,17.318,34.609,14.773z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="30.0005" x2="30.0005" y1="4.4292" y2="18.0821">
-<stop offset="0" style="stop-color:#767578"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<stop offset="0" style="stop-color:#767677"/>
+<stop offset="1" style="stop-color:#222021"/>
 </linearGradient>
 <path d="M30,18.205c-2.216,0-4.019-1.805-4.019-4.021V4.57c0.36,0.002,7.677,0.002,8.039,0v9.613  C34.021,16.4,32.218,18.205,30,18.205L30,18.205z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="29.9995" x2="29.9995" y1="4.3652" y2="16.8027">
-<stop offset="0" style="stop-color:#5B5655"/>
+<stop offset="0" style="stop-color:#595757"/>
 <stop offset="0.3212" style="stop-color:#B5B5B5"/>
-<stop offset="0.6303" style="stop-color:#5A5859"/>
+<stop offset="0.6303" style="stop-color:#595959"/>
 <stop offset="0.8242" style="stop-color:#898889"/>
-<stop offset="1" style="stop-color:#343232"/>
+<stop offset="1" style="stop-color:#333333"/>
 </linearGradient>
 <path d="M30,16.853c-1.784,0-3.235-1.451-3.235-3.235V7.715c0-1.783,1.451-3.237,3.235-3.237  s3.235,1.454,3.235,3.237v5.902C33.235,15.401,31.784,16.853,30,16.853L30,16.853z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="29.9995" x2="29.9995" y1="4.9658" y2="16.2196">
-<stop offset="0" style="stop-color:#3D3A39"/>
+<stop offset="0" style="stop-color:#3C3A3A"/>
 <stop offset="0.3212" style="stop-color:#939393"/>
 <stop offset="0.4788" style="stop-color:#898889"/>
-<stop offset="0.6848" style="stop-color:#2C2A2A"/>
-<stop offset="0.8788" style="stop-color:#5A5859"/>
-<stop offset="1" style="stop-color:#343232"/>
+<stop offset="0.6848" style="stop-color:#2B2B2B"/>
+<stop offset="0.8788" style="stop-color:#595959"/>
+<stop offset="1" style="stop-color:#333333"/>
 </linearGradient>
 <path d="M30,16.265c-1.46,0-2.648-1.188-2.648-2.647V7.715c0-1.46,1.188-2.647,2.648-2.647  s2.648,1.188,2.648,2.647v5.902C32.648,15.076,31.46,16.265,30,16.265L30,16.265z" fill="url(#SVGID_14_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,46 +3,46 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="25.9487" x2="25.9487" y1="6.6265" y2="53.8732">
-<stop offset="0" style="stop-color:#ADF54E"/>
-<stop offset="1" style="stop-color:#007338"/>
+<stop offset="0" style="stop-color:#AAC380"/>
+<stop offset="1" style="stop-color:#234851"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="47.899" width="47.898" x="2" y="6.05"/>
-<path d="M49.898,11.426c-3.863-2.852-8.631-4.563-13.814-4.563c-6.181,0.031-11.98,2.467-16.328,6.858  c-4.348,4.395-6.725,10.215-6.694,16.395c0.067,12.696,10.445,23.02,23.133,23.02h0.123c4.961-0.023,9.662-1.621,13.58-4.518V11.426  z M36.197,32.863c-1.764,0-3.318-1.416-3.592-3.249c0.191-1.826,1.738-3.249,3.576-3.256l0.016-1.342v1.342  c1.857,0,3.381,1.372,3.598,3.217C39.543,31.42,37.994,32.855,36.197,32.863z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M49.898,11.426c-3.863-2.852-8.631-4.563-13.814-4.563c-6.181,0.031-11.98,2.467-16.328,6.858  c-4.348,4.395-6.725,10.215-6.694,16.395c0.067,12.696,10.445,23.02,23.133,23.02h0.123c4.961-0.023,9.662-1.621,13.58-4.518V11.426  z M36.197,32.863c-1.764,0-3.318-1.416-3.592-3.249c0.191-1.826,1.738-3.249,3.576-3.256l0.016-1.342v1.342  c1.857,0,3.381,1.372,3.598,3.217C39.543,31.42,37.994,32.855,36.197,32.863z" fill="#222021" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(1 -0.0051 -0.0051 -1 -262.5146 -282.5771)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="297.1133" x2="297.1133" y1="-292.6729" y2="-336.2676">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.6606" style="stop-color:#8D9799"/>
-<stop offset="1" style="stop-color:#B9C0C2"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.6606" style="stop-color:#919595"/>
+<stop offset="1" style="stop-color:#BCBFBE"/>
 </linearGradient>
 <path d="M36.09,8.372c-12.037,0.062-21.749,9.867-21.687,21.907c0.062,12.04,9.87,21.749,21.908,21.688  C48.35,51.904,58.061,42.096,58,30.056C57.938,18.019,48.129,8.311,36.09,8.372z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(-1 0.0051 0.0051 1 516.8711 1754.7261)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="450.7412" x2="492.9824" y1="-1716.1777" y2="-1716.1777">
-<stop offset="0" style="stop-color:#A0A7A9"/>
+<stop offset="0" style="stop-color:#A3A6A6"/>
 <stop offset="0.5" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A0A7A9"/>
+<stop offset="1" style="stop-color:#A3A6A6"/>
 </linearGradient>
 <path d="M36.307,50.838C24.793,50.895,15.39,41.73,15.089,30.275  c-0.003,0.15-0.009,0.301-0.007,0.455c0.059,11.663,9.562,21.073,21.228,21.012c11.666-0.059,21.076-9.563,21.014-21.229  c0-0.152-0.008-0.303-0.014-0.451C57.129,41.516,47.818,50.779,36.307,50.838z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="36.2002" x2="36.2002" y1="9.3618" y2="51.1027">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M36.092,8.991C24.396,9.052,14.966,18.58,15.026,30.275c0.061,11.696,9.588,21.125,21.283,21.067  c11.697-0.059,21.125-9.586,21.066-21.282C57.316,18.363,47.785,8.934,36.092,8.991z M36.246,39.152  c-4.961,0.023-9.002-3.975-9.029-8.938l0,0c-0.026-4.964,3.977-9.003,8.938-9.031c4.963-0.024,9.004,3.977,9.029,8.939h0.002  C45.211,35.084,41.209,39.125,36.246,39.152z" fill="url(#SVGID_4_)"/>
 <path d="M16.076,34.326c-2.194-10.6,4.263-21.14,14.704-23.995c1.703-0.464,3.46-0.704,5.222-0.715  c8.754-0.044,16.834,5.668,19.646,13.892l0.215,0.626l-10.566,2.889l-0.209-0.512c-1.465-3.585-5.061-5.98-8.945-5.959  c-0.834,0.004-1.666,0.117-2.477,0.338c-4.679,1.28-7.677,5.86-6.972,10.653l0.081,0.545l-10.567,2.889L16.076,34.326z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<polygon fill="#231F20" fill-opacity="0.2" points="46.303,47.168 47.645,48.328 47.645,14.173 49.898,12.222 49.898,9.72 46.303,12.833   " stroke-opacity="0.2"/>
-<polygon fill="#231F20" fill-opacity="0.2" points="45.604,47.168 46.943,48.328 46.943,13.474 49.898,10.821 49.898,9.02 45.604,12.833   " stroke-opacity="0.2"/>
+<polygon fill="#222021" fill-opacity="0.2" points="46.303,47.168 47.645,48.328 47.645,14.173 49.898,12.222 49.898,9.72 46.303,12.833   " stroke-opacity="0.2"/>
+<polygon fill="#222021" fill-opacity="0.2" points="45.604,47.168 46.943,48.328 46.943,13.474 49.898,10.821 49.898,9.02 45.604,12.833   " stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="25.9487" x2="25.9487" y1="5.6982" y2="53.7662">
-<stop offset="0" style="stop-color:#D6FF7A"/>
-<stop offset="1" style="stop-color:#235C08"/>
+<stop offset="0" style="stop-color:#CBD7A2"/>
+<stop offset="1" style="stop-color:#214338"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5_)" points="46.303,47.168 46.303,12.833 49.898,9.72 49.898,6.05 2,6.05 2,53.949 49.898,53.949   49.898,50.281 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="25.9497" x2="25.9497" y1="6.4077" y2="53.0723">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.75" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#56A215"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.75" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#3F7841"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="2.7,53.25 2.7,6.749 49.199,6.749 49.199,9.399 45.604,12.515 45.604,47.486 49.199,50.6   49.199,53.25 "/>
 <path d="M38.686,18.954l-2.051-4.99l-11.784,5.244l0.018,15.921c-1.804-1.18-4.464-1.564-7.167-0.836  c-4.263,1.15-7.018,4.631-6.156,7.768c0.866,3.143,5.021,4.754,9.283,3.605c3.603-0.973,6.097-3.545,6.083-6.293  c-0.012-2.748,0.022-10.209,0-15.607L38.686,18.954z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2165)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-2168.2642" x2="-2168.2642" y1="2145.8682" y2="2119.928">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D2D5D6"/>
+<stop offset="1" style="stop-color:#D3D5D4"/>
 </linearGradient>
 <path d="M39.385,19.654l-2.051-4.991l-11.783,5.245l0.017,15.92c-1.804-1.18-4.464-1.564-7.167-0.834  c-4.263,1.15-7.018,4.629-6.155,7.766c0.866,3.143,5.021,4.754,9.283,3.605c3.602-0.973,6.097-3.543,6.083-6.293  c-0.012-2.748,0.022-10.208,0-15.606L39.385,19.654z" fill="url(#SVGID_7_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_album.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_album.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_album.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,9 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(1 -0.0051 0.0051 1 335.906 -1118.9601)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-311.7573" x2="-311.7573" y1="1119.6411" y2="1175.6382">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.6909" style="stop-color:#808A8C"/>
-<stop offset="1" style="stop-color:#A4ACAE"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.6909" style="stop-color:#848888"/>
+<stop offset="1" style="stop-color:#A7ABAA"/>
 </linearGradient>
 <path d="M29.857,2.002C14.394,2.082,1.922,14.679,2.001,30.143S14.68,58.079,30.145,57.999  C45.605,57.921,58.079,45.321,58,29.858C57.92,14.396,45.322,1.924,29.857,2.002z M30.035,37.199  c-3.977,0.021-7.215-3.187-7.235-7.162c-0.018-3.977,3.185-7.218,7.163-7.237c3.977-0.021,7.217,3.188,7.236,7.163  C37.221,33.938,34.014,37.179,30.035,37.199z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(1 -0.0051 0.0051 1 335.906 -1118.9601)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-311.7583" x2="-311.7583" y1="1135.5718" y2="1159.377">
@@ -15,20 +15,20 @@
 </linearGradient>
 <path d="M29.939,18.001C23.312,18.034,17.967,23.435,18,30.063c0.035,6.625,5.433,11.972,12.061,11.936  c6.627-0.032,11.972-5.432,11.938-12.061C41.966,23.31,36.566,17.966,29.939,18.001z M30.032,36.399  c-3.534,0.018-6.413-2.833-6.433-6.367c-0.016-3.533,2.833-6.414,6.367-6.432c3.533-0.017,6.415,2.833,6.434,6.367  C36.418,33.503,33.566,36.381,30.032,36.399z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(-1 0.0051 -0.0051 -1 -1180.5496 3117.9622)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1253.3975" x2="-1199.1357" y1="3067.8501" y2="3067.8501">
-<stop offset="0" style="stop-color:#A0A7A9"/>
+<stop offset="0" style="stop-color:#A3A6A6"/>
 <stop offset="0.5" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A0A7A9"/>
+<stop offset="1" style="stop-color:#A3A6A6"/>
 </linearGradient>
 <path d="M30.135,56.55C15.348,56.626,3.267,44.851,2.884,30.139  c-0.003,0.191-0.013,0.386-0.011,0.583c0.076,14.98,12.283,27.067,27.267,26.994c14.987-0.079,27.074-12.285,26.995-27.27  c-0.001-0.195-0.013-0.389-0.018-0.582C56.883,44.577,44.925,56.476,30.135,56.55z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1 -0.0051 0.0051 1 335.906 -1118.9601)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-318.1577" x2="-305.3569" y1="1150.27" y2="1150.27">
-<stop offset="0" style="stop-color:#848C8E"/>
+<stop offset="0" style="stop-color:#878B8B"/>
 <stop offset="0.5" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#848C8E"/>
+<stop offset="1" style="stop-color:#878B8B"/>
 </linearGradient>
 <path d="M30.032,36.399c3.534-0.019,6.386-2.896,6.368-6.432c-0.002-0.204-0.014-0.403-0.035-0.6  c-0.285,3.254-3.006,6.014-6.338,6.03c-3.333,0.019-6.082-2.715-6.399-5.967c-0.017,0.199-0.029,0.399-0.028,0.601  C23.619,33.566,26.498,36.417,30.032,36.399z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 347 -1116.5)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-317.0005" x2="-317.0005" y1="1119.7017" y2="1173.7001">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M29.861,2.802C14.838,2.878,2.723,15.118,2.8,30.139c0.079,15.021,12.318,27.134,27.34,27.06  c15.022-0.076,27.136-12.314,27.06-27.335C57.122,14.838,44.881,2.725,29.861,2.802z M30.059,41.539  c-6.373,0.032-11.564-5.106-11.596-11.479h-0.004c-0.033-6.375,5.109-11.565,11.481-11.598c6.375-0.033,11.565,5.105,11.597,11.479  h0.002C41.572,36.315,36.43,41.507,30.059,41.539z" fill="url(#SVGID_5_)"/>
 <path d="M4.15,35.341C1.33,21.725,9.627,8.188,23.037,4.521  c2.186-0.598,4.444-0.907,6.708-0.918c11.248-0.056,21.622,7.281,25.237,17.844l0.275,0.806l-13.574,3.709l-0.267-0.655  c-1.885-4.605-6.5-7.685-11.491-7.657c-1.072,0.005-2.142,0.151-3.18,0.435c-6.014,1.646-9.861,7.526-8.959,13.682l0.103,0.702  L4.32,36.177L4.15,35.341z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -38,29 +38,29 @@
 <polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
 <path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06  c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0  l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204  c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+<stop offset="0" style="stop-color:#93BD66"/>
+<stop offset="1" style="stop-color:#22403B"/>
 </linearGradient>
 <path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729  c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493  c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#A6C87E"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#BCD39A"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4__)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.4667" style="stop-color:#347940"/>
+<stop offset="1" style="stop-color:#173636"/>
 </linearGradient>
 <path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229  c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84  c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5__)"/>
 <rect fill="none" height="30" width="30" y="0.487"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_empty.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_empty.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_empty.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,17 +3,17 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="0" y2="62.1923">
-<stop offset="0" style="stop-color:#942D2C"/>
-<stop offset="1" style="stop-color:#3C1212"/>
+<stop offset="0" style="stop-color:#754B50"/>
+<stop offset="1" style="stop-color:#2F1F24"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="4.5098" y2="55.5135">
-<stop offset="0" style="stop-color:#A5A7AA"/>
+<stop offset="0" style="stop-color:#A7A8A9"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M29.999,55.926c-14.294,0-25.925-11.631-25.925-25.925  c0-14.296,11.631-25.928,25.925-25.928c14.296,0,25.927,11.632,25.927,25.928C55.926,44.295,44.295,55.926,29.999,55.926  L29.999,55.926z" fill="url(#SVGID_2_)" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30.0005" x2="30.0005" y1="5.1992" y2="54.8236">
-<stop offset="0" style="stop-color:#707173"/>
+<stop offset="0" style="stop-color:#717172"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M29.999,55.225c-13.908,0-25.224-11.315-25.224-25.224  c0-13.909,11.315-25.227,25.224-25.227c13.91,0,25.227,11.317,25.227,25.227C55.226,43.909,43.909,55.225,29.999,55.225  L29.999,55.225z" fill="url(#SVGID_3_)" fill-opacity="0.4" stroke-opacity="0.4"/>
@@ -23,9 +23,9 @@
 </linearGradient>
 <circle cx="30" cy="29.3" fill="url(#SVGID_4_)" r="24.525"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="29.9995" x2="29.9995" y1="5.1943" y2="52.5953">
-<stop offset="0" style="stop-color:#F4F5F5"/>
+<stop offset="0" style="stop-color:#F4F5F4"/>
 <stop offset="0.7818" style="stop-color:#CCCBCB"/>
-<stop offset="1" style="stop-color:#D0D0D1"/>
+<stop offset="1" style="stop-color:#D0D1D1"/>
 </linearGradient>
 <circle cx="30" cy="29.3" fill="url(#SVGID_5_)" r="23.477"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="29.9995" x2="29.9995" y1="48.4443" y2="9.628">
@@ -36,16 +36,16 @@
 <radialGradient cx="36.7554" cy="71.5244" gradientTransform="matrix(0.9587 0 0 0.9587 -5.2375 -39.2709)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="19.2764">
 <stop offset="0" style="stop-color:#636363"/>
 <stop offset="0.3333" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#1B1C1C"/>
+<stop offset="1" style="stop-color:#1B1B1C"/>
 </radialGradient>
 <circle cx="30" cy="29.3" fill="url(#SVGID_7_)" r="18.48"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="29.9995" x2="29.9995" y1="42.2959" y2="14.7661">
 <stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#1B1C1C"/>
+<stop offset="1" style="stop-color:#1B1B1C"/>
 </linearGradient>
 <circle cx="30" cy="29.3" fill="url(#SVGID_8_)" r="14.393"/>
 <radialGradient cx="36.6816" cy="72.1777" gradientTransform="matrix(0.9587 0 0 0.9587 -5.2375 -39.2709)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="14.4318">
-<stop offset="0" style="stop-color:#B3B3B4"/>
+<stop offset="0" style="stop-color:#B3B4B4"/>
 <stop offset="1" style="stop-color:#696969"/>
 </radialGradient>
 <path d="M41.586,37.812l-4.756-4.216H24.035l-5.45,4.448c2.632,3.429,6.759,5.649,11.414,5.649  C34.758,43.693,38.967,41.372,41.586,37.812z" fill="url(#SVGID_9_)" fill-opacity="0.5" stroke-opacity="0.5"/>
@@ -63,40 +63,40 @@
 <path d="M29.999,19.973c-5.151,0-9.326,4.176-9.326,9.327s4.175,9.327,9.326,9.327  c5.15,0,9.328-4.176,9.328-9.327S35.149,19.973,29.999,19.973z M29.999,36.636c-4.052,0-7.335-3.284-7.335-7.336  c0-4.053,3.283-7.337,7.335-7.337s7.339,3.284,7.339,7.337C37.338,33.352,34.051,36.636,29.999,36.636z" fill="url(#SVGID_11_)" fill-opacity="0.15" stroke-opacity="0.15"/>
 <path d="M50.342,18.256c-11.463,0-20.624,6.636-24.617,8.388c-3.667,1.609-6.428,3.301-14.676,3.301  C2.8,29.944,0,26.088,0,26.088v2.616v1.69v4.475v0.902v3.607v3.049v4.244v0.342v1.838v4.188c0,0,10.143-18.252,19.182-22.08  c7.153-3.028,10.977-2.932,18.569-0.451C45.344,32.989,60,55.234,60,55.234v-9.348v-0.644v-0.376v-4.318v-4.553v-4.68v-1.063v-0.497  v-6.088v-3.901C60,19.768,58.35,18.186,50.342,18.256z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="2.6997" x2="56.2554" y1="35.752" y2="35.752">
-<stop offset="0" style="stop-color:#C82128"/>
-<stop offset="0.2" style="stop-color:#C82128"/>
-<stop offset="1" style="stop-color:#801517"/>
+<stop offset="0" style="stop-color:#965359"/>
+<stop offset="0.2" style="stop-color:#965359"/>
+<stop offset="1" style="stop-color:#60353F"/>
 </linearGradient>
 <path d="M0,27.707v20.148c0,0,11.618-14.605,15.436-16.507s9.159-3.792,9.159-3.792s6.39-1.127,11.126-0.15  C40.457,28.384,60,43.871,60,43.871V28.76c0,0-7.363-5.111-13.228-5.111S30.27,25.04,27.076,25.903  c-3.194,0.862-2.255,0.285-10.149,3.383S0,27.707,0,27.707z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="4.0327" x2="64.4873" y1="24.0771" y2="24.0771">
-<stop offset="0" style="stop-color:#EF4E59"/>
-<stop offset="0.0848" style="stop-color:#EF4E59"/>
-<stop offset="1" style="stop-color:#CD2027"/>
+<stop offset="0" style="stop-color:#BF8A7E"/>
+<stop offset="0.0848" style="stop-color:#BF8A7E"/>
+<stop offset="1" style="stop-color:#995459"/>
 </linearGradient>
 <path d="M0,25.091c0,0,2.8,3.855,11.049,3.855c8.248,0,11.009-1.69,14.676-3.3  c3.993-1.752,13.154-8.388,24.617-8.388C58.35,17.188,60,18.77,60,18.77v3.902c0,0-5.202-2.476-9.635-2.476  c-11.072,0-20.996,4.109-24.212,5.843c-3.284,1.77-12.304,4.858-16.176,4.858c-4.036,0-9.978-1.5-9.978-1.5V25.091z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="2.6997" x2="56.2554" y1="39.9023" y2="39.9023">
-<stop offset="0" style="stop-color:#C82128"/>
-<stop offset="0.2" style="stop-color:#C82128"/>
-<stop offset="1" style="stop-color:#801517"/>
+<stop offset="0" style="stop-color:#965359"/>
+<stop offset="0.2" style="stop-color:#965359"/>
+<stop offset="1" style="stop-color:#60353F"/>
 </linearGradient>
 <path d="M0,50.711c0,0,10.143-16.921,19.182-20.748c7.153-3.029,10.977-2.933,18.569-0.451  C45.344,31.992,60,52.908,60,52.908v-8.662c0,0-8.652-9.266-13.979-12.78c-5.95-3.925-14.173-4.938-19.245-4.46  c-3.7,0.349-11.979,3.563-17.667,8.82C4.345,40.229,0,45.675,0,45.675V50.711z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="4.0327" x2="64.4873" y1="36.2725" y2="36.2725">
-<stop offset="0" style="stop-color:#EF4E59"/>
-<stop offset="0.0848" style="stop-color:#EF4E59"/>
-<stop offset="1" style="stop-color:#CD2027"/>
+<stop offset="0" style="stop-color:#BF8A7E"/>
+<stop offset="0.0848" style="stop-color:#BF8A7E"/>
+<stop offset="1" style="stop-color:#995459"/>
 </linearGradient>
 <path d="M0,46.017c0,0,10.175-12.62,19.182-16.521c6.297-2.728,10.858-3.021,18.569-1.347  C44.894,29.699,60,44.889,60,44.889v-5.338c0,0-8.594-6.087-13.979-9.514c-5.601-3.563-14.173-3.803-19.245-3.326  c-3.7,0.349-12.708,4.342-17.667,7.988C3.883,38.54,0,41.431,0,41.431V46.017z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="2.6997" x2="56.2554" y1="27.4854" y2="27.4854">
-<stop offset="0" style="stop-color:#C82128"/>
-<stop offset="0.2" style="stop-color:#C82128"/>
-<stop offset="0.3968" style="stop-color:#801517"/>
-<stop offset="1" style="stop-color:#801517"/>
+<stop offset="0" style="stop-color:#965359"/>
+<stop offset="0.2" style="stop-color:#965359"/>
+<stop offset="0.3968" style="stop-color:#60353F"/>
+<stop offset="1" style="stop-color:#60353F"/>
 </linearGradient>
 <path d="M26.153,26.039c-3.284,1.77-12.304,4.858-16.176,4.858c-4.036,0-9.978-1.5-9.978-1.5v5.376  c0,0,2.909-0.733,8.338-1.645c4.005-0.672,14.265-5.91,18.889-7.038c4.623-1.127,17.041-1.691,23.625,0.384  C57.504,28.571,60,30.319,60,30.319v-7.647c0,0-5.202-2.476-9.635-2.476C39.293,20.196,29.369,24.306,26.153,26.039z" fill="url(#SVGID_16_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="4.0327" x2="64.4873" y1="31.3799" y2="31.3799">
-<stop offset="0" style="stop-color:#EF4E59"/>
-<stop offset="0.0848" style="stop-color:#EF4E59"/>
-<stop offset="1" style="stop-color:#CD2027"/>
+<stop offset="0" style="stop-color:#BF8A7E"/>
+<stop offset="0.0848" style="stop-color:#BF8A7E"/>
+<stop offset="1" style="stop-color:#995459"/>
 </linearGradient>
 <path d="M50.852,25.195c-6.664-1.803-19.002-0.231-23.625,0.896c-4.624,1.128-15.61,6.444-18.889,7.038  C2.922,34.109,0,33.871,0,33.871v4.512c0,0,13.228-7.357,24.221-11.104c3.269-1.113,6.47-1.525,9.133-1.525  c5.98,0,8.374,0.453,13.908,2.104C54.816,30.113,60,34.999,60,34.999v-5.742C59.371,28.858,57.523,26.999,50.852,25.195z" fill="url(#SVGID_17_)"/>
 <path d="M42.354,41.455c0,0.924-0.567,1.772-1.367,2.389c-0.78,0.615-1.807,0.984-2.71,0.984  c-0.574,0-1.108-0.184-1.478-0.492c-0.39-0.308-0.616-0.76-0.616-1.293c0-0.842,0.574-1.684,1.355-2.299  c0.779-0.637,1.765-1.047,2.586-1.047c0.719,0,1.305,0.078,1.675,0.426V24.313h0.555c0.042,0.739,0.151,1.776,1.034,2.576  c1.006,0.883,1.93,1.766,2.566,2.565c0.841,1.048,1.437,2.36,1.437,3.694c0,0.678-0.103,1.376-0.288,2.033  c0.35,0.697,0.534,1.437,0.534,2.278c0,1.437-0.416,2.622-1.011,3.606h-0.334c0.432-0.656,0.934-2.211,0.893-3.196  c-0.041-1.088-0.123-1.724-0.82-2.587c-0.801-0.984-2.861-2.016-4.011-2.815V41.455z M46.857,33.354  c-0.041-1.088-0.574-1.929-1.272-2.792c-0.8-0.984-2.081-1.82-3.23-2.478c0.042,1.478,0.993,2.991,1.876,3.792  c1.006,0.883,1.498,1.354,2.094,2.094c0.185,0.225,0.325,0.49,0.469,0.717C46.834,34.256,46.878,33.703,46.857,33.354z" fill-opacity="0.3" stroke-opacity="0.3"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_player.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_player.svg	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientTransform="matrix(1 -0.0051 0.0051 1 335.906 -1118.9601)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-311.7573" x2="-311.7573" y1="1119.6411" y2="1175.6382">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.6909" style="stop-color:#808A8C"/>
-<stop offset="1" style="stop-color:#A4ACAE"/>
-</linearGradient>
-<path d="M29.857,2.002C14.394,2.082,1.922,14.679,2.001,30.143S14.68,58.079,30.145,57.999  C45.605,57.921,58.079,45.321,58,29.858C57.92,14.396,45.322,1.924,29.857,2.002z M30.035,37.199  c-3.977,0.021-7.215-3.187-7.235-7.162c-0.018-3.977,3.185-7.218,7.163-7.237c3.977-0.021,7.217,3.188,7.236,7.163  C37.221,33.938,34.014,37.179,30.035,37.199z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientTransform="matrix(1 -0.0051 0.0051 1 335.906 -1118.9601)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-311.7583" x2="-311.7583" y1="1135.5718" y2="1159.377">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CFCFCF"/>
-</linearGradient>
-<path d="M29.939,18.001C23.312,18.034,17.967,23.435,18,30.063c0.035,6.625,5.433,11.972,12.061,11.936  c6.627-0.032,11.972-5.432,11.938-12.061C41.966,23.31,36.566,17.966,29.939,18.001z M30.032,36.399  c-3.534,0.018-6.413-2.833-6.433-6.367c-0.016-3.533,2.833-6.414,6.367-6.432c3.533-0.017,6.415,2.833,6.434,6.367  C36.418,33.503,33.566,36.381,30.032,36.399z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientTransform="matrix(-1 0.0051 -0.0051 -1 -1180.5496 3117.9622)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1253.3975" x2="-1199.1357" y1="3067.8501" y2="3067.8501">
-<stop offset="0" style="stop-color:#A0A7A9"/>
-<stop offset="0.5" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A0A7A9"/>
-</linearGradient>
-<path d="M30.135,56.55C15.348,56.626,3.267,44.851,2.884,30.139  c-0.003,0.191-0.013,0.386-0.011,0.583c0.076,14.98,12.283,27.067,27.267,26.994c14.987-0.079,27.074-12.285,26.995-27.27  c-0.001-0.195-0.013-0.389-0.018-0.582C56.883,44.577,44.925,56.476,30.135,56.55z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientTransform="matrix(1 -0.0051 0.0051 1 335.906 -1118.9601)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-318.1577" x2="-305.3569" y1="1150.27" y2="1150.27">
-<stop offset="0" style="stop-color:#848C8E"/>
-<stop offset="0.5" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#848C8E"/>
-</linearGradient>
-<path d="M30.032,36.399c3.534-0.019,6.386-2.896,6.368-6.432c-0.002-0.204-0.014-0.403-0.035-0.6  c-0.285,3.254-3.006,6.014-6.338,6.03c-3.333,0.019-6.082-2.715-6.399-5.967c-0.017,0.199-0.029,0.399-0.028,0.601  C23.619,33.566,26.498,36.417,30.032,36.399z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 347 -1116.5)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-317.0005" x2="-317.0005" y1="1119.7017" y2="1173.7001">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
-</linearGradient>
-<path d="M29.861,2.802C14.838,2.878,2.723,15.118,2.8,30.139c0.079,15.021,12.318,27.134,27.34,27.06  c15.022-0.076,27.136-12.314,27.06-27.335C57.122,14.838,44.881,2.725,29.861,2.802z M30.059,41.539  c-6.373,0.032-11.564-5.106-11.596-11.479h-0.004c-0.033-6.375,5.109-11.565,11.481-11.598c6.375-0.033,11.565,5.105,11.597,11.479  h0.002C41.572,36.315,36.43,41.507,30.059,41.539z" fill="url(#SVGID_5_)"/>
-<path d="M4.15,35.341C1.33,21.725,9.627,8.188,23.037,4.521  c2.186-0.598,4.444-0.907,6.708-0.918c11.248-0.056,21.622,7.281,25.237,17.844l0.275,0.806l-13.574,3.709l-0.267-0.655  c-1.885-4.605-6.5-7.685-11.491-7.657c-1.072,0.005-2.142,0.151-3.18,0.435c-6.014,1.646-9.861,7.526-8.959,13.682l0.103,0.702  L4.32,36.177L4.15,35.341z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<rect fill="none" height="60" width="60"/>
-</g>
-<g transform="matrix(1 0 0 1 30 30)">
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<path d="M15,29.999C6.729,29.999,0,23.271,0,15S6.729,0.001,15,0.001c8.271,0,15,6.729,15,14.999  S23.271,29.999,15,29.999L15,29.999z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientTransform="matrix(0.5 0 0 0.5 579.9604 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-1129.9209" x2="-1129.9209" y1="3388.3521" y2="3444.3481">
-<stop offset="0" style="stop-color:#D5F5B5"/>
-<stop offset="1" style="stop-color:#40AD00"/>
-</linearGradient>
-<path d="M15,28.999C7.279,28.999,1,22.72,1,15C1,7.281,7.279,1.001,15,1.001c7.718,0,14,6.28,14,13.999  C29,22.72,22.718,28.999,15,28.999L15,28.999z" fill="url(#SVGID_1__)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2179.0005" x2="-2179.0005" y1="2906.6362" y2="2878.8359">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
-</linearGradient>
-<path d="M28.599,15c0,7.512-6.09,13.6-13.599,13.6C7.486,28.6,1.4,22.512,1.4,15C1.4,7.491,7.486,1.4,15,1.4  C22.509,1.4,28.599,7.491,28.599,15z" fill="url(#SVGID_2__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="16.5117" x2="16.5117" y1="21.3633" y2="7.2163">
-<stop offset="0" style="stop-color:#82DA3B"/>
-<stop offset="1" style="stop-color:#11470A"/>
-</linearGradient>
-<polygon fill="url(#SVGID_3__)" points="10.353,7.134 22.671,14.21 10.353,21.429 "/>
-<polygon fill="#FFFFFF" points="11.11,8.444 22.008,14.734 11.11,21.026 "/>
-</g>
-<g>
-<polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
-<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06  c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0  l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204  c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
-</linearGradient>
-<path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729  c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493  c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1___)"/>
-<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2___)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
-<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3___" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
-</linearGradient>
-<path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3___)"/>
-<linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
-</linearGradient>
-<polygon fill="url(#SVGID_4__)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
-</linearGradient>
-<path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229  c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84  c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5__)"/>
-<rect fill="none" height="30" width="30" y="0.487"/>
-</g>
-</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_shop.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_shop.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_shop.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -16,17 +16,17 @@
 </linearGradient>
 <circle cx="4.221" cy="8.071" fill="url(#SVGID_2_)" r="2.521"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="13.501" x2="56.4315" y1="47.3521" y2="47.3521">
-<stop offset="0" style="stop-color:#878A8C"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#757D80"/>
-<stop offset="1" style="stop-color:#959A9C"/>
+<stop offset="0" style="stop-color:#898A8B"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#787B7D"/>
+<stop offset="1" style="stop-color:#979A9A"/>
 </linearGradient>
 <path d="M55.23,45.774h-37.9l-4.018,1.579l0,0c0,0.298,0.074,0.595,0.242,0.854  c0.291,0.45,0.789,0.722,1.326,0.722h40.35c0.869,0,1.576-0.706,1.576-1.576C56.807,46.481,56.1,45.774,55.23,45.774z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.3105" x2="19.0975" y1="41.4453" y2="43.2125">
-<stop offset="0" style="stop-color:#878A8C"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#757D80"/>
-<stop offset="1" style="stop-color:#959A9C"/>
+<stop offset="0" style="stop-color:#898A8B"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#787B7D"/>
+<stop offset="1" style="stop-color:#979A9A"/>
 </linearGradient>
 <path d="M13.313,47.354l4.018-1.579l3.189-7.016c0.359-0.792,0.012-1.729-0.783-2.088  c-0.795-0.361-1.73-0.01-2.088,0.784l-4.203,9.247C13.348,46.908,13.313,47.13,13.313,47.354L13.313,47.354z" fill="url(#SVGID_4_)"/>
 <path d="M19.371,36.56c-0.695-0.131-1.418,0.219-1.723,0.894l-1.156,2.541c0.662,1.489,1.262,2.443,1.791,2.813  c0.1,0.073,0.205,0.126,0.307,0.191l1.805-3.968C20.123,38.458,19.764,37.605,19.371,36.56z" fill-opacity="0.1" stroke-opacity="0.1"/>
@@ -46,17 +46,17 @@
 </radialGradient>
 <path d="M27.729,50.506c0,2.179-1.766,3.945-3.943,3.945c-2.182,0-3.945-1.766-3.945-3.945  c0-2.178,1.764-3.943,3.945-3.943C25.963,46.563,27.729,48.328,27.729,50.506z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="6.3311" x2="6.3311" y1="6.4199" y2="10.0271">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.4606" style="stop-color:#BDC2C4"/>
-<stop offset="0.7333" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.4606" style="stop-color:#BFC2C1"/>
+<stop offset="0.7333" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M8.424,6.39H5.061c-0.928,0-1.682,0.753-1.682,1.681s0.754,1.681,1.682,1.681h2.061l2.162-2.994  C9.049,6.547,8.768,6.39,8.424,6.39z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="23.7832" x2="23.7832" y1="48.2568" y2="52.9256">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+<stop offset="0" style="stop-color:#E7E8E7"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M23.785,52.873c-1.307,0-2.367-1.063-2.367-2.367c0-1.305,1.061-2.366,2.367-2.366  c1.303,0,2.363,1.061,2.363,2.366C26.148,51.811,25.088,52.873,23.785,52.873L23.785,52.873z" fill="url(#SVGID_8_)"/>
 <path d="M41.369,48.929h10.576c-0.4-1.333-1.289-2.452-2.459-3.155h-5.66C42.658,46.478,41.766,47.596,41.369,48.929z  " fill-opacity="0.1" stroke-opacity="0.1"/>
@@ -73,25 +73,25 @@
 </radialGradient>
 <circle cx="46.657" cy="50.506" fill="url(#SVGID_10_)" r="3.944"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="46.6563" x2="46.6563" y1="48.1914" y2="52.8588">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+<stop offset="0" style="stop-color:#E7E8E7"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M46.656,52.873c-1.305,0-2.365-1.063-2.365-2.367c0-1.305,1.061-2.366,2.365-2.366  s2.365,1.061,2.365,2.366C49.021,51.811,47.961,52.873,46.656,52.873L46.656,52.873z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="30.1436" x2="30.1436" y1="10.1616" y2="42.5465">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.4606" style="stop-color:#BDC2C4"/>
-<stop offset="0.7333" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.4606" style="stop-color:#BFC2C1"/>
+<stop offset="0.7333" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M12.004,13.339L10.1,8.109c0-0.012-0.514-1.72-1.676-1.72H5.061c-0.928,0-1.682,0.753-1.682,1.681  s0.754,1.681,1.682,1.681h2.061l9.359,25.72c0,0,1.762,5.382,2.742,6.068c0.84,0.622,1.873,0.995,3,0.995h28.58  c2.785,0,5.043-2.258,5.043-5.043l1.063-21.015L12.004,13.339z M22.832,38.593c-0.563,0.179-1.16-0.135-1.338-0.693L15.67,19.448  c-0.178-0.56,0.133-1.157,0.693-1.335c0.561-0.177,1.158,0.133,1.336,0.694l5.826,18.453C23.701,37.818,23.393,38.417,22.832,38.593  z M28.547,38.774c-0.563,0.178-1.158-0.133-1.338-0.694l-5.826-18.451c-0.176-0.561,0.137-1.157,0.695-1.334  c0.563-0.176,1.16,0.131,1.336,0.694l5.828,18.452C29.416,38,29.105,38.597,28.547,38.774z M34.361,38.959  c-0.563,0.178-1.158-0.133-1.338-0.694l-5.826-18.451c-0.176-0.56,0.137-1.158,0.697-1.336s1.158,0.133,1.332,0.695l5.83,18.451  C35.23,38.184,34.92,38.781,34.361,38.959z M39.584,39.125c-0.563,0.178-1.16-0.133-1.338-0.695l-5.824-18.451  c-0.176-0.56,0.131-1.157,0.695-1.335c0.561-0.178,1.158,0.133,1.334,0.693l5.824,18.453C40.453,38.352,40.146,38.95,39.584,39.125z   M45.299,39.308c-0.563,0.177-1.158-0.135-1.336-0.695l-5.826-18.452c-0.176-0.56,0.135-1.157,0.695-1.334  c0.561-0.177,1.158,0.133,1.336,0.694l5.826,18.453C46.17,38.533,45.857,39.13,45.299,39.308z M50.918,39.493  c-0.563,0.178-1.16-0.136-1.338-0.695l-5.824-18.451c-0.178-0.56,0.131-1.157,0.691-1.335c0.563-0.177,1.158,0.133,1.338,0.694  l5.826,18.453C51.785,38.716,51.475,39.314,50.918,39.493z M52.553,28.654c-0.561,0.177-1.16-0.134-1.336-0.695l-2.336-7.35  c-0.178-0.56,0.133-1.158,0.695-1.335c0.561-0.177,1.158,0.135,1.334,0.694l2.336,7.351C53.424,27.879,53.111,28.476,52.553,28.654z  " fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="30.1436" x2="30.1436" y1="10.1616" y2="42.5465">
-<stop offset="0" style="stop-color:#ECF3F5"/>
-<stop offset="0.4606" style="stop-color:#D3D9DB"/>
-<stop offset="0.7333" style="stop-color:#ABB5BA"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#EFF2F0"/>
+<stop offset="0.4606" style="stop-color:#D5D9D7"/>
+<stop offset="0.7333" style="stop-color:#B0B5B5"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M12.004,13.339L10.1,8.109c0-0.012-0.514-1.72-1.676-1.72H5.061c-0.928,0-1.682,0.753-1.682,1.681  s0.754,1.681,1.682,1.681h2.061l9.359,25.72c0,0,1.762,5.382,2.742,6.068c0.84,0.622,1.873,0.995,3,0.995h28.58  c2.785,0,5.043-2.258,5.043-5.043l0.023-0.497c0.008-0.107,0.01-0.208,0.018-0.291l0.043-0.884l0.268-5.254v-0.002l0.025-0.516  l0.686-13.571L12.004,13.339z M55.057,37.452c0,2.386-1.91,4.295-4.254,4.295h-28.58c-0.914,0-1.789-0.291-2.529-0.839  c-0.492-0.394-1.668-3.25-2.461-5.68L7.672,8.963H5.061c-0.492,0-0.893-0.401-0.893-0.893s0.4-0.892,0.893-0.892h3.363  c0.393,0,0.756,0.696,0.885,1.044v0.015l2.129,5.854l44.645,3.118L55.057,37.452z" fill="url(#SVGID_13_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -100,29 +100,29 @@
 <polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
 <path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06  c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0  l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204  c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+<stop offset="0" style="stop-color:#93BD66"/>
+<stop offset="1" style="stop-color:#22403B"/>
 </linearGradient>
 <path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729  c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493  c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#A6C87E"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#BCD39A"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4__)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.4667" style="stop-color:#347940"/>
+<stop offset="1" style="stop-color:#173636"/>
 </linearGradient>
 <path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229  c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84  c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5__)"/>
 <rect fill="none" height="30" width="30" y="0.487"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mycard.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mycard.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mycard.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -22,13 +22,13 @@
 <rect fill="#020202" fill-opacity="0.1" height="23.692" stroke-opacity="0.1" width="21.539" x="7.744" y="19.04"/>
 <rect fill="#FFFFFF" height="23.691" width="21.539" x="7.744" y="17.604"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="18.5137" x2="18.5137" y1="40.6636" y2="18.4058">
-<stop offset="0" style="stop-color:#3FA8F4"/>
-<stop offset="1" style="stop-color:#8DC8E1"/>
+<stop offset="0" style="stop-color:#75B1BE"/>
+<stop offset="1" style="stop-color:#A6C8C1"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="22.258" width="20.102" x="8.463" y="18.321"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="9.8984" x2="25.6941" y1="29.7617" y2="29.7617">
-<stop offset="0" style="stop-color:#146BAF"/>
-<stop offset="1" style="stop-color:#013B77"/>
+<stop offset="0" style="stop-color:#425A81"/>
+<stop offset="1" style="stop-color:#242954"/>
 </linearGradient>
 <path d="M24.939,34.517c-0.469-0.243-2.283-0.901-3.256-1.267l-0.041-0.016h-0.002  c-0.01-0.004-0.018-0.007-0.027-0.011l-0.549-0.222c-0.389-0.44-0.346-1.455-0.129-1.794c0.045-0.067,0.084-0.136,0.127-0.205  h-0.008c0.314-0.512,0.582-1.021,0.797-1.498c0.389,0.135,0.889-0.228,1.137-0.839c0.258-0.635,0.146-1.292-0.25-1.47  c-0.021-0.01-0.045-0.011-0.066-0.018c0-0.002,0-0.002,0-0.002c0.051-0.199,0.072-0.318,0.072-0.318  c0.682-3.054-0.801-5.475-4.391-5.595c-1.473,0-2.182,0.672-2.73,1.373c-0.893,0.138-2.303,0.952-1.307,4.526  c-0.037,0.007-0.076,0.013-0.111,0.027c-0.4,0.169-0.523,0.82-0.279,1.458c0.244,0.636,0.764,1.019,1.162,0.85  c0.023-0.011,0.045-0.028,0.066-0.042c0.219,0.491,0.49,1.018,0.813,1.547h-0.002c0.014,0.025,0.029,0.05,0.045,0.073  c0.002,0.005,0.004,0.01,0.008,0.013v0.003c0.025,0.038,0.049,0.077,0.072,0.116c0.207,0.324,0.252,1.255-0.08,1.723l-0.572,0.249  c-0.961,0.376-2.814,1.052-3.35,1.337c-0.832,0.442-2.189,1.455-2.189,3.743h17.23C27.129,35.972,25.578,34.85,24.939,34.517z   M22.619,27.168c-0.021-0.006-0.041-0.012-0.063-0.013c-0.029-0.005-0.055-0.012-0.084-0.017c-0.006-0.002-0.006-0.002-0.012-0.003  C22.514,27.146,22.566,27.156,22.619,27.168z M14.322,27.162c0.006-0.006,0.018-0.016,0.023-0.022  c0.002,0.006,0.002,0.01,0.006,0.016C14.34,27.156,14.332,27.161,14.322,27.162z" fill="url(#SVGID_5_)"/>
 <rect fill="#020202" fill-opacity="0.2" height="0.718" stroke-opacity="0.2" width="18.668" x="33.59" y="21.912"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,35 +3,35 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="26.4722" x2="33.4727" y1="32.4502" y2="32.4502">
-<stop offset="0" style="stop-color:#686E70"/>
-<stop offset="0.0788" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#6A6C6E"/>
+<stop offset="0.0788" style="stop-color:#ABB0AF"/>
 <stop offset="0.3152" style="stop-color:#FFFFFF"/>
-<stop offset="0.7333" style="stop-color:#989C9E"/>
-<stop offset="1" style="stop-color:#C6CBCC"/>
+<stop offset="0.7333" style="stop-color:#9A9C9C"/>
+<stop offset="1" style="stop-color:#C8CAC9"/>
 </linearGradient>
 <path d="M26.472,10.75v42.014c0,0.766,0.626,1.387,1.399,1.387h4.201c0.773,0,1.4-0.621,1.4-1.387V10.75  H26.472z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.9995" x2="29.9995" y1="5.6274" y2="33.0842">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="1" style="stop-color:#222021"/>
 </linearGradient>
 <path d="M57.893,7.582c-0.316-1.029-1.268-1.732-2.346-1.732H30.322h-0.35H4.453  c-1.078,0-2.029,0.703-2.345,1.732c-0.316,1.029,0.078,2.145,0.971,2.747l23.394,22.586v-9.161L12.455,10.75h17.518h0.35h17.223  L33.473,23.975v9.074l23.449-22.72C57.814,9.727,58.207,8.611,57.893,7.582z" fill="url(#SVGID_2_)"/>
 <path d="M2.108,8.384C2.423,7.354,3.375,6.55,4.453,6.55h25.52h0.35h25.225  c1.078,0,2.029,0.804,2.346,1.834c0.033,0.106,0.053,0.214,0.07,0.322c0.063-0.368,0.043-0.751-0.07-1.124  c-0.316-1.029-1.268-1.732-2.346-1.732H30.322h-0.35H4.453c-1.078,0-2.029,0.703-2.345,1.732C1.993,7.955,1.975,8.338,2.037,8.706  C2.054,8.598,2.075,8.49,2.108,8.384z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
 <polygon fill="#FFFFFF" fill-opacity="0.6" points="34.184,24.717 48.693,10.742 47.58,10.742 34.184,23.428 " stroke-opacity="0.6"/>
 <polygon fill="#FFFFFF" fill-opacity="0.6" points="11.317,10.753 25.783,24.498 25.783,23.216 12.451,10.753 " stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.9995" x2="29.9995" y1="6.481" y2="32.1174">
-<stop offset="0" style="stop-color:#EBECF0"/>
-<stop offset="0.5" style="stop-color:#BBBCBF"/>
-<stop offset="0.5" style="stop-color:#A4A5A8"/>
-<stop offset="1" style="stop-color:#C8CACC"/>
+<stop offset="0" style="stop-color:#EDEFEE"/>
+<stop offset="0.5" style="stop-color:#BCBEBE"/>
+<stop offset="0.5" style="stop-color:#A5A6A7"/>
+<stop offset="1" style="stop-color:#C9CBCA"/>
 </linearGradient>
 <path d="M34.172,24.738L49.715,10.05H10.251l15.521,14.472v7.094L3.479,9.755  C2.829,9.315,2.55,8.527,2.777,7.787s0.9-1.237,1.676-1.237h51.094c0.775,0,1.449,0.497,1.676,1.237s-0.053,1.528-0.693,1.962  L34.172,31.855V24.738z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="45.7363" x2="45.7363" y1="7.9927" y2="30.6518">
-<stop offset="0" style="stop-color:#68696B"/>
+<stop offset="0" style="stop-color:#69696A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M57.148,7.602c-0.129,0.295-0.336,0.557-0.619,0.748L34.172,30.455v1.4L56.529,9.749  c0.641-0.434,0.92-1.222,0.693-1.962C57.203,7.723,57.176,7.662,57.148,7.602z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.2354" x2="14.2354" y1="7.9922" y2="30.666">
-<stop offset="0" style="stop-color:#68696B"/>
+<stop offset="0" style="stop-color:#69696A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M2.851,7.6C2.825,7.662,2.797,7.723,2.777,7.787C2.55,8.527,2.829,9.315,3.479,9.755l22.293,21.86  v-1.4L3.479,8.354C3.191,8.16,2.982,7.896,2.851,7.6z" fill="url(#SVGID_5_)"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,35 +3,35 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="26.4722" x2="33.4727" y1="32.4502" y2="32.4502">
-<stop offset="0" style="stop-color:#686E70"/>
-<stop offset="0.0788" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#6A6C6E"/>
+<stop offset="0.0788" style="stop-color:#ABB0AF"/>
 <stop offset="0.3152" style="stop-color:#FFFFFF"/>
-<stop offset="0.7333" style="stop-color:#989C9E"/>
-<stop offset="1" style="stop-color:#C6CBCC"/>
+<stop offset="0.7333" style="stop-color:#9A9C9C"/>
+<stop offset="1" style="stop-color:#C8CAC9"/>
 </linearGradient>
 <path d="M26.472,10.75v42.014c0,0.766,0.626,1.387,1.399,1.387h4.201c0.773,0,1.4-0.621,1.4-1.387V10.75  H26.472z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.9995" x2="29.9995" y1="5.6274" y2="33.0842">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="1" style="stop-color:#222021"/>
 </linearGradient>
 <path d="M57.893,7.582c-0.316-1.029-1.268-1.732-2.346-1.732H30.322h-0.35H4.453  c-1.078,0-2.029,0.703-2.345,1.732c-0.316,1.029,0.078,2.145,0.971,2.747l23.394,22.586v-9.161L12.455,10.75h17.518h0.35h17.223  L33.473,23.975v9.074l23.449-22.72C57.814,9.727,58.207,8.611,57.893,7.582z" fill="url(#SVGID_2_)"/>
 <path d="M2.108,8.384C2.423,7.354,3.375,6.55,4.453,6.55h25.52h0.35h25.225  c1.078,0,2.029,0.804,2.346,1.834c0.033,0.106,0.053,0.214,0.07,0.322c0.063-0.368,0.043-0.751-0.07-1.124  c-0.316-1.029-1.268-1.732-2.346-1.732H30.322h-0.35H4.453c-1.078,0-2.029,0.703-2.345,1.732C1.993,7.955,1.975,8.338,2.037,8.706  C2.054,8.598,2.075,8.49,2.108,8.384z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
 <polygon fill="#FFFFFF" fill-opacity="0.6" points="34.184,24.717 48.693,10.742 47.58,10.742 34.184,23.428 " stroke-opacity="0.6"/>
 <polygon fill="#FFFFFF" fill-opacity="0.6" points="11.317,10.753 25.783,24.498 25.783,23.216 12.451,10.753 " stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.9995" x2="29.9995" y1="6.481" y2="32.1174">
-<stop offset="0" style="stop-color:#EBECF0"/>
-<stop offset="0.5" style="stop-color:#BBBCBF"/>
-<stop offset="0.5" style="stop-color:#A4A5A8"/>
-<stop offset="1" style="stop-color:#C8CACC"/>
+<stop offset="0" style="stop-color:#EDEFEE"/>
+<stop offset="0.5" style="stop-color:#BCBEBE"/>
+<stop offset="0.5" style="stop-color:#A5A6A7"/>
+<stop offset="1" style="stop-color:#C9CBCA"/>
 </linearGradient>
 <path d="M34.172,24.738L49.715,10.05H10.251l15.521,14.472v7.094L3.479,9.755  C2.829,9.315,2.55,8.527,2.777,7.787s0.9-1.237,1.676-1.237h51.094c0.775,0,1.449,0.497,1.676,1.237s-0.053,1.528-0.693,1.962  L34.172,31.855V24.738z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="45.7363" x2="45.7363" y1="7.9927" y2="30.6518">
-<stop offset="0" style="stop-color:#68696B"/>
+<stop offset="0" style="stop-color:#69696A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M57.148,7.602c-0.129,0.295-0.336,0.557-0.619,0.748L34.172,30.455v1.4L56.529,9.749  c0.641-0.434,0.92-1.222,0.693-1.962C57.203,7.723,57.176,7.662,57.148,7.602z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.2354" x2="14.2354" y1="7.9922" y2="30.666">
-<stop offset="0" style="stop-color:#68696B"/>
+<stop offset="0" style="stop-color:#69696A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M2.851,7.6C2.825,7.662,2.797,7.723,2.777,7.787C2.55,8.527,2.829,9.315,3.479,9.755l22.293,21.86  v-1.4L3.479,8.354C3.191,8.16,2.982,7.896,2.851,7.6z" fill="url(#SVGID_5_)"/>
@@ -47,9 +47,9 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill-opacity="0.35" height="33.866" stroke-opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 670.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="260" x2="284" y1="655.9761" y2="655.9761">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="0.8424" style="stop-color:#CC1414"/>
-<stop offset="1" style="stop-color:#FF4D00"/>
+<stop offset="0" style="stop-color:#B36B4D"/>
+<stop offset="0.8424" style="stop-color:#954B50"/>
+<stop offset="1" style="stop-color:#B36B4D"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="25.809,26.431 3,4.177 4.191,2.956 27,25.21 "/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_settings.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_settings.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_settings.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,35 +3,35 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="26.4722" x2="33.4727" y1="32.4502" y2="32.4502">
-<stop offset="0" style="stop-color:#686E70"/>
-<stop offset="0.0788" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#6A6C6E"/>
+<stop offset="0.0788" style="stop-color:#ABB0AF"/>
 <stop offset="0.3152" style="stop-color:#FFFFFF"/>
-<stop offset="0.7333" style="stop-color:#989C9E"/>
-<stop offset="1" style="stop-color:#C6CBCC"/>
+<stop offset="0.7333" style="stop-color:#9A9C9C"/>
+<stop offset="1" style="stop-color:#C8CAC9"/>
 </linearGradient>
 <path d="M26.472,10.75v42.014c0,0.766,0.626,1.387,1.399,1.387h4.201c0.773,0,1.4-0.621,1.4-1.387V10.75  H26.472z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.9995" x2="29.9995" y1="5.6274" y2="33.0842">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="1" style="stop-color:#222021"/>
 </linearGradient>
 <path d="M57.893,7.582c-0.316-1.029-1.268-1.732-2.346-1.732H30.322h-0.35H4.453  c-1.078,0-2.029,0.703-2.345,1.732c-0.316,1.029,0.078,2.145,0.971,2.747l23.394,22.586v-9.161L12.455,10.75h17.518h0.35h17.223  L33.473,23.975v9.074l23.449-22.72C57.814,9.727,58.207,8.611,57.893,7.582z" fill="url(#SVGID_2_)"/>
 <path d="M2.108,8.384C2.423,7.354,3.375,6.55,4.453,6.55h25.52h0.35h25.225  c1.078,0,2.029,0.804,2.346,1.834c0.033,0.106,0.053,0.214,0.07,0.322c0.063-0.368,0.043-0.751-0.07-1.124  c-0.316-1.029-1.268-1.732-2.346-1.732H30.322h-0.35H4.453c-1.078,0-2.029,0.703-2.345,1.732C1.993,7.955,1.975,8.338,2.037,8.706  C2.054,8.598,2.075,8.49,2.108,8.384z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
 <polygon fill="#FFFFFF" fill-opacity="0.6" points="34.184,24.717 48.693,10.742 47.58,10.742 34.184,23.428 " stroke-opacity="0.6"/>
 <polygon fill="#FFFFFF" fill-opacity="0.6" points="11.317,10.753 25.783,24.498 25.783,23.216 12.451,10.753 " stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.9995" x2="29.9995" y1="6.481" y2="32.1174">
-<stop offset="0" style="stop-color:#EBECF0"/>
-<stop offset="0.5" style="stop-color:#BBBCBF"/>
-<stop offset="0.5" style="stop-color:#A4A5A8"/>
-<stop offset="1" style="stop-color:#C8CACC"/>
+<stop offset="0" style="stop-color:#EDEFEE"/>
+<stop offset="0.5" style="stop-color:#BCBEBE"/>
+<stop offset="0.5" style="stop-color:#A5A6A7"/>
+<stop offset="1" style="stop-color:#C9CBCA"/>
 </linearGradient>
 <path d="M34.172,24.738L49.715,10.05H10.251l15.521,14.472v7.094L3.479,9.755  C2.829,9.315,2.55,8.527,2.777,7.787s0.9-1.237,1.676-1.237h51.094c0.775,0,1.449,0.497,1.676,1.237s-0.053,1.528-0.693,1.962  L34.172,31.855V24.738z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="45.7363" x2="45.7363" y1="7.9927" y2="30.6518">
-<stop offset="0" style="stop-color:#68696B"/>
+<stop offset="0" style="stop-color:#69696A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M57.148,7.602c-0.129,0.295-0.336,0.557-0.619,0.748L34.172,30.455v1.4L56.529,9.749  c0.641-0.434,0.92-1.222,0.693-1.962C57.203,7.723,57.176,7.662,57.148,7.602z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.2354" x2="14.2354" y1="7.9922" y2="30.666">
-<stop offset="0" style="stop-color:#68696B"/>
+<stop offset="0" style="stop-color:#69696A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M2.851,7.6C2.825,7.662,2.797,7.723,2.777,7.787C2.55,8.527,2.829,9.315,3.479,9.755l22.293,21.86  v-1.4L3.479,8.354C3.191,8.16,2.982,7.896,2.851,7.6z" fill="url(#SVGID_5_)"/>
@@ -48,7 +48,7 @@
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="282.4795" x2="282.4795" y1="-361.4912" y2="-388.438">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.1" style="stop-color:#FFFFFF"/>
-<stop offset="0.74" style="stop-color:#929497"/>
+<stop offset="0.74" style="stop-color:#939595"/>
 <stop offset="1" style="stop-color:#C8C8C8"/>
 </linearGradient>
 <path d="M26.116,12.624H25.43c-0.437,0-0.906-0.339-1.042-0.754l-0.531-1.285  c-0.196-0.389-0.105-0.96,0.204-1.269l0.485-0.486c0.615-0.615,0.659-0.759,0.916-1.271l0.349-0.695  c-0.761-1.008-1.659-1.906-2.668-2.666l-0.694,0.346c-0.389,0.195-0.961,0.608-1.271,0.917l-0.485,0.486  c-0.31,0.309-0.882,0.401-1.271,0.203L18.138,5.62c-0.417-0.137-0.755-0.608-0.755-1.044V3.889c0-0.437-0.113-1.134-0.251-1.548  l-0.246-0.735C16.269,1.519,15.641,1.472,15,1.472c-0.641,0-1.27,0.047-1.886,0.133L12.869,2.34  c-0.138,0.415-0.251,1.111-0.251,1.548v0.687c0,0.436-0.339,0.906-0.754,1.042l-1.285,0.53C10.19,6.346,9.62,6.254,9.311,5.946  L8.824,5.46C8.515,5.151,7.942,4.739,7.553,4.543L6.858,4.195C5.851,4.956,4.953,5.854,4.192,6.862l0.347,0.694  c0.195,0.391,0.608,0.963,0.917,1.272l0.486,0.486c0.309,0.309,0.4,0.88,0.202,1.269l-0.531,1.286  c-0.136,0.415-0.605,0.754-1.042,0.754H3.884c-0.438,0-1.134,0.112-1.548,0.252l-0.736,0.245c-0.086,0.617-0.134,1.245-0.134,1.886  c0,0.64,0.047,1.269,0.134,1.885l0.736,0.246c0.414,0.139,1.11,0.251,1.548,0.251h0.687c0.438,0,0.906,0.34,1.042,0.755l0.53,1.284  c0.198,0.389,0.106,0.961-0.203,1.269l-0.486,0.486c-0.309,0.308-0.721,0.882-0.917,1.271L4.19,23.146  c0.761,1.008,1.659,1.905,2.667,2.665l0.694-0.345c0.391-0.196,0.963-0.608,1.271-0.917l0.486-0.485  c0.309-0.309,0.881-0.401,1.27-0.203l1.284,0.529c0.416,0.138,0.755,0.608,0.755,1.044v0.687c0,0.438,0.113,1.133,0.251,1.549  l0.245,0.734c0.617,0.086,1.245,0.134,1.886,0.134c0.64,0,1.267-0.048,1.886-0.134l0.244-0.734c0.138-0.416,0.251-1.111,0.251-1.549  v-0.687c0-0.438,0.34-0.906,0.755-1.043l1.284-0.53c0.391-0.197,0.959-0.105,1.269,0.203l0.485,0.485  c0.31,0.309,0.882,0.721,1.272,0.917l0.695,0.347c1.008-0.76,1.904-1.657,2.665-2.666l-0.347-0.693  c-0.194-0.391-0.608-0.964-0.918-1.271l-0.483-0.486c-0.31-0.309-0.4-0.88-0.204-1.27l0.529-1.284  c0.14-0.416,0.607-0.755,1.044-0.755h0.688c0.435,0,1.132-0.111,1.547-0.251l0.736-0.246c0.087-0.615,0.134-1.245,0.134-1.885  c0-0.641-0.047-1.269-0.134-1.886l-0.736-0.245C27.249,12.736,26.553,12.624,26.116,12.624z M15,19.771  c-2.632,0-4.765-2.133-4.765-4.765c0-2.631,2.132-4.765,4.765-4.765c2.63,0,4.764,2.134,4.764,4.765  C19.764,17.638,17.63,19.771,15,19.771z" fill="url(#SVGID_1__)"/>
@@ -61,7 +61,7 @@
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="282.4805" x2="282.4805" y1="-383.0635" y2="-366.7921">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.52" style="stop-color:#C8C8C8"/>
-<stop offset="1" style="stop-color:#929497"/>
+<stop offset="1" style="stop-color:#939595"/>
 </linearGradient>
 <path d="M15,6.52c-4.687,0-8.487,3.8-8.487,8.487s3.8,8.486,8.487,8.486s8.487-3.799,8.487-8.486  S19.687,6.52,15,6.52z M15,21.563c-3.621,0-6.559-2.935-6.559-6.557c0-3.622,2.937-6.558,6.559-6.558  c3.62,0,6.557,2.936,6.557,6.558C21.557,18.629,18.619,21.563,15,21.563z" fill="url(#SVGID_3__)"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_message.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_message.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_message.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,68 +4,67 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="9.8965" y2="49.8018">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="0.5091" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#F6A800"/>
+<stop offset="0" style="stop-color:#E4E0C1"/>
+<stop offset="0.5091" style="stop-color:#B39C4D"/>
+<stop offset="1" style="stop-color:#AC8A4A"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="58,50.4 2,50.4 2,9.6 30.463,10.4 58,9.6 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="9.7017" y2="50.6398">
-<stop offset="0" style="stop-color:#F7AC00"/>
-<stop offset="0.3394" style="stop-color:#FFF8DB"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+<stop offset="0" style="stop-color:#AD8C4A"/>
+<stop offset="0.3394" style="stop-color:#F4F3E6"/>
+<stop offset="1" style="stop-color:#D1C794"/>
 </linearGradient>
 <path d="M57.385,10.22v39.56H2.613V10.22H57.385 M58,9.6L29.802,9.936L2,9.6v40.8h56V9.6L58,9.6z" fill="url(#SVGID_2_)"/>
-<polygon fill="#FBAB13" fill-opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 " stroke-opacity="0.3"/>
-<polygon fill="#F18800" fill-opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 " stroke-opacity="0.3"/>
+<polygon fill="#B59659" fill-opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 " stroke-opacity="0.3"/>
+<polygon fill="#A97B48" fill-opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 " stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(-1 0 0 -1 -1801.0049 1240.3164)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1831.0049" x2="-1831.0049" y1="1214.7607" y2="1190.0703">
-<stop offset="0" style="stop-color:#F98A00"/>
-<stop offset="0.7273" style="stop-color:#FCBC3C"/>
-<stop offset="1" style="stop-color:#FFE36A"/>
+<stop offset="0" style="stop-color:#AE804B"/>
+<stop offset="0.7273" style="stop-color:#C2AC76"/>
+<stop offset="1" style="stop-color:#D2C997"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="58,50.38 29.998,25.689 2,50.38 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="25.4995" y2="51.0736">
-<stop offset="0" style="stop-color:#FFF1B5"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+<stop offset="0" style="stop-color:#E9E5CB"/>
+<stop offset="1" style="stop-color:#D1C794"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4_)" points="58,50.38 29.998,25.689 2,50.38 29.998,26.563 "/>
-<polygon fill="#F18800" fill-opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 " stroke-opacity="0.3"/>
-<polygon fill="#C26D00" fill-opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 " stroke-opacity="0.4"/>
-<polygon fill="#AB6100" fill-opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 " stroke-opacity="0.4"/>
+<polygon fill="#A97B48" fill-opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 " stroke-opacity="0.3"/>
+<polygon fill="#88573A" fill-opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 " stroke-opacity="0.4"/>
+<polygon fill="#784833" fill-opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 " stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="32.9619" y2="8.0088">
-<stop offset="0" style="stop-color:#FFDA33"/>
-<stop offset="0.25" style="stop-color:#FFE692"/>
-<stop offset="1" style="stop-color:#FFFBF8"/>
+<stop offset="0" style="stop-color:#C2B470"/>
+<stop offset="0.25" style="stop-color:#DED7B3"/>
+<stop offset="1" style="stop-color:#FDFCFA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5_)" points="2,9.6 29.998,34.29 58,9.6 "/>
 <rect fill="none" height="60" width="60"/>
 </g>
 <g transform="matrix(1 0 0 1 30 0)">
-<polygon fill="none" points="5.104,0 5.044,0.225 0,0.225 0,30.225 13.919,30.225 14.333,30.639 14.747,30.225 30,30.225 30,0.225   5.942,0.225 "/>
-<polygon fill-opacity="0.35" points="22.007,7.349 11.844,17.512 15.771,2.858 5.104,0 0.374,17.655 9.308,20.049 6.525,22.831   14.333,30.639 29.814,15.156 " stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="10.1621" x2="6.0926" y1="2.1929" y2="17.9056">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+<polygon fill-opacity="0.35" points="23.487,5.563 16.725,12.331 19.341,2.565 12.047,0.611 8.829,12.621   14.825,14.229 12.973,16.083 18.312,21.421 28.829,10.901 " stroke-opacity="0.35"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -376.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="297.9736" x2="295.2261" y1="-378.1689" y2="-388.7774">
+<stop offset="0" style="stop-color:#CDB18B"/>
+<stop offset="0.703" style="stop-color:#985954"/>
+<stop offset="1" style="stop-color:#BE997B"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1__)" points="1.599,16.948 5.812,1.225 14.546,3.565 10.333,19.288 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="9.877" x2="6.2598" y1="3.2612" y2="17.2775">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<polygon fill="url(#SVGID_1__)" points="9.714,12.11 12.558,1.496 18.453,3.077 15.611,13.691 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -376.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="297.7822" x2="295.3409" y1="-378.8926" y2="-388.3527">
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2__)" points="9.693,18.181 2.706,16.309 6.45,2.333 13.438,4.204 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="25.0566" x2="11.1526" y1="11.9385" y2="26.1817">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+<polygon fill="url(#SVGID_2__)" points="15.18,12.942 10.463,11.679 12.989,2.246 17.706,3.508 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -376.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="308.0273" x2="298.6434" y1="-384.7505" y2="-394.3634">
+<stop offset="0" style="stop-color:#CDB18B"/>
+<stop offset="0.703" style="stop-color:#985954"/>
+<stop offset="1" style="stop-color:#BE997B"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3__)" points="7.939,22.831 22.007,8.763 28.4,15.156 14.333,29.225 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="24.5723" x2="11.9119" y1="12.5332" y2="25.3066">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<polygon fill="url(#SVGID_3__)" points="13.995,16.083 23.487,6.585 27.805,10.901 18.312,20.398 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -376.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="307.7012" x2="299.1582" y1="-385.1528" y2="-393.7721">
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
 </linearGradient>
-<polygon fill="url(#SVGID_4__)" points="14.333,27.946 9.218,22.831 22.007,10.042 27.122,15.156 "/>
-<rect fill="none" height="30" width="30" y="0.225"/>
+<polygon fill="url(#SVGID_4__)" points="18.312,19.532 14.858,16.083 23.487,7.449 26.944,10.901 "/>
+<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_voice_message.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_voice_message.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_voice_message.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -9,7 +9,7 @@
 <path d="M17.36,1s6.154,1.286,10.78,5.642c-13.61,0.95-24.36,12.29-24.36,26.14,0,14.48,11.74,26.22,26.22,26.22s26.22-11.93,26.22-26.22c0-14.28-13.11-31.78-38.86-31.78z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="36.79" x2="36.79" y1="5.052" y2="31.46">
 <stop offset="0" stop-color="#FFFFFF"/>
-<stop offset="1" stop-color="#CDD3D5"/>
+<stop offset="1" stop-color="#CFD3D1"/>
 </linearGradient>
 <path d="M56.15,32.73l0.066,0.055c0-14.28-13.11-31.78-38.86-31.78,0,0,36.7,2.018,38.79,31.73z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="9.028" y2="57.83">
@@ -20,39 +20,38 @@
 </linearGradient>
 <path d="M54.52,33.18c0,13.54-10.98,24.52-24.52,24.52s-24.52-10.98-24.52-24.52c-0.003-13.54,10.98-24.52,24.52-24.52s24.52,10.98,24.52,24.52z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="24.82" y2="40.68">
-<stop offset="0" stop-color="#FF7236"/>
-<stop offset="1" stop-color="#D11414"/>
+<stop offset="0" stop-color="#C39072"/>
+<stop offset="1" stop-color="#984D51"/>
 </linearGradient>
 <path d="M40.38,24.82c-4.26,0-7.725,3.465-7.725,7.72,0,1.766,0.602,3.385,1.598,4.686h-8.513c0.998-1.301,1.598-2.92,1.598-4.686,0-4.255-3.465-7.72-7.724-7.72-4.26,0-7.726,3.465-7.726,7.72,0,4.262,3.466,7.727,7.726,7.727h20.77c4.26,0,7.723-3.465,7.723-7.727-0.01-4.25-3.48-7.72-7.74-7.72zm-25.45,7.72c0-2.58,2.101-4.681,4.685-4.681,2.583,0,4.685,2.102,4.685,4.681,0,2.584-2.102,4.686-4.685,4.686-2.59,0-4.69-2.1-4.69-4.69zm25.45,4.69c-2.584,0-4.686-2.102-4.686-4.686,0-2.58,2.102-4.681,4.686-4.681,2.583,0,4.684,2.102,4.684,4.681,0.01,2.59-2.09,4.69-4.68,4.69z" fill="url(#SVGID_4_)"/>
 <rect fill="none" height="60" width="60"/>
 </g>
 <g transform="matrix(1 0 0 1 30 0)">
-<polygon fill="none" points="5.104,0 5.044,0.225 0,0.225 0,30.225 13.919,30.225 14.333,30.639 14.747,30.225 30,30.225 30,0.225   5.942,0.225 "/>
-<polygon fill-opacity="0.35" points="22.007,7.349 11.844,17.512 15.771,2.858 5.104,0 0.374,17.655 9.308,20.049 6.525,22.831   14.333,30.639 29.814,15.156 " stroke-opacity="0.35"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="10.1621" x2="6.0926" y1="2.1929" y2="17.9056">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+<polygon fill-opacity="0.35" points="23.487,5.563 16.725,12.331 19.341,2.565 12.047,0.611 8.829,12.621   14.825,14.229 12.973,16.083 18.312,21.421 28.829,10.901 " stroke-opacity="0.35"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -376.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="297.9736" x2="295.2261" y1="-378.1689" y2="-388.7774">
+<stop offset="0" style="stop-color:#CDB18B"/>
+<stop offset="0.703" style="stop-color:#985954"/>
+<stop offset="1" style="stop-color:#BE997B"/>
 </linearGradient>
-<polygon fill="url(#SVGID_1__)" points="1.599,16.948 5.812,1.225 14.546,3.565 10.333,19.288 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="9.877" x2="6.2598" y1="3.2612" y2="17.2775">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<polygon fill="url(#SVGID_1__)" points="9.714,12.11 12.558,1.496 18.453,3.077 15.611,13.691 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -376.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="297.7822" x2="295.3409" y1="-378.8926" y2="-388.3527">
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
 </linearGradient>
-<polygon fill="url(#SVGID_2__)" points="9.693,18.181 2.706,16.309 6.45,2.333 13.438,4.204 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="25.0566" x2="11.1526" y1="11.9385" y2="26.1817">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+<polygon fill="url(#SVGID_2__)" points="15.18,12.942 10.463,11.679 12.989,2.246 17.706,3.508 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -376.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="308.0273" x2="298.6434" y1="-384.7505" y2="-394.3634">
+<stop offset="0" style="stop-color:#CDB18B"/>
+<stop offset="0.703" style="stop-color:#985954"/>
+<stop offset="1" style="stop-color:#BE997B"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3__)" points="7.939,22.831 22.007,8.763 28.4,15.156 14.333,29.225 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="24.5723" x2="11.9119" y1="12.5332" y2="25.3066">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<polygon fill="url(#SVGID_3__)" points="13.995,16.083 23.487,6.585 27.805,10.901 18.312,20.398 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -376.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="307.7012" x2="299.1582" y1="-385.1528" y2="-393.7721">
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
 </linearGradient>
-<polygon fill="url(#SVGID_4__)" points="14.333,27.946 9.218,22.831 22.007,10.042 27.122,15.156 "/>
-<rect fill="none" height="30" width="30" y="0.225"/>
+<polygon fill="url(#SVGID_4__)" points="18.312,19.532 14.858,16.083 23.487,7.449 26.944,10.901 "/>
+<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_non_default.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_non_default.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_non_default.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,17 +3,17 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.3877" x2="29.3877" y1="52.6611" y2="57.6064">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+<stop offset="0.7091" style="stop-color:#6A6C6E"/>
+<stop offset="1" style="stop-color:#AAAFAE"/>
 </linearGradient>
 <path d="M52.041,56.938c0,0.339-0.274,0.612-0.612,0.612H7.347c-0.338,0-0.612-0.273-0.612-0.612v-3.673  c0-0.339,0.274-0.612,0.612-0.612h44.082c0.338,0,0.612,0.273,0.612,0.612V56.938z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="10.4082" x2="49.5918" y1="22.6533" y2="22.6533">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+<stop offset="0" style="stop-color:#B7BCBA"/>
+<stop offset="0.2667" style="stop-color:#E7EBE8"/>
+<stop offset="0.703" style="stop-color:#919595"/>
+<stop offset="1" style="stop-color:#B9BDBC"/>
 </linearGradient>
 <path d="M48.113,2.449H11.889c-0.815,0-1.48,0.668-1.48,1.485v38.923h39.184V3.935  C49.592,3.117,48.926,2.449,48.113,2.449z" fill="url(#SVGID_2_)"/>
 <path d="M48.113,2.449c0.813,0,1.479,0.668,1.479,1.485v38.923H10.408V3.935c0-0.817,0.666-1.485,1.48-1.485H48.113   M48.113,3.626H11.889c-0.173,0-0.318,0.142-0.318,0.309v37.747H48.43V3.935C48.43,3.768,48.285,3.626,48.113,3.626L48.113,3.626z" fill="#FFFFFF"/>
@@ -34,8 +34,8 @@
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="4.706" width="27.939" x="16.031" y="8.534"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="20.0767" x2="20.0767" y1="9.5928" y2="12.0647">
-<stop offset="0" style="stop-color:#17BFFF"/>
-<stop offset="1" style="stop-color:#0D5186"/>
+<stop offset="0" style="stop-color:#5DA9B9"/>
+<stop offset="1" style="stop-color:#313C62"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="2.354" width="5.848" x="17.153" y="9.711"/>
 <rect fill="#FFFFFF" fill-opacity="0.25" height="1.176" stroke-opacity="0.25" width="5.848" x="17.153" y="9.711"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_notes.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_notes.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_notes.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,49 +4,49 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="37.1992" x2="11.6714" y1="17.8169" y2="61.0179">
-<stop offset="0" style="stop-color:#A36F00"/>
-<stop offset="0.8303" style="stop-color:#A36F00"/>
-<stop offset="1" style="stop-color:#DE9F01"/>
+<stop offset="0" style="stop-color:#724A31"/>
+<stop offset="0.8303" style="stop-color:#724A31"/>
+<stop offset="1" style="stop-color:#9C7943"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="53" width="51.29" x="4.354" y="3.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="3.0728" y2="54.3618">
-<stop offset="0" style="stop-color:#FEE47A"/>
-<stop offset="0.3758" style="stop-color:#FFC501"/>
-<stop offset="0.7818" style="stop-color:#F6A800"/>
-<stop offset="1" style="stop-color:#FCBC01"/>
+<stop offset="0" style="stop-color:#D6CEA2"/>
+<stop offset="0.3758" style="stop-color:#B39C4D"/>
+<stop offset="0.7818" style="stop-color:#AC8A4A"/>
+<stop offset="1" style="stop-color:#B1964C"/>
 </linearGradient>
 <path d="M55.645,54.789h-26.5c0,0-13.249-0.381-20.088-3.348c-4.56-1.977-4.702-4.18-4.702-4.18V3.5h51.29  V54.789z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="3.0728" y2="54.3618">
-<stop offset="0" style="stop-color:#FEF6D8"/>
-<stop offset="0.3758" style="stop-color:#FFDF75"/>
-<stop offset="0.7818" style="stop-color:#FFBA23"/>
-<stop offset="1" style="stop-color:#FCD823"/>
+<stop offset="0" style="stop-color:#F3F1E3"/>
+<stop offset="0.3758" style="stop-color:#D6CC9E"/>
+<stop offset="0.7818" style="stop-color:#BDA365"/>
+<stop offset="1" style="stop-color:#BBAD64"/>
 </linearGradient>
 <path d="M4.354,3.5v43.762c0,0,0.048,0.672,0.854,1.609V4.354h49.58v49.582H19.324  c5.195,0.721,9.82,0.854,9.82,0.854h26.5V3.5H4.354z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="17.8213" x2="16.3792" y1="50.9248" y2="54.7289">
-<stop offset="0" style="stop-color:#FEEDA5"/>
-<stop offset="0.8182" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#F6A800"/>
+<stop offset="0" style="stop-color:#E3DFC0"/>
+<stop offset="0.8182" style="stop-color:#B39C4D"/>
+<stop offset="1" style="stop-color:#AC8A4A"/>
 </linearGradient>
 <path d="M31.211,54.789c0,0-15.514-0.139-21.283-8.045  c0,0-4.133,5.094-5.573,0.518C4.967,50.404,10.504,54.902,31.211,54.789z" fill="url(#SVGID_4_)" fill-rule="evenodd"/>
-<rect fill="#FEEDA3" height="0.855" width="42.742" x="8.633" y="39.549"/>
-<rect fill="#875703" height="1.709" width="42.742" x="8.633" y="37.84"/>
-<rect fill="#FEEDA3" height="0.854" width="42.742" x="8.633" y="31.855"/>
-<rect fill="#875703" height="1.711" width="42.742" x="8.633" y="30.145"/>
-<rect fill="#FEEDA3" height="0.854" width="42.742" x="8.633" y="24.162"/>
-<rect fill="#875703" height="1.711" width="42.742" x="8.633" y="22.451"/>
-<rect fill="#FEEDA3" height="0.854" width="42.742" x="8.633" y="16.469"/>
-<rect fill="#875703" height="1.709" width="42.742" x="8.633" y="14.76"/>
+<rect fill="#E3DEBE" height="0.855" width="42.742" x="8.633" y="39.549"/>
+<rect fill="#5F382B" height="1.709" width="42.742" x="8.633" y="37.84"/>
+<rect fill="#E3DEBE" height="0.854" width="42.742" x="8.633" y="31.855"/>
+<rect fill="#5F382B" height="1.711" width="42.742" x="8.633" y="30.145"/>
+<rect fill="#E3DEBE" height="0.854" width="42.742" x="8.633" y="24.162"/>
+<rect fill="#5F382B" height="1.711" width="42.742" x="8.633" y="22.451"/>
+<rect fill="#E3DEBE" height="0.854" width="42.742" x="8.633" y="16.469"/>
+<rect fill="#5F382B" height="1.709" width="42.742" x="8.633" y="14.76"/>
 <rect fill="none" height="60" width="60"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
 <rect fill="none" height="30" width="30"/>
 <path d="M29.387,4.245c-0.311-0.683-0.854-1.43-1.527-2.103  c-1.146-1.146-2.387-1.829-3.32-1.829c-0.574,0-0.936,0.242-1.137,0.444L10.791,13.367l0.555,0.554l-8.305,8.304l0.439,0.439  c-0.057,0.029-0.113,0.055-0.168,0.077c-0.318,0.129-0.545,0.145-0.537,0.145l0,0L2.012,22.9l-1.699,6.786l6.047-1.51l0.715-0.198  l0.041-0.734c0.002-0.002,0.016-0.23,0.146-0.559c0.021-0.051,0.045-0.104,0.076-0.165l0.439,0.439l8.305-8.305l0.553,0.553  L29.244,6.602C29.555,6.29,29.988,5.569,29.387,4.245z" fill-opacity="0.35" fill-rule="evenodd" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 626.7343 353.4672)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-675.0313" x2="-668.7666" y1="184.2666" y2="184.2666">
-<stop offset="0" style="stop-color:#878A8C"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#5B6163"/>
-<stop offset="1" style="stop-color:#959A9C"/>
+<stop offset="0" style="stop-color:#898A8B"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#5D5F61"/>
+<stop offset="1" style="stop-color:#979A9A"/>
 </linearGradient>
 <path d="M27.152,2.85c-1.223-1.223-2.586-1.844-3.043-1.385  L13.313,12.26l4.43,4.429L28.537,5.895C28.996,5.436,28.377,4.072,27.152,2.85z" fill="url(#SVGID_1__)" fill-rule="evenodd"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 626.7343 353.4672)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-674.248" x2="-669.5498" y1="199.5332" y2="199.5332">
@@ -66,10 +66,10 @@
 <rect fill="#020202" fill-opacity="0.2" fill-rule="evenodd" height="0.782" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.5849 -4.8019)" width="4.696" x="11.241" y="16.02"/>
 <rect fill="#020202" fill-opacity="0.5" fill-rule="evenodd" height="0.784" stroke-opacity="0.5" transform="matrix(0.7072 0.707 -0.707 0.7072 15.353 -5.3564)" width="4.698" x="11.795" y="15.467"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 626.7343 353.4672)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-674.2476" x2="-669.5503" y1="208.9268" y2="208.9268">
-<stop offset="0" style="stop-color:#878A8C"/>
-<stop offset="0.2606" style="stop-color:#E7EDF0"/>
-<stop offset="0.7455" style="stop-color:#5B6163"/>
-<stop offset="1" style="stop-color:#959A9C"/>
+<stop offset="0" style="stop-color:#898A8B"/>
+<stop offset="0.2606" style="stop-color:#EAEDEB"/>
+<stop offset="0.7455" style="stop-color:#5D5F61"/>
+<stop offset="1" style="stop-color:#979A9A"/>
 </linearGradient>
 <path d="M7.225,24.992l-1.107-1.106l-1.109-1.107c-1.105,1.107-2.213,1.107-2.213,1.107l-1.107,4.427  l4.43-1.106C6.117,27.206,6.117,26.1,7.225,24.992z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 626.7343 353.4672)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-675.0298" x2="-668.7666" y1="176.8291" y2="176.8291">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ok.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ok.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ok.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,15 +4,15 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="5.1221" y2="44.929">
-<stop offset="0" style="stop-color:#E3FFA3"/>
-<stop offset="0.7758" style="stop-color:#73B542"/>
-<stop offset="1" style="stop-color:#AFDD76"/>
+<stop offset="0" style="stop-color:#DCE3BF"/>
+<stop offset="0.7758" style="stop-color:#769365"/>
+<stop offset="1" style="stop-color:#AFBE95"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="58,15.935 50.143,8.078 21.992,36.227 9.854,24.092 2,31.948 21.971,51.922 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="6.7451" y2="43.9537">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="3.432,31.948 9.854,25.522 21.992,37.658 50.143,9.508 56.568,15.935 21.971,50.491 "/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_online.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_online.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_online.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,58 +4,58 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.998" x2="29.998" y1="57.6797" y2="2.0783">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#2A3662"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M57.998,30.001C57.998,45.464,45.461,58,30,58C14.535,58,1.998,45.464,1.998,30.001  C1.998,14.54,14.535,2,30,2C45.461,2,57.998,14.54,57.998,30.001z" fill="url(#SVGID_1_)"/>
 <radialGradient cx="26.9434" cy="12.7056" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="33.8669">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="29.999" cy="30.001" fill="url(#SVGID_2_)" r="27.282"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.999" x2="29.999" y1="2.4785" y2="57.4196">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#A6CDC2"/>
 </linearGradient>
 <path d="M30,2.718c-15.066,0-27.283,12.218-27.283,27.283c0,15.069,12.217,27.28,27.283,27.28  c15.07,0,27.281-12.211,27.281-27.28C57.281,14.937,45.07,2.718,30,2.718z M30,54.894c-14.166,0-25.691-11.524-25.691-25.688  C4.309,15.04,15.834,3.515,30,3.515S55.689,15.04,55.689,29.206C55.689,43.37,44.166,54.894,30,54.894z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="3.1621" x2="7.498" y1="33.7139" y2="33.7139">
-<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="0" style="stop-color:#59595A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M5.277,29.556C4.988,29.17,4.332,29.17,4.041,29.17c-0.57,0-0.873,0.406-0.879,0.804  v0.028v0.041c0,0.702,0.039,1.489,0.123,2.446c0.018,0.179,0.039,0.36,0.061,0.54l0.033,0.263c0.072,0.566,0.158,1.125,0.256,1.665  l0.043,0.237c0.043,0.213,0.084,0.424,0.129,0.633c0.117,0.53,0.26,1.08,0.434,1.687c0.025,0.087,0.049,0.175,0.07,0.26  c0.039,0.142,0.076,0.283,0.121,0.419l0.004,0.02l0.016,0.043c-0.002-0.011-0.01-0.03-0.012-0.048l1.564-0.106  c0.025-0.243,0.033-0.497,0.025-0.751C6.016,36.956,6,36.467,5.889,36.056l1.455-1.951l0.154-0.213v-0.264v-1.52v-0.331  l-0.232-0.232L5.277,29.556z" fill="url(#SVGID_4_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11.5254" x2="56.9043" y1="25.7695" y2="25.7695">
-<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="0" style="stop-color:#59595A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M56.896,24.654c-0.02-0.103-0.039-0.176-0.057-0.25  c-0.016-0.055-0.027-0.109-0.037-0.162c-0.141-0.646-0.313-1.314-0.514-1.994l-0.023-0.074c-0.041-0.153-0.086-0.306-0.135-0.457  c-0.248-0.767-0.514-1.5-0.797-2.177c-0.035-0.085-0.074-0.163-0.109-0.245l-0.059-0.131c-0.268-0.619-0.568-1.238-0.883-1.833  l-0.041-0.077c-0.061-0.117-0.119-0.236-0.184-0.353c-0.385-0.695-0.789-1.358-1.199-1.974c-0.043-0.065-0.092-0.134-0.141-0.202  c-0.031-0.041-0.059-0.081-0.086-0.121c-0.395-0.571-0.807-1.126-1.236-1.656l-0.084-0.106c-0.059-0.071-0.115-0.146-0.176-0.218  c-0.498-0.596-1.023-1.174-1.566-1.72c-0.072-0.074-0.152-0.15-0.23-0.226l-0.064-0.062c-0.49-0.481-1.01-0.956-1.547-1.402  l-0.104-0.091c-0.055-0.048-0.107-0.096-0.164-0.139c-0.582-0.48-1.215-0.952-1.875-1.405c-0.08-0.055-0.164-0.109-0.248-0.162  l-0.1-0.066c-0.594-0.393-1.213-0.77-1.834-1.114l-0.098-0.055c-0.051-0.029-0.102-0.059-0.152-0.088  c-0.693-0.371-1.414-0.72-2.146-1.035L40.82,4.985l-0.199-0.083c-0.193-0.079-0.387-0.147-0.578-0.215  c-0.102-0.035-0.199-0.069-0.299-0.104l-0.371-0.138l-0.33,0.212c-0.223,0.14-1.098,0.64-1.613,0.934  c-0.574-0.077-1.961-0.251-3.359-0.386c0.432-0.042,1.025-0.09,1.869-0.146l0.117-1.573L35.994,3.47  c-0.051-0.014-0.102-0.025-0.152-0.037L35.723,3.41l-0.098-0.02c-0.857-0.172-1.662-0.297-2.461-0.38L33.16,3.009l-0.109-0.01  c-0.914-0.093-1.844-0.139-2.762-0.139c-0.809,0-1.648,0.042-2.564,0.13c-0.145,0.013-0.281,0.029-0.422,0.043  c-0.906,0.101-1.697,0.221-2.447,0.373L24.83,3.411l-0.018,0.003c-0.789,0.163-1.582,0.367-2.428,0.624  c-0.074,0.022-0.15,0.048-0.227,0.071l-0.17,0.056c-0.713,0.23-1.412,0.485-2.084,0.762c-0.057,0.023-0.094,0.037-0.131,0.051  l-0.102,0.041c-0.738,0.314-1.475,0.668-2.205,1.06c-0.078,0.041-0.156,0.087-0.232,0.13l-0.094,0.055  c-0.205,0.113-0.412,0.242-0.617,0.37L16.258,6.8l-1.461,0.893l1.623,0.542c0.242,0.082,0.504,0.123,0.773,0.123  c0.875,0,1.721-0.43,2.402-0.776c0.273-0.138,0.678-0.344,0.848-0.376c0.199,0.06,0.396,0.089,0.596,0.089  c0.746,0,1.354-0.401,1.893-0.754l0.145-0.094c0.174-0.057,0.473-0.167,1.07-0.391c0.607-0.229,1.717-0.645,2.01-0.715  c0.578-0.006,1.264-0.088,1.752-0.392c0.459,0.075,1.273,0.204,2.115,0.314C29.961,5.301,29.9,5.341,29.85,5.391  c-0.273,0.251-1.742,0.696-2.195,0.755c-0.848,0.106-1.186,0.532-1.322,0.871c-0.176,0.439-0.068,0.878,0.104,1.235  c-0.32,0.212-0.713,0.448-1.049,0.625c0-0.007,0.002-0.015,0.004-0.024c0.121-0.675,0.209-1.163-0.119-1.556  c-0.166-0.2-0.414-0.314-0.676-0.314c-0.387,0-0.688,0.239-0.93,0.473c-0.68,0.656-1.09,1.476-1.246,1.783l-0.027,0.059  l-0.025,0.044c-0.293,0.563-0.414,0.962-0.25,2.207c-0.074,0.051-0.287,0.132-0.582,0.132c-0.041,0-0.076-0.002-0.105-0.005  c-0.191-0.205-0.453-0.322-0.752-0.322l0,0c-0.684,0-1.619,0.771-2.773,2.292l-0.371,0.49l0.377,0.484l0.354,0.449  c-5.51,4.257-5.551,4.5-5.609,4.855c-0.01,0.032-0.057,0.18-0.123,0.383c-0.822,2.552-1.275,4.46-0.834,5.482  c1.025,2.368,2.182,4.579,3.68,4.701c0.133,0.011,0.277,0.017,0.434,0.017c1.373,0,3.6-0.416,4.668-0.635  c0.197,0.371,0.436,0.804,0.568,1.04l0.238,0.421l0.484-0.016c0,0,0.26-0.008,0.584-0.008c0.375,0,0.625,0.011,0.787,0.022  c0.584,1.708,1.699,5.643,1.492,6.459l-0.004,0.004c-1.885,2.821,0.4,6.499,1.494,8.269c0.088,0.14,0.168,0.266,0.232,0.374  c0.424,1.204,0.934,2.002,2.02,2.002c0.078,0,0.16-0.005,0.244-0.009c0.063-0.004,0.125-0.007,0.191-0.007  c0.121,0,0.207,0.014,0.293,0.045l0.1,0.036l0.105,0.01c0.205,0.017,0.4,0.045,0.592,0.071c0.334,0.047,0.68,0.095,1.031,0.095  c0.941,0,1.689-0.357,2.336-1.119c0.021-0.004,0.045-0.005,0.068-0.008c0.678-0.095,0.932-0.433,1.018-0.737  c0.051-0.05,0.117-0.112,0.172-0.164c0.268-0.244,0.584-0.537,0.803-0.88c0.1-0.059,0.213-0.125,0.338-0.2  c0.219-0.134,0.465-0.283,0.658-0.382c0.172-0.052,0.322-0.153,0.436-0.293c0.273-0.335,0.217-0.717,0.172-1.023  c-0.047-0.318-0.092-0.642,0.078-0.99c0.965-0.465,2.68-1.608,2.957-1.796v0.022c-0.02,0.153-0.064,0.563-0.133,0.822  c-0.363,0.366-0.67,0.919-0.766,1.105l-0.063,0.121l-0.02,0.137c-0.023,0.18-0.123,1.11,0.4,1.712  c0.264,0.301,0.641,0.468,1.063,0.468c0.131,0,0.271-0.017,0.416-0.05c1.342-0.304,3.723-3.531,3.916-5.312  c0.096-0.859-0.24-1.534-0.918-1.852l-0.506-0.24l-0.398,0.396l-1.469,1.471c-0.498,0.046-0.887,0.193-1.148,0.425  c0.016-0.627-0.047-1.27-0.113-1.896c-0.201-1.891-0.24-3.097,0.92-3.915l0.059-0.043l0.051-0.051  c0.418-0.426,0.883-0.799,1.373-1.193c1.15-0.924,2.34-1.878,3.047-3.604l0.031-0.074c0.227-0.59,0.568-1.478,0.104-2.158  c-0.115-0.167-0.359-0.426-0.814-0.518c0.604-0.242,1.066-0.435,1.111-0.452l0.141-0.059l0.109-0.104l2.48-2.381l0.363-0.35  l-0.16-0.479c-0.021-0.062-0.158-0.438-0.537-0.977c0.725,0.099,1.344,0.272,1.549,0.427c0.074,0.163,0.221,0.519,0.379,0.892  c2.732,6.435,3.115,6.766,3.824,6.777c0.027,0,0.049,0.002,0.066,0.005c0.057,0.002,0.109,0.006,0.156,0.006  c0.404,0,0.635-0.207,0.736-0.331c0.297-0.357,0.215-0.795,0.184-0.959l-0.012-0.056c-0.033-0.384-0.012-2.113,0.045-3.536  c0.004,0.004,0.006,0.008,0.008,0.013l1.463-0.58L56.896,24.654z M35.391,16.784c-0.113,0.005-0.238,0.012-0.367,0.017  c-0.422,0.018-0.902,0.04-1.377,0.04c-1.25,0-1.533-0.155-1.564-0.171c-0.146-0.107-0.297-0.188-0.457-0.246  c0.285-0.063,0.607-0.279,0.939-0.924c0.33,0.636,0.773,1.198,1.457,1.198c0.184,0,0.363-0.045,0.531-0.131  C34.783,16.568,35.162,16.7,35.391,16.784z M34.9,13.303c-0.094,0-0.172-0.005-0.23-0.009c0.064-0.167,0.141-0.264,0.201-0.319  c0.08,0.122,0.186,0.229,0.305,0.32C35.078,13.301,34.986,13.303,34.9,13.303z M29.932,14.974c0.428,0.837,0.744,1.198,0.994,1.355  c-0.619,0.049-1.086,0.443-1.469,0.817c-0.271-0.09-0.74-0.374-0.879-0.572c-0.084-0.117-0.18-0.217-0.287-0.304  C28.969,16.077,29.564,15.447,29.932,14.974z M27.57,14.355l-0.889-0.043l-2.975-0.146c0.361-0.299,0.707-0.579,0.91-0.745  c0.055-0.02,0.27-0.078,0.793-0.078c0.314,0,0.617,0.021,0.809,0.037L27.57,14.355z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="27.8105" cy="3.104" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="30.9363">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M3.957,29.985c0,0,0,0,0,0.002c0,0.01,0.002,0.014,0.002,0.021c0,0.813,0.051,1.615,0.119,2.41  c0.023,0.259,0.063,0.52,0.092,0.781c0.07,0.544,0.15,1.082,0.248,1.615c0.055,0.283,0.107,0.567,0.166,0.845  c0.123,0.553,0.266,1.097,0.422,1.632c0.063,0.222,0.113,0.447,0.184,0.663C5.197,37.978,5.207,38,5.213,38.023  c0.021-0.212,0.027-0.427,0.021-0.648c-0.053-1.568-0.303-1.367-0.303-1.367l1.771-2.381v-1.52L4.625,30.03  C4.625,30.03,3.959,29.926,3.957,29.985z" fill="url(#SVGID_6_)"/>
 <radialGradient cx="27.8096" cy="3.1069" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="30.9388">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M20.631,6.433c0.766,0.252,1.395-0.26,2.109-0.717c0.252-0.051,3.055-1.17,3.357-1.17  c0.301,0,1.32-0.04,1.572-0.444c0,0,4.387,0.763,5.049,0.508c0.359-0.141,1.869-0.26,3.17-0.346  c-0.074-0.016-0.141-0.037-0.213-0.052c-0.07-0.014-0.141-0.026-0.211-0.04c-0.814-0.163-1.637-0.295-2.475-0.378  c-0.006,0-0.012,0-0.02-0.004c-0.881-0.088-1.775-0.135-2.682-0.135c-0.84,0-1.67,0.05-2.492,0.127  c-0.143,0.015-0.287,0.031-0.434,0.046c-0.793,0.086-1.578,0.203-2.35,0.357C25,4.191,24.986,4.192,24.973,4.193  c-0.801,0.166-1.584,0.371-2.355,0.606c-0.133,0.039-0.26,0.085-0.393,0.125c-0.684,0.221-1.357,0.466-2.02,0.737  c-0.076,0.034-0.156,0.063-0.234,0.095c-0.727,0.31-1.438,0.654-2.129,1.024c-0.104,0.056-0.203,0.116-0.307,0.175  c-0.299,0.165-0.576,0.349-0.861,0.525C18.098,7.957,19.877,6.178,20.631,6.433z" fill="url(#SVGID_7_)"/>
 <radialGradient cx="27.8066" cy="3.105" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="30.9346">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.3152" style="stop-color:#B7CC97"/>
+<stop offset="0.7273" style="stop-color:#568E4C"/>
+<stop offset="1" style="stop-color:#255541"/>
 </radialGradient>
 <path d="M56.111,24.787c-0.027-0.133-0.064-0.258-0.09-0.388c-0.141-0.65-0.307-1.292-0.494-1.924  c-0.051-0.171-0.102-0.346-0.154-0.515c-0.23-0.718-0.484-1.426-0.773-2.113c-0.051-0.121-0.109-0.24-0.16-0.358  c-0.266-0.606-0.553-1.201-0.861-1.782c-0.07-0.139-0.143-0.282-0.217-0.417c-0.365-0.657-0.75-1.297-1.166-1.919  c-0.068-0.107-0.15-0.21-0.223-0.316c-0.379-0.553-0.777-1.086-1.195-1.605c-0.086-0.103-0.166-0.209-0.254-0.313  c-0.482-0.578-0.986-1.135-1.518-1.669c-0.09-0.092-0.188-0.183-0.281-0.272c-0.482-0.475-0.984-0.933-1.506-1.369  c-0.09-0.073-0.17-0.151-0.26-0.223c-0.584-0.478-1.195-0.933-1.822-1.362c-0.109-0.075-0.223-0.148-0.334-0.219  c-0.578-0.384-1.174-0.747-1.785-1.085c-0.084-0.045-0.16-0.094-0.244-0.141c-0.68-0.363-1.371-0.696-2.082-1.003  c-0.125-0.053-0.256-0.103-0.379-0.155c-0.277-0.115-0.563-0.206-0.844-0.309c-0.334,0.213-1.881,1.088-1.881,1.088  s-6.717-0.917-7.174-0.462c-0.459,0.462-2.248,0.929-2.656,0.981c-0.406,0.053-1.25,0.27-0.238,1.518  c-0.152,0.155-3.039,2.165-3.039,1.25c0-0.916,0.645-2.552-0.26-1.676c-0.652,0.631-1.039,1.483-1.127,1.643  c-0.211,0.409-0.342,0.604-0.188,1.773c0.154,1.171-1.869,1.164-2.004,0.862c-0.363-0.813-2.363,1.821-2.363,1.821l0.844,1.082  c0,0-5.893,4.539-5.941,4.844c-0.053,0.307-1.523,4.247-1.016,5.418c0.512,1.174,1.797,4.127,3.016,4.226  c1.598,0.131,5.469-0.73,5.469-0.73c0.104,0.257,0.834,1.556,0.834,1.556s1.896-0.063,2.004,0.143  c0.035,0.069,2.287,6.693,1.543,7.571c-1.773,2.656,1.014,6.548,1.789,7.864c0.775,2.262,1.277,1.25,2.297,1.62  c1.258,0.108,2.318,0.573,3.385-0.8c0.309-0.255,0.836-0.054,0.836-0.408c0-0.198,0.912-0.781,1.146-1.33  c0.248-0.114,0.881-0.542,1.313-0.748c0.391-0.025-0.371-1.071,0.402-2.177c0.836-0.33,3.088-1.849,3.088-1.849  c0.104-2.227-1.094-4.979,1.141-6.559c1.445-1.47,3.336-2.306,4.256-4.544c0.252-0.661,0.818-2.014-0.813-1.609  c-1.531,0.386-3.238,0.474-2.432-0.201c-0.092-0.828-1.111-1.218-2.023-2.026c-0.473-1.117-1.215-3.108-1.215-3.108l-1.621-2.463  l0.203-0.508l1.926,2.836l1.926,2.328c0.707,2.33,1.314,2.535,1.314,2.535c1.068-0.377,3.596-1.419,3.596-1.419l2.484-2.381  c0,0-0.256-0.761-1.264-1.722l-0.764-0.455c-0.166,0.467-1.049,0.642-1.049,0.642l-2.145-2.564l0.801-0.162l0.613,1.171l1.473,0.509  c0,0,0.408-0.298,1.166,0.484c0.619-0.051,3.029,0.117,3.594,0.832c0.109,0.142,2.986,7.325,3.555,7.336  c0.248,0.001,0.43,0.099,0.348-0.335c-0.102-0.205,0-4.717,0.154-5.683c0.385-0.821,0.445-0.002,1.357,1.553  C56.121,24.862,56.119,24.824,56.111,24.787z M30.797,7.378c0.201-0.6,1.367-0.804,1.367-0.804s-0.334,0.618-0.258,0.937  c0.08,0.322-0.533,0.524-0.6,1.282c-0.066,0.755-1.459,0.313-1.574,0.047C29.617,8.577,30.592,7.977,30.797,7.378z M35.793,17.571  c-0.865,0-3.455,0.257-4.17-0.253c-0.711-0.508-1.266,0.052-1.781,0.562c-0.334,0.331-1.559-0.339-1.916-0.848  c-0.355-0.509-1.553-0.472-1.553-0.472l0.271-1.452l-3.445-0.167l-1.957,0.574l-1.844,0.052l1.031-0.491l1.287-0.304  c0,0,1.867-1.536,2.43-1.993c0.475-0.388,2.365-0.169,2.365-0.169l2.074,1.497c0,0-0.459,1.174-0.662,1.426  c0.76-0.05,1.658-1.436,1.658-1.436c-1.621-1.488-1.555-1.992-1.555-1.992l2.133,1.498l0.021,0.013c0,0,0.865,2.035,1.225,2.035  c0.352,0,0.809-1.401,0.809-1.401l0.609-0.153c0.27,0.642,0.773,2.094,1.381,1.754c0.35-0.193,0.928-0.017,1.588,0.236  c0.664,0.255,1.115-0.137,1.654,0.337C37.381,18.519,36.15,17.674,35.793,17.571z M37.148,14.068c-0.891-0.339-3.9,0.766-3.229-1.04  c0.359-0.975,1.281-1.179,1.598-0.531c0.082,0.267,1.084,0.679,1.076,0.117c-0.006-0.562,1.01-0.86,1.154-0.441  C37.207,12.563,39.863,14.589,37.148,14.068z M42.816,15.78c-0.492-0.397,0.223-0.738-0.506-1.359  c-1.041-0.895-1.855-1.278-0.436-2.002c1.754-0.221,0.283,0.559,0.576,1.027c0.156,0.247,1.039,1.08,1.73,2.103  C44.756,16.397,43.307,16.175,42.816,15.78z" fill="url(#SVGID_8_)"/>
 <radialGradient cx="27.8125" cy="3.1055" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="30.9328">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M43.523,38.979l-1.689,1.688c0,0-1.016,0-1.064,0.406c-0.023,0.174-0.082,0.927-0.252,1.315  c-0.338,0.235-0.742,1.012-0.742,1.012s-0.211,1.504,0.912,1.249C41.809,44.395,45.256,39.795,43.523,38.979z" fill="url(#SVGID_9_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -64,11 +64,11 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,30C6.729,30,0,23.271,0,15.001C0,6.729,6.729,0,15,0c8.271,0,15,6.729,15,15.001  C30,23.271,23.271,30,15,30L15,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <radialGradient cx="15.2446" cy="7.1245" gradientTransform="matrix(1 0 0 1 0 0.2666)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="27.4219">
-<stop offset="0" style="stop-color:#C5FF4D"/>
-<stop offset="0.1273" style="stop-color:#C5FF4D"/>
-<stop offset="0.5576" style="stop-color:#428C0F"/>
-<stop offset="0.9758" style="stop-color:#C5FF4D"/>
-<stop offset="1" style="stop-color:#C5FF4D"/>
+<stop offset="0" style="stop-color:#B6CA82"/>
+<stop offset="0.1273" style="stop-color:#B6CA82"/>
+<stop offset="0.5576" style="stop-color:#356742"/>
+<stop offset="0.9758" style="stop-color:#B6CA82"/>
+<stop offset="1" style="stop-color:#B6CA82"/>
 </radialGradient>
 <circle cx="15" cy="15.001" fill="url(#SVGID_1__)" r="14"/>
 <path d="M14.945,13.573c-4.122,0-8.019-0.584-11.498-1.616c0.27-5.423,5.34-9.751,11.57-9.751  c6.215,0,11.274,4.304,11.569,9.707C23.071,12.973,19.125,13.573,14.945,13.573z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_outbox.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_outbox.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_outbox.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,44 +3,44 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.0044" x2="30.0044" y1="5.3496" y2="38.0188">
-<stop offset="0" style="stop-color:#87C126"/>
-<stop offset="1" style="stop-color:#2D5C00"/>
+<stop offset="0" style="stop-color:#719355"/>
+<stop offset="1" style="stop-color:#1C4033"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="23.453,37.822 23.453,19.443 17.357,19.443 30.118,5.075 42.652,19.443 36.719,19.443   36.719,37.823 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.0132" x2="30.0132" y1="5.6895" y2="37.326">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="1" style="stop-color:#4C8609"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="1" style="stop-color:#2F613B"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="41.822,18.757 30.113,5.424 18.205,18.757 24.14,18.757 24.14,37.136 36.031,37.137   36.031,18.757 "/>
-<rect fill="#7BB71C" height="0.688" width="11.892" x="24.14" y="36.449"/>
+<rect fill="#5D894A" height="0.688" width="11.892" x="24.14" y="36.449"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30.0132" x2="30.0132" y1="5.5356" y2="18.8368">
-<stop offset="0" style="stop-color:#EBFFCC"/>
-<stop offset="1" style="stop-color:#A9D36E"/>
+<stop offset="0" style="stop-color:#EBF0DB"/>
+<stop offset="1" style="stop-color:#A6B58C"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="30.113,6.471 40.903,18.757 41.822,18.757 30.113,5.424 18.205,18.757 19.139,18.757 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.9995" x2="29.9995" y1="33.4199" y2="54.6772">
-<stop offset="0" style="stop-color:#C8CED1"/>
-<stop offset="1" style="stop-color:#84888B"/>
+<stop offset="0" style="stop-color:#CBCECD"/>
+<stop offset="1" style="stop-color:#868889"/>
 </linearGradient>
 <path d="M4.57,54.924c-1.417,0-2.57-1.152-2.57-2.57V33.48h10.791v9.457c0,0.658,0.538,1.195,1.197,1.195  h32.023c0.66,0,1.196-0.537,1.196-1.195V33.48H58v18.873c0,1.418-1.152,2.57-2.568,2.57H4.57z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30.0005" x2="30.0005" y1="33.4238" y2="53.3199">
-<stop offset="0" style="stop-color:#E1E2E6"/>
-<stop offset="0.8061" style="stop-color:#BBBCBF"/>
-<stop offset="0.9152" style="stop-color:#A4A5A8"/>
-<stop offset="1" style="stop-color:#C8CACC"/>
+<stop offset="0" style="stop-color:#E3E4E4"/>
+<stop offset="0.8061" style="stop-color:#BCBEBE"/>
+<stop offset="0.9152" style="stop-color:#A5A6A7"/>
+<stop offset="1" style="stop-color:#C9CBCA"/>
 </linearGradient>
 <path d="M47.895,33.48v8.77c0,1.035-0.848,1.883-1.883,1.883H13.988c-1.035,0-1.883-0.848-1.883-1.883v-8.77  H2.687v18.187c0,1.036,0.848,1.884,1.884,1.884h50.861c1.035,0,1.883-0.848,1.883-1.884V33.48H47.895z" fill="url(#SVGID_5_)"/>
 <path d="M12.105,42.938c0,1.034,0.848,1.882,1.883,1.882h32.023  c1.035,0,1.883-0.848,1.883-1.882V42.25c0,1.035-0.848,1.883-1.883,1.883H13.988c-1.035,0-1.883-0.848-1.883-1.883V42.938z" fill="#FFFFFF" fill-opacity="0.75"/>
 <rect fill="#FFFFFF" fill-opacity="0.5" height="0.687" width="9.419" x="2.687" y="33.48"/>
 <rect fill="#FFFFFF" fill-opacity="0.5" height="0.687" width="9.42" x="47.895" y="33.48"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="18.2197" x2="24.0671" y1="18.4141" y2="18.4141">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="24.14,18.07 18.818,18.07 18.205,18.757 24.14,18.757 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="41.8545" x2="35.9584" y1="18.4136" y2="18.4136">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <polygon fill="url(#SVGID_7_)" points="36.031,18.07 36.031,18.757 41.822,18.757 41.219,18.07 "/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_personalization.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_personalization.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_personalization.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,89 +4,89 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="39.64" cy="18.27" gradientUnits="userSpaceOnUse" id="SVGID_1" r="29.22">
-<stop offset="0" stop-color="#FEEFA7"/>
-<stop offset="0.51" stop-color="#FFC501"/>
-<stop offset="0.78" stop-color="#F6A800"/>
-<stop offset="1" stop-color="#FCBA01"/>
+<stop offset="0" stop-color="#E4E0C1"/>
+<stop offset="0.51" stop-color="#B39C4D"/>
+<stop offset="0.78" stop-color="#AC8A4A"/>
+<stop offset="1" stop-color="#B1964C"/>
 </radialGradient>
 <path d="M38.9,47.59c-2.769,0-5.188-1.035-7.191-3.076-6.77-6.896-6.979-23.27-6.975-25.47,7.495-1.505,11.22-1.801,15.09-1.801,3.624,0,6.74,0.421,13.23,1.797-0.08,2.82-1.08,28.55-14.16,28.55z" fill="url(#SVGID_1)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="47.09" x2="47.09" y1="18.28" y2="47.26">
-<stop offset="0" stop-color="#FEF8DD"/>
-<stop offset="1" stop-color="#FFC501"/>
+<stop offset="0" stop-color="#F4F3E7"/>
+<stop offset="1" stop-color="#B39C4D"/>
 </linearGradient>
 <path d="M49.31,18.16s0.613,5.736-0.727,8.807l0.689,2.203s0,2.285-1.544,3.735c0,0-0.859,10.66-6.812,14.74,0,0,7.912-0.771,10.89-16.29,0,0,1.596-8.988,1.453-12.57l-3.95-0.62z" fill="url(#SVGID_2)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <radialGradient cx="41.63" cy="21.03" gradientUnits="userSpaceOnUse" id="SVGID_3" r="25.72">
-<stop offset="0" stop-color="#FEF7D5"/>
-<stop offset="0.59" stop-color="#FFF491"/>
-<stop offset="1" stop-color="#FCBA01"/>
+<stop offset="0" stop-color="#F2F0E1"/>
+<stop offset="0.59" stop-color="#DEDBB2"/>
+<stop offset="1" stop-color="#B1964C"/>
 </radialGradient>
 <path d="M39.82,16.93c-3.795,0-7.498,0.261-15.39,1.856,0,0-0.541,29.1,14.47,29.1,14.23,0,14.46-29.1,14.46-29.1-6.93-1.48-9.95-1.86-13.54-1.86zm-0.92,30.35c-2.684,0-5.029-1.004-6.974-2.984-6.476-6.597-6.871-22.05-6.886-25,7.305-1.457,10.97-1.746,14.78-1.746,3.553,0,6.619,0.409,12.92,1.737-0.12,3.8-1.37,27.99-13.84,27.99z" fill="url(#SVGID_3)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="39.13" x2="39.13" y1="34.06" y2="38.92">
-<stop offset="0" stop-color="#FFAA04"/>
-<stop offset="1" stop-color="#8F5102"/>
+<stop offset="0" stop-color="#B4924F"/>
+<stop offset="1" stop-color="#65392C"/>
 </linearGradient>
 <path d="M41.43,35.78s-3.164,1.717-4.564,0.686c0,0,2.5,3.56,4.56-0.69z" fill="url(#SVGID_4)"/>
 <radialGradient cx="45.76" cy="29.42" gradientUnits="userSpaceOnUse" id="SVGID_5" r="3.74">
-<stop offset="0" stop-color="#FFE591"/>
-<stop offset="1" stop-color="#FFC704"/>
+<stop offset="0" stop-color="#DED7B2"/>
+<stop offset="1" stop-color="#B49D4F"/>
 </radialGradient>
 <path d="M49.7,30.15h-7.921s1.433-1.333,3.96-1.492c2.52-0.16,3.78,0.31,3.96,1.49z" fill="url(#SVGID_5)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="45.74" x2="45.74" y1="29.94" y2="25.72">
-<stop offset="0" stop-color="#FFC501"/>
-<stop offset="1" stop-color="#FEF8DD"/>
+<stop offset="0" stop-color="#B39C4D"/>
+<stop offset="1" stop-color="#F4F3E7"/>
 </linearGradient>
 <path d="M45.74,29.06c1.613,0,3.045,0.429,3.961,1.091,0.038-0.155,0.073-0.314,0.062-0.475-0.174-2.32-1.8-3.545-4.022-3.545-2.221,0-4.109,1.836-4.021,3.545,0.008,0.162,0.025,0.319,0.063,0.474,0.91-0.66,2.34-1.09,3.96-1.09z" fill="url(#SVGID_6)" fill-opacity="0.8" stroke-opacity="0.8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="45.74" x2="45.74" y1="29.98" y2="26.55">
-<stop offset="0" stop-color="#4D1F00"/>
-<stop offset="1" stop-color="#BA6A02"/>
+<stop offset="0" stop-color="#36171A"/>
+<stop offset="1" stop-color="#835439"/>
 </linearGradient>
 <path d="M45.74,29.06c1.613,0,3.045,0.429,3.961,1.091,0.038-0.155,0.062-0.313,0.062-0.475,0-1.544-1.8-2.795-4.022-2.795-2.221,0-4.021,1.251-4.021,2.795,0,0.162,0.025,0.319,0.063,0.474,0.91-0.66,2.34-1.09,3.96-1.09z" fill="url(#SVGID_7)"/>
-<path d="M39.09,45.72c-3.938,0-5.338-5.51-5.338-5.51h10.68c0,0.01-1.4,5.51-5.34,5.51z" fill="#AB6100" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M39.09,45.05c-3.938,0-5.338-4.837-5.338-4.837h10.68c0,0.01-1.4,4.84-5.34,4.84z" fill="#AB6100" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M39.09,45.72c-3.938,0-5.338-5.51-5.338-5.51h10.68c0,0.01-1.4,5.51-5.34,5.51z" fill="#784833" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M39.09,45.05c-3.938,0-5.338-4.837-5.338-4.837h10.68c0,0.01-1.4,4.84-5.34,4.84z" fill="#784833" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="39.09" x2="39.09" y1="44.48" y2="39.88">
-<stop offset="0" stop-color="#FFF3CC"/>
-<stop offset="0.58" stop-color="#FFB805"/>
-<stop offset="1" stop-color="#572000"/>
+<stop offset="0" stop-color="#F0EDDB"/>
+<stop offset="0.58" stop-color="#B49850"/>
+<stop offset="1" stop-color="#3D1A1D"/>
 </linearGradient>
 <path d="M39.09,44.13c-3.938,0-5.338-4.224-5.338-4.224h10.68c0-0.01-1.4,4.22-5.34,4.22z" fill="url(#SVGID_8)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="39.09" x2="39.09" y1="38.22" y2="44.61">
-<stop offset="0" stop-color="#4D1F00"/>
-<stop offset="1" stop-color="#BA6A02"/>
+<stop offset="0" stop-color="#36171A"/>
+<stop offset="1" stop-color="#835439"/>
 </linearGradient>
 <path d="M34.15,40.32h9.895s-1.005,3.01-4.946,3.01c-3.94,0-4.94-3.01-4.94-3.01z" fill="url(#SVGID_9)"/>
 <path d="M40.21,16.94c-0.129-0.001-0.258-0.003-0.389-0.003-3.795,0-7.498,0.261-15.39,1.856,0,0-0.333,17.96,6.803,25.66,0.137-0.13,0.279-0.248,0.413-0.386,6.7-6.82,8.23-20.35,8.57-27.13z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <path d="M24.43,18.79s-0.319,17.27,6.397,25.2c0.126-0.121,0.258-0.229,0.382-0.355,6.545-6.67,8.052-19.99,8.389-26.7-3.72,0.01-7.43,0.29-15.17,1.85z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <path d="M24.43,18.79s-0.307,16.6,6.011,24.73c0.11-0.104,0.223-0.198,0.331-0.308,6.402-6.522,7.883-19.63,8.215-26.27-3.52,0.04-7.23,0.37-14.55,1.85z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <radialGradient cx="22.8" cy="12.79" gradientUnits="userSpaceOnUse" id="SVGID_10" r="34.28">
-<stop offset="0" stop-color="#E9F0F2"/>
-<stop offset="0.04" stop-color="#E9F0F2"/>
-<stop offset="0.58" stop-color="#BDC2C4"/>
-<stop offset="0.83" stop-color="#949DA1"/>
-<stop offset="0.99" stop-color="#98A1A4"/>
-<stop offset="1" stop-color="#98A1A4"/>
+<stop offset="0" stop-color="#ECEFED"/>
+<stop offset="0.04" stop-color="#ECEFED"/>
+<stop offset="0.58" stop-color="#BFC2C1"/>
+<stop offset="0.83" stop-color="#989D9D"/>
+<stop offset="0.99" stop-color="#9CA0A0"/>
+<stop offset="1" stop-color="#9CA0A0"/>
 </radialGradient>
 <path d="M21.8,46.12c-2.904,0-5.439-1.102-7.534-3.273-7.552-7.834-7.376-27.3-7.325-29.68l0.192-0.041c7.558-1.608,9.588-2.041,13.61-2.041,4.453,0,8.745,0.343,17.42,2.083,0.008,2.384-0.197,21.4-8.043,29.4-2.33,2.35-5.12,3.55-8.33,3.55z" fill="url(#SVGID_10)"/>
 <radialGradient cx="22.8" cy="12.51" gradientUnits="userSpaceOnUse" id="SVGID_11" r="34.9">
-<stop offset="0" stop-color="#F6FDFF"/>
-<stop offset="0.58" stop-color="#DBE1E3"/>
-<stop offset="0.83" stop-color="#ABB6BA"/>
-<stop offset="0.99" stop-color="#AAB4B8"/>
-<stop offset="1" stop-color="#AAB4B8"/>
+<stop offset="0" stop-color="#F9FCF9"/>
+<stop offset="0.58" stop-color="#DDE1DF"/>
+<stop offset="0.83" stop-color="#B0B5B4"/>
+<stop offset="0.99" stop-color="#AEB4B3"/>
+<stop offset="1" stop-color="#AEB4B3"/>
 </radialGradient>
 <path d="M38.47,12.92c-9.088-1.835-13.35-2.139-17.72-2.139-4.127,0-6.116,0.439-14.1,2.139,0,0-1.221,33.51,15.16,33.51,17.28,0,16.66-33.51,16.66-33.51zm-8.57,29.43c-2.256,2.298-4.979,3.463-8.095,3.463-2.818,0-5.278-1.069-7.313-3.18-7.259-7.527-7.295-26.01-7.244-29.22,7.495-1.595,9.519-2.024,13.5-2.024,4.392,0,8.628,0.335,17.11,2.028-0.01,3.21-0.42,21.26-7.96,28.93z" fill="url(#SVGID_11)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="31.5" x2="31.5" y1="11.73" y2="48.06">
-<stop offset="0" stop-color="#F0F5F7"/>
-<stop offset="1" stop-color="#A6AEB3"/>
+<stop offset="0" stop-color="#F2F5F3"/>
+<stop offset="1" stop-color="#AAAFAF"/>
 </linearGradient>
 <path d="M34.28,12.67l-0.998,8.469,1.688,3.757s0.281,1.327-1.755,4.562c0,0-0.277,12.19-8.179,15.75,0,0,8.539-0.847,11.75-17.88,0,0,1.322-9.31,1.168-14.05l-3.68-0.61z" fill="url(#SVGID_12)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="13.22" x2="13.22" y1="12.67" y2="45.35">
-<stop offset="0" stop-color="#F0F5F7"/>
-<stop offset="1" stop-color="#A6AEB3"/>
+<stop offset="0" stop-color="#F2F5F3"/>
+<stop offset="1" stop-color="#AAAFAF"/>
 </linearGradient>
 <path d="M11.02,12.67l0.459,8.469-1.034,4.051s-0.141,1.26,1.102,4.268c0,0,0.338,12.56,7.939,15.95,0,0-8.465-0.29-11.51-18.07,0,0-1.15-9.425-0.995-14.09l4.035-0.58z" fill="url(#SVGID_13)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="27.38" x2="27.38" y1="34.15" y2="18.18">
-<stop offset="0" stop-color="#8D9498"/>
-<stop offset="1" stop-color="#CEDBE0"/>
+<stop offset="0" stop-color="#909495"/>
+<stop offset="1" stop-color="#D3DBD7"/>
 </linearGradient>
 <path d="M22.94,22.55c-0.418,2.382,1.774,12.47-0.818,12.38,0,0,1.64,0.23,2.895-1.333,0,0-0.992-3.404-0.908-6.658-0.113-5.152,1.692-6.734,8.52-7.091,0,0-9.04-0.97-9.69,2.7z" fill="url(#SVGID_14)"/>
 <radialGradient cx="14.93" cy="24.67" gradientUnits="userSpaceOnUse" id="SVGID_15" r="4.2">
@@ -96,7 +96,7 @@
 <path d="M10.51,25.5h8.901s-1.609-1.498-4.451-1.676c-2.84-0.17-4.25,0.35-4.45,1.68z" fill="url(#SVGID_15)"/>
 <radialGradient cx="30.76" cy="24.67" gradientUnits="userSpaceOnUse" id="SVGID_16" r="4.2">
 <stop offset="0" stop-color="#D4D4D4"/>
-<stop offset="1" stop-color="#9AA7AB"/>
+<stop offset="1" stop-color="#9FA6A5"/>
 </radialGradient>
 <path d="M35.18,25.5h-8.9s1.609-1.498,4.451-1.676c2.84-0.17,4.25,0.35,4.45,1.68z" fill="url(#SVGID_16)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="30.73" x2="30.73" y1="21.08" y2="23.38">
@@ -111,7 +111,7 @@
 <path d="M30.73,24.28c1.814,0,3.422,0.482,4.451,1.227,0.043-0.173,0.07-0.352,0.07-0.533,0-1.736-2.025-3.143-4.521-3.143s-4.52,1.407-4.52,3.143c0,0.182,0.027,0.36,0.07,0.533,1.03-0.75,2.64-1.23,4.45-1.23z" fill="url(#SVGID_18)"/>
 <radialGradient cx="14.99" cy="24.67" gradientUnits="userSpaceOnUse" id="SVGID_19" r="4.2">
 <stop offset="0" stop-color="#D4D4D4"/>
-<stop offset="1" stop-color="#9AA7AB"/>
+<stop offset="1" stop-color="#9FA6A5"/>
 </radialGradient>
 <path d="M19.41,25.5h-8.9s1.61-1.498,4.451-1.676c2.84-0.17,4.25,0.35,4.45,1.68z" fill="url(#SVGID_19)"/>
 <path d="M14.96,23.66c1.814,0,3.422,0.482,4.451,1.227,0.043-0.173,0.07-0.352,0.07-0.533,0-1.736-2.024-3.143-4.521-3.143s-4.52,1.407-4.52,3.143c0,0.182,0.027,0.36,0.069,0.533,1.03-0.74,2.64-1.23,4.45-1.23z" fill="url(#SVGID_17)" fill-opacity="0.8" stroke-opacity="0.8"/>
@@ -119,7 +119,7 @@
 <path d="M22.74,42.66c-4.516,0-6.122-6.186-6.122-6.186h12.24c0,0.01-1.61,6.19-6.12,6.19z" fill-opacity="0.05" stroke-opacity="0.05"/>
 <path d="M22.74,42.05c-4.516,0-6.122-5.572-6.122-5.572h12.24s-1.61,5.57-6.12,5.57z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22" x1="22.74" x2="22.74" y1="36.44" y2="41.45">
-<stop offset="0" stop-color="#262D33"/>
+<stop offset="0" stop-color="#2A2A2F"/>
 <stop offset="1" stop-color="#FFFFFF"/>
 </linearGradient>
 <path d="M22.74,41.32c-4.516,0-6.122-4.844-6.122-4.844h12.24s-1.61,4.84-6.12,4.84z" fill="url(#SVGID_22)"/>
@@ -134,29 +134,29 @@
 <polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
 <path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06  c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0  l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204  c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+<stop offset="0" style="stop-color:#93BD66"/>
+<stop offset="1" style="stop-color:#22403B"/>
 </linearGradient>
 <path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729  c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493  c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#A6C87E"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#BCD39A"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4_)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.4667" style="stop-color:#347940"/>
+<stop offset="1" style="stop-color:#173636"/>
 </linearGradient>
 <path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229  c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84  c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5_)"/>
 <rect fill="none" height="30" width="30" y="0.487"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phone_as_modem.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phone_as_modem.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phone_as_modem.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,25 +4,25 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07  c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11  c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304  v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001  z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" fill-opacity="0.6" height="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
@@ -31,98 +31,98 @@
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+<stop offset="0" style="stop-color:#AADAC6"/>
+<stop offset="1" style="stop-color:#6A99AA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
-<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
+<rect fill="#BCE2D2" height="0.767" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+<stop offset="1" style="stop-color:#D3D7D5"/>
 </linearGradient>
 <path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785  c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+<stop offset="0" style="stop-color:#6F7172"/>
+<stop offset="1" style="stop-color:#BFC2C1"/>
 </linearGradient>
 <path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51  c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951  h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183  h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606  c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
 <path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534  h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303  c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307  c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+<stop offset="0" style="stop-color:#C6B17B"/>
+<stop offset="0.7455" style="stop-color:#98604F"/>
+<stop offset="1" style="stop-color:#7F3736"/>
 </linearGradient>
 <path d="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307  c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
 <rect fill="none" height="60" width="60"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="291.0005" x2="291.0005" y1="-358.7285" y2="-363.4325">
-<stop offset="0" style="stop-color:#334247"/>
-<stop offset="1" style="stop-color:#446066"/>
+<stop offset="0" style="stop-color:#393B41"/>
+<stop offset="1" style="stop-color:#4E555C"/>
 </linearGradient>
 <path d="M29,28.065c0,0.173-0.139,0.311-0.311,0.311H1.312C1.14,28.376,1,28.238,1,28.065v-4.045  C1,23.85,1.14,23.71,1.312,23.71H28.69c0.172,0,0.311,0.14,0.311,0.311V28.065z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="291.0005" x2="291.0005" y1="-359.0366" y2="-363.114">
-<stop offset="0" style="stop-color:#334247"/>
-<stop offset="1" style="stop-color:#638B94"/>
+<stop offset="0" style="stop-color:#393B41"/>
+<stop offset="1" style="stop-color:#728185"/>
 </linearGradient>
 <path d="M1.312,24.021v4.045H28.69v-4.045H1.312z M28.377,27.444H1.623v-3.111h26.755V27.444z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="291.0005" x2="291.0005" y1="-363.3579" y2="-358.6539">
-<stop offset="0" style="stop-color:#334247"/>
-<stop offset="1" style="stop-color:#446066"/>
+<stop offset="0" style="stop-color:#393B41"/>
+<stop offset="1" style="stop-color:#4E555C"/>
 </linearGradient>
 <path d="M28.688,23.71H1.312C1.14,23.71,1,23.85,1,24.021v4.045c0,0.173,0.139,0.311,0.311,0.311H28.69  c0.172,0,0.311-0.138,0.311-0.311v-4.045C29,23.85,28.862,23.71,28.688,23.71z M28.688,28.065H1.312v-4.045H28.69v4.045H28.688z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="294.5269" x2="297.7813" y1="-348.5991" y2="-348.5991">
@@ -148,8 +148,8 @@
 <rect fill-opacity="0.1" height="0.312" stroke-opacity="0.1" width="2.18" x="19.043" y="8.775"/>
 <rect fill-opacity="0.1" height="0.934" stroke-opacity="0.1" width="2.18" x="19.043" y="8.466"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="291.0005" x2="291.0005" y1="-351.8955" y2="-359.4225">
-<stop offset="0" style="stop-color:#E0E2E6"/>
-<stop offset="1" style="stop-color:#555557"/>
+<stop offset="0" style="stop-color:#E2E4E3"/>
+<stop offset="1" style="stop-color:#565656"/>
 </linearGradient>
 <path d="M29,18.076c0-0.667-0.543-1.21-1.213-1.21H2.212C1.543,16.866,1,17.408,1,18.076v6.257h28V18.076z" fill="url(#SVGID_6__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_7__" x1="290.9995" x2="290.9995" y1="-352.3604" y2="-359.4167">
@@ -160,34 +160,34 @@
 <path d="M1.029,17.799c0.07-0.268,0.551-0.466,0.841-0.466h26.259  c0.291,0,0.768,0.198,0.837,0.466l0,0c-0.126-0.534-0.604-0.933-1.177-0.933H2.212C1.639,16.866,1.155,17.265,1.029,17.799  L1.029,17.799z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_8__" x1="282.4448" x2="282.4448" y1="-357.3369" y2="-353.5188">
 <stop offset="0" style="stop-color:#9F9F9F"/>
-<stop offset="1" style="stop-color:#7D7D80"/>
+<stop offset="1" style="stop-color:#7E7E7F"/>
 </linearGradient>
 <rect fill="url(#SVGID_8__)" height="4.166" width="1.666" x="5.611" y="18.36"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_9__" x1="282.4438" x2="282.4438" y1="-357.249" y2="-353.6387">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <rect fill="url(#SVGID_9__)" height="3.61" width="1.112" x="5.888" y="18.639"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_10__" x1="279.3892" x2="279.3892" y1="-357.3369" y2="-353.5188">
 <stop offset="0" style="stop-color:#9F9F9F"/>
-<stop offset="1" style="stop-color:#7D7D80"/>
+<stop offset="1" style="stop-color:#7E7E7F"/>
 </linearGradient>
 <rect fill="url(#SVGID_10__)" height="4.166" width="1.667" x="2.555" y="18.36"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_11__" x1="279.3892" x2="279.3892" y1="-357.249" y2="-353.6387">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <rect fill="url(#SVGID_11__)" height="3.61" width="1.112" x="2.833" y="18.639"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_12__" x1="285.5005" x2="285.5005" y1="-357.3369" y2="-353.5188">
 <stop offset="0" style="stop-color:#9F9F9F"/>
-<stop offset="1" style="stop-color:#7D7D80"/>
+<stop offset="1" style="stop-color:#7E7E7F"/>
 </linearGradient>
 <rect fill="url(#SVGID_12__)" height="4.166" width="1.667" x="8.666" y="18.36"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_13__" x1="285.5005" x2="285.5005" y1="-357.249" y2="-353.6387">
-<stop offset="0" style="stop-color:#334247"/>
-<stop offset="1" style="stop-color:#446066"/>
+<stop offset="0" style="stop-color:#393B41"/>
+<stop offset="1" style="stop-color:#4E555C"/>
 </linearGradient>
 <rect fill="url(#SVGID_13__)" height="3.61" width="1.111" x="8.944" y="18.639"/>
 <rect fill="#FFFFFF" fill-opacity="0.5" height="0.278" stroke-opacity="0.5" width="1.112" x="5.888" y="18.639"/>
@@ -197,59 +197,59 @@
 <rect fill="#FFFFFF" fill-opacity="0.2" height="0.312" stroke-opacity="0.2" width="28" x="1" y="24.021"/>
 <rect fill-opacity="0.1" height="0.311" stroke-opacity="0.1" width="28" x="1" y="23.71"/>
 <linearGradient gradientTransform="matrix(-0.7071 -0.7071 0.7071 -0.7071 442.0565 10.7984)" gradientUnits="userSpaceOnUse" id="SVGID_14__" x1="309.5308" x2="302.8252" y1="-296.5103" y2="-303.1235">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M13.818,1.625l1.387,1.386c-1.81,1.809-1.809,4.753,0,6.563l-1.386,1.387  C11.245,8.386,11.245,4.198,13.818,1.625z" fill="url(#SVGID_14__)"/>
 <linearGradient gradientTransform="matrix(-0.7071 -0.7071 0.7071 -0.7071 442.0565 10.7984)" gradientUnits="userSpaceOnUse" id="SVGID_15__" x1="307.0698" x2="300.3655" y1="-294.0181" y2="-300.6301">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M16.963,3.382l1.387,1.385c-0.841,0.842-0.841,2.209,0,3.049l-1.387,1.387  C15.359,7.599,15.359,4.987,16.963,3.382z" fill="url(#SVGID_15__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_16__" x1="289.5513" x2="289.5513" y1="-345.8452" y2="-334.9367">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <path d="M13.819,10.529c-1.231-1.232-1.867-2.835-1.919-4.452c-0.057,1.76,0.58,3.54,1.919,4.881  l1.386-1.386c-0.072-0.073-0.137-0.15-0.203-0.226L13.819,10.529z" fill="url(#SVGID_16__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_17__" x1="293.0571" x2="293.0571" y1="-344.208" y2="-338.9822">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <path d="M16.963,8.772c-0.748-0.749-1.141-1.714-1.193-2.695C15.713,7.2,16.106,8.345,16.963,9.2  l1.387-1.387c-0.074-0.072-0.133-0.154-0.193-0.235L16.963,8.772z" fill="url(#SVGID_17__)"/>
 <path d="M13.818,2.055l1.184,1.181c0.066-0.074,0.131-0.152,0.203-0.225l-1.387-1.386  c-1.341,1.342-1.975,3.12-1.918,4.881C11.952,4.888,12.586,3.287,13.818,2.055z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <path d="M16.963,3.812l1.193,1.192c0.061-0.08,0.119-0.162,0.193-0.237l-1.387-1.385  c-0.857,0.856-1.25,2.002-1.193,3.124C15.823,5.524,16.217,4.56,16.963,3.812z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(0.7071 -0.7071 -0.7071 -0.7071 201.7121 10.7984)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="-117.2642" x2="-123.9698" y1="130.2861" y2="123.6729">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M26.377,1.625l-1.387,1.386c1.809,1.809,1.809,4.753,0,6.563l1.385,1.387  C28.95,8.386,28.95,4.198,26.377,1.625z" fill="url(#SVGID_18_)"/>
 <linearGradient gradientTransform="matrix(0.7071 -0.7071 -0.7071 -0.7071 201.7121 10.7984)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="-119.7256" x2="-126.43" y1="132.7783" y2="126.1663">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M23.231,3.382l-1.387,1.385c0.842,0.842,0.842,2.209,0,3.049l1.387,1.387  C24.836,7.599,24.836,4.987,23.231,3.382z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 -1 919.7686 -335)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="893.1245" x2="893.1245" y1="-345.8447" y2="-334.9362">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <path d="M26.375,10.529c1.232-1.232,1.867-2.835,1.92-4.452c0.057,1.76-0.578,3.54-1.92,4.881l-1.387-1.386  c0.072-0.073,0.137-0.15,0.204-0.226L26.375,10.529z" fill="url(#SVGID_20_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 -1 919.7686 -335)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="896.6313" x2="896.6313" y1="-344.2075" y2="-338.9817">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <path d="M23.231,8.772c0.746-0.749,1.143-1.714,1.193-2.695C24.482,7.2,24.086,8.345,23.231,9.2  l-1.387-1.387c0.074-0.072,0.133-0.154,0.191-0.235L23.231,8.772z" fill="url(#SVGID_21_)"/>
 <path d="M26.377,2.055l-1.185,1.181c-0.067-0.074-0.132-0.152-0.202-0.225l1.387-1.386  c1.34,1.342,1.975,3.12,1.918,4.881C28.243,4.888,27.608,3.287,26.377,2.055z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <path d="M23.231,3.812l-1.195,1.192c-0.059-0.08-0.117-0.162-0.191-0.237l1.387-1.385  c0.855,0.856,1.251,2.002,1.193,3.124C24.374,5.524,23.977,4.56,23.231,3.812z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="302.5112" x2="302.5112" y1="-360.3394" y2="-362.1274">
-<stop offset="0" style="stop-color:#334247"/>
-<stop offset="1" style="stop-color:#446066"/>
+<stop offset="0" style="stop-color:#393B41"/>
+<stop offset="1" style="stop-color:#4E555C"/>
 </linearGradient>
 <path d="M25.579,27.132c-0.35,0-0.623-0.233-0.623-0.533v-0.711c0-0.299,0.273-0.533,0.623-0.533h1.867  c0.348,0,0.621,0.234,0.621,0.533v0.711c0,0.3-0.273,0.533-0.621,0.533H25.579z" fill="url(#SVGID_22_)"/>
-<path d="M27.755,26.599c0,0.123-0.138,0.223-0.31,0.223h-1.867  c-0.172,0-0.311-0.1-0.311-0.223v-0.711c0-0.121,0.139-0.222,0.311-0.222h1.867c0.172,0,0.31,0.099,0.31,0.222V26.599z" fill="#3FA9F5" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M27.755,26.599c0,0.123-0.138,0.223-0.31,0.223h-1.867  c-0.172,0-0.311-0.1-0.311-0.223v-0.711c0-0.121,0.139-0.222,0.311-0.222h1.867c0.172,0,0.31,0.099,0.31,0.222V26.599z" fill="#76B2BE" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phonebook.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phonebook.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phonebook.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -16,33 +16,33 @@
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M55.259,22.511c0.438-0.225,0.713-0.678,0.713-1.17v-9.238c0-0.492-0.275-0.945-0.713-1.169  l-3.399-1.187v14.432L55.259,22.511z" fill="url(#SVGID_2_)"/>
-<polygon fill="#231F20" fill-opacity="0.35" points="51.769,21.19 55.08,22.481 52.512,23.733 51.769,23.71 " stroke-opacity="0.35"/>
+<polygon fill="#222021" fill-opacity="0.35" points="51.769,21.19 55.08,22.481 52.512,23.733 51.769,23.71 " stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="55.6133" x2="51.1445" y1="30.522" y2="30.522">
-<stop offset="0" style="stop-color:#AFE865"/>
-<stop offset="0.0485" style="stop-color:#AFE865"/>
-<stop offset="0.0606" style="stop-color:#68B339"/>
-<stop offset="1" style="stop-color:#136101"/>
+<stop offset="0" style="stop-color:#ADC18C"/>
+<stop offset="0.0485" style="stop-color:#ADC18C"/>
+<stop offset="0.0606" style="stop-color:#6A8E5E"/>
+<stop offset="1" style="stop-color:#1E443C"/>
 </linearGradient>
 <path d="M55.093,36.307c0.438-0.224,0.715-0.678,0.715-1.169v-9.239c0-0.49-0.277-0.943-0.715-1.167  l-3.754-1.427v14.435L55.093,36.307z" fill="url(#SVGID_3_)"/>
-<polygon fill="#231F20" fill-opacity="0.35" points="50.641,35.196 54.729,36.608 51.83,37.739 50.629,37.705 " stroke-opacity="0.35"/>
+<polygon fill="#222021" fill-opacity="0.35" points="50.641,35.196 54.729,36.608 51.83,37.739 50.629,37.705 " stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="55.5654" x2="50.8946" y1="44.645" y2="44.645">
-<stop offset="0" style="stop-color:#B8D6E9"/>
-<stop offset="0.0667" style="stop-color:#5CB2E9"/>
-<stop offset="1" style="stop-color:#005BCC"/>
+<stop offset="0" style="stop-color:#C7DAD3"/>
+<stop offset="0.0667" style="stop-color:#86BBBF"/>
+<stop offset="1" style="stop-color:#3D568F"/>
 </linearGradient>
 <path d="M55.193,50.915c0.438-0.224,0.715-0.677,0.715-1.169V39.538c0-0.492-0.277-0.944-0.715-1.169  l-4.172-1.427v15.405L55.193,50.915z" fill="url(#SVGID_4_)"/>
 <rect fill="#404041" fill-opacity="0.2" height="54.379" stroke-opacity="0.2" width="18.668" x="34.059" y="2.811"/>
 <rect fill="#404041" fill-opacity="0.2" height="54.379" stroke-opacity="0.2" width="18.668" x="33.246" y="2.811"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="27.5664" x2="27.5664" y1="1.9009" y2="57.1847">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.5333" style="stop-color:#439020"/>
-<stop offset="1" style="stop-color:#0D4D07"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.5333" style="stop-color:#426E4B"/>
+<stop offset="1" style="stop-color:#1C3837"/>
 </linearGradient>
 <path d="M51.104,56.377c0,0.898-0.729,1.623-1.624,1.623H5.652c-0.896,0-1.623-0.725-1.623-1.623V3.623  C4.029,2.728,4.756,2,5.652,2h43.827c0.896,0,1.624,0.728,1.624,1.623V56.377z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30.4072" x2="30.4072" y1="1.73" y2="72.4742">
-<stop offset="0" style="stop-color:#CDEDBD"/>
-<stop offset="0.9879" style="stop-color:#139900"/>
-<stop offset="1" style="stop-color:#139900"/>
+<stop offset="0" style="stop-color:#D6DFCB"/>
+<stop offset="0.9879" style="stop-color:#2E6B4D"/>
+<stop offset="1" style="stop-color:#2E6B4D"/>
 </linearGradient>
 <path d="M49.479,2.811c0.448,0,0.811,0.365,0.811,0.813v52.754c0,0.449-0.362,0.813-0.811,0.813H10.521V2.811  H49.479 M49.479,2H9.711v56h39.769c0.896,0,1.624-0.725,1.624-1.623V3.623C51.104,2.728,50.375,2,49.479,2L49.479,2z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="6.8701" x2="6.8701" y1="1.73" y2="58.813">
@@ -61,6 +61,6 @@
 <stop offset="1" style="stop-color:#CFCFCF"/>
 </linearGradient>
 <path d="M39.314,37.199c-1.072-0.559-2.147-0.521-4.064-1.728c-3.053-1.921,0.533-4.525,1.326-6.673  c0.652,0.225,1.488-0.381,1.904-1.406c0.431-1.063,0.244-2.166-0.416-2.463c-0.037-0.016-0.078-0.02-0.114-0.031l0,0  c0.083-0.337,0.122-0.533,0.122-0.533c1.142-5.12-1.34-9.179-7.358-9.381c-2.473,0-3.661,1.126-4.58,2.301  c-1.491,0.23-3.853,1.596-2.196,7.566c-0.059,0.021-0.115,0.041-0.181,0.07c-0.667,0.28-0.875,1.374-0.469,2.441  c0.409,1.066,1.282,1.705,1.947,1.424c0.042-0.017,0.076-0.047,0.114-0.071c0.729,2.23,4.109,5.207,1.46,6.626  c-0.192,0.104-3.283,1.211-4.5,1.857c-1.396,0.74-3.671,2.441-3.671,6.275h24.348C42.986,39.641,40.389,37.76,39.314,37.199z" fill="url(#SVGID_9_)"/>
-<rect fill="#DEFEAC" fill-opacity="0.5" height="0.813" stroke-opacity="0.5" width="24.348" x="18.639" y="43.475"/>
+<rect fill="#DDE5C5" fill-opacity="0.5" height="0.813" stroke-opacity="0.5" width="24.348" x="18.639" y="43.475"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photos.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photos.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photos.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,44 +5,44 @@
 <rect fill="none" height="60" width="59.999"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="28.0479" x2="28.0478" y1="7.7354" y2="49.7556">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.2485" style="stop-color:#F1F2F2"/>
-<stop offset="0.6121" style="stop-color:#D4DADE"/>
-<stop offset="0.9152" style="stop-color:#E3E8E8"/>
-<stop offset="0.9818" style="stop-color:#FCFFFE"/>
-<stop offset="1" style="stop-color:#FCFFFE"/>
+<stop offset="0.2485" style="stop-color:#F1F2F1"/>
+<stop offset="0.6121" style="stop-color:#D7DBD9"/>
+<stop offset="0.9152" style="stop-color:#E4E6E5"/>
+<stop offset="0.9818" style="stop-color:#FDFEFD"/>
+<stop offset="1" style="stop-color:#FDFEFD"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="54.098,47.98 4.005,50.45 1.999,9.095 52.092,6.622 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="28.0479" x2="28.0478" y1="8.2808" y2="49.2366">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.2485" style="stop-color:#EBECEC"/>
-<stop offset="0.6121" style="stop-color:#ADB2B5"/>
-<stop offset="0.9152" style="stop-color:#CCD1D1"/>
-<stop offset="0.9818" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#E6E9E8"/>
+<stop offset="0.2485" style="stop-color:#EBECEB"/>
+<stop offset="0.6121" style="stop-color:#AFB3B2"/>
+<stop offset="0.9152" style="stop-color:#CED0CE"/>
+<stop offset="0.9818" style="stop-color:#E7E8E7"/>
+<stop offset="1" style="stop-color:#E7E8E7"/>
 </linearGradient>
 <path d="M51.492,7.289l1.943,40.087l-48.83,2.405L2.661,9.698L51.492,7.289" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="5.3555" x2="50.48" y1="26.7739" y2="24.7415">
-<stop offset="0" style="stop-color:#92D4E3"/>
-<stop offset="1" style="stop-color:#2671D1"/>
+<stop offset="0" style="stop-color:#AACBC0"/>
+<stop offset="1" style="stop-color:#59769E"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="51.11,39.233 6.322,41.44 4.908,12.275 49.697,10.066 "/>
-<polygon fill="#231F20" fill-opacity="0.3" points="53.861,50.161 52.514,14.279 7.008,14.279 7.008,50.161 " stroke-opacity="0.3"/>
+<polygon fill="#222021" fill-opacity="0.3" points="53.861,50.161 52.514,14.279 7.008,14.279 7.008,50.161 " stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="32.9248" x2="32.9248" y1="14.937" y2="53.5091">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.297" style="stop-color:#DBDCDD"/>
-<stop offset="0.6121" style="stop-color:#ADB2B5"/>
-<stop offset="0.9152" style="stop-color:#CCD1D1"/>
-<stop offset="0.9818" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#E6E9E8"/>
+<stop offset="0.297" style="stop-color:#DCDCDC"/>
+<stop offset="0.6121" style="stop-color:#AFB3B2"/>
+<stop offset="0.9152" style="stop-color:#CED0CE"/>
+<stop offset="0.9818" style="stop-color:#E7E8E7"/>
+<stop offset="1" style="stop-color:#E7E8E7"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="38.25" width="50.149" x="7.85" y="15.128"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="32.9248" x2="32.9248" y1="15.1279" y2="53.5738">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.2485" style="stop-color:#F1F2F2"/>
-<stop offset="0.6121" style="stop-color:#D4DADE"/>
-<stop offset="0.9152" style="stop-color:#E3E8E8"/>
-<stop offset="0.9818" style="stop-color:#FCFFFE"/>
-<stop offset="1" style="stop-color:#FCFFFE"/>
+<stop offset="0.2485" style="stop-color:#F1F2F1"/>
+<stop offset="0.6121" style="stop-color:#D7DBD9"/>
+<stop offset="0.9152" style="stop-color:#E4E6E5"/>
+<stop offset="0.9818" style="stop-color:#FDFEFD"/>
+<stop offset="1" style="stop-color:#FDFEFD"/>
 </linearGradient>
 <path d="M57.37,15.767v36.973H8.479V15.767H57.37 M57.999,15.128H7.85v38.25h50.149V15.128L57.999,15.128z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="33.0215" x2="33.0215" y1="18.2749" y2="50.5403">
@@ -51,57 +51,57 @@
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="31.317" width="44.844" x="10.6" y="18.45"/>
 <radialGradient cx="54.0225" cy="18.9033" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="52.4862">
-<stop offset="0" style="stop-color:#8BC53F"/>
-<stop offset="0.503" style="stop-color:#33773B"/>
-<stop offset="1" style="stop-color:#004F3C"/>
+<stop offset="0" style="stop-color:#869D67"/>
+<stop offset="0.503" style="stop-color:#476358"/>
+<stop offset="1" style="stop-color:#182637"/>
 </radialGradient>
 <rect fill="url(#SVGID_7_)" height="30.029" width="43.32" x="11.344" y="19.173"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="18.3887" x2="65.1917" y1="23.498" y2="49.7402">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
 </linearGradient>
 <path d="M54.664,39.146c-0.629-0.43-1.334-0.841-2.129-1.204c-4.343-1.972-17.958-4.564-27.088-7.607  c-9.131-3.045-5.986-6.29-5.986-6.29c-0.202-0.711-0.709-1.421-1.521-0.204c-2.154,3.23,2.193,5.898,7,7.608  c5.986,2.132,19.838,4.423,25.262,8.016c1.836,1.216,3.296,2.394,4.463,3.482V39.146z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="25.0088" x2="27.8499" y1="32.647" y2="39.5468">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
 </linearGradient>
 <path d="M21.49,39.972c1.014,0.813,4.647,1.473,8.219-1.927c2.129-2.029,2.129-5.073,2.129-5.073  s-3.854-1.116-7.405,1.319C20.882,36.726,20.477,39.159,21.49,39.972z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="15.8662" x2="16.0691" y1="27.7065" y2="31.6628">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
 </linearGradient>
 <path d="M12.544,30.37c0.415,0.624,2.298,1.62,4.854,0.377c1.524-0.744,2.057-2.417,2.057-2.417  s-1.925-1.286-4.302-0.567C12.775,28.479,12.129,29.746,12.544,30.37z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="25.8027" x2="26.7159" y1="25.4258" y2="29.8901">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
 </linearGradient>
 <path d="M29.506,25.059c-0.711-0.71-2.659-1.55-5.275,0.61c-1.563,1.288-1.581,3.556-1.581,3.556  s2.595,0.298,4.675-0.817C29.73,27.116,30.14,25.693,29.506,25.059z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="40.0938" x2="42.1227" y1="28.4878" y2="39.1729">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
 </linearGradient>
 <path d="M43.962,28.813c-0.614-0.793-2.64-1.47-4.871,0.71c-1.446,1.414-1.935,4.57-1.935,4.57  s2.595,0.3,4.674-0.816C44.236,31.985,44.824,29.929,43.962,28.813z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="43.7607" x2="43.2202" y1="36.4453" y2="47.2661">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
 </linearGradient>
 <path d="M37.245,46.001c1.288,0.863,6.896,2.138,11.433-1.479c2.711-2.159,1.725-5.969,1.725-5.969  s-5.83-2.202-10.347,0.391C35.539,41.532,35.954,45.136,37.245,46.001z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="52.2568" x2="56.5859" y1="29.7988" y2="42.3786">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+<stop offset="0" style="stop-color:#8FB34D"/>
+<stop offset="1" style="stop-color:#2B644B"/>
 </linearGradient>
 <path d="M54.664,29.374c-1.041,1.038-1.97,2.361-2.577,4.026c-1.184,3.254,1.644,5.99,1.644,5.99  s0.359-0.069,0.934-0.233V29.374z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="47.4512" x2="44.533" y1="29.749" y2="35.4486">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1333" style="stop-color:#45E8FF"/>
-<stop offset="0.5333" style="stop-color:#30A4D5"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1333" style="stop-color:#7DC7BB"/>
+<stop offset="0.5333" style="stop-color:#6292A3"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M44.197,35.911c0,0,1.608-8.439,3.197-5.71C48.369,31.871,45.559,35.674,44.197,35.911z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="40.9365" x2="43.3032" y1="29.688" y2="36.0635">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.5152" style="stop-color:#30A4D5"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.5152" style="stop-color:#6292A3"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M44.324,35.956c0,0-0.502-10.259-3.893-6.101C38.119,32.696,41.59,34.696,44.324,35.956z" fill="url(#SVGID_16_)"/>
 <polygon fill="#FFFFFF" fill-opacity="0.3" points="57.999,25.07 57.999,15.128 7.85,15.128 7.85,31.056 " stroke-opacity="0.3"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_pin_code.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_pin_code.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_pin_code.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,21 +3,21 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="19.1738" y2="39.8846">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.3879" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A2A6A8"/>
+<stop offset="1" style="stop-color:#A4A6A6"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="20.795" width="56" x="2" y="19.068"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.0005" x2="30.0005" y1="22.8101" y2="37.2885">
-<stop offset="0" style="stop-color:#A9AAAD"/>
+<stop offset="0" style="stop-color:#AAABAC"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="14.537" width="47.479" x="6.262" y="22.736"/>
-<rect fill="#231F20" fill-opacity="0.2" height="14.562" stroke-opacity="0.2" width="1.068" x="52.658" y="22.657"/>
-<rect fill="#231F20" fill-opacity="0.2" height="14.562" stroke-opacity="0.2" width="1.068" x="6.41" y="22.657"/>
+<rect fill="#222021" fill-opacity="0.2" height="14.562" stroke-opacity="0.2" width="1.068" x="52.658" y="22.657"/>
+<rect fill="#222021" fill-opacity="0.2" height="14.562" stroke-opacity="0.2" width="1.068" x="6.41" y="22.657"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.9995" x2="29.9995" y1="19.1792" y2="40.952">
-<stop offset="0" style="stop-color:#D2D3D3"/>
-<stop offset="1" style="stop-color:#7B7E80"/>
+<stop offset="0" style="stop-color:#D2D3D2"/>
+<stop offset="1" style="stop-color:#7D7E7F"/>
 </linearGradient>
 <path d="M2,19.068V40.93h56V19.068H2z M56.932,39.863H3.068V20.135h53.863V39.863z" fill="url(#SVGID_3_)"/>
 <polygon points="36.742,27.786 35.885,27.292 34.578,29.555 33.271,27.292 32.412,27.786 33.721,30.051 31.107,30.051   31.107,31.043 33.721,31.043 32.412,33.305 33.271,33.799 34.578,31.537 35.885,33.799 36.744,33.305 35.438,31.043 38.051,31.043   38.051,30.051 35.436,30.051 "/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_play.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_play.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_play.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,18 +5,18 @@
 <rect fill="none" height="60" width="60"/>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 590.3462 -1619.0369)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1120.6924" x2="-1120.6924" y1="3241.8101" y2="3353.8101">
-<stop offset="0" style="stop-color:#D5F5B5"/>
-<stop offset="1" style="stop-color:#40AD00"/>
+<stop offset="0" style="stop-color:#D9E2C8"/>
+<stop offset="1" style="stop-color:#347940"/>
 </linearGradient>
 <path d="M30,58C14.561,58,2,45.44,2,30C2,14.562,14.561,2,30,2c15.436,0,28,12.562,28,28  C58,45.44,45.436,58,30,58L30,58z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3204.8525)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164.001" x2="-2164.001" y1="3202.0542" y2="3146.4495">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+<stop offset="0" style="stop-color:#93BD66"/>
+<stop offset="1" style="stop-color:#22403B"/>
 </linearGradient>
 <path d="M57.197,30c0,15.024-12.18,27.201-27.197,27.201C14.975,57.201,2.801,45.024,2.801,30  C2.801,14.981,14.975,2.799,30,2.799C45.018,2.799,57.197,14.981,57.197,30z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="33.0234" x2="33.0234" y1="42.7275" y2="14.4317">
-<stop offset="0" style="stop-color:#82DA3B"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#89AA6B"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="20.705,14.267 45.342,28.42 20.705,42.858 "/>
 <polygon fill="#FFFFFF" points="22.221,16.888 44.016,29.469 22.221,42.054 "/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_playlist.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_playlist.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_playlist.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,9 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20.6719" x2="23.6638" y1="61.0908" y2="51.1174">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="0.7455" style="stop-color:#ADB2B5"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+<stop offset="0" style="stop-color:#E7E8E7"/>
+<stop offset="0.7455" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="53" width="51.291" x="4.354" y="3.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="3.0728" y2="54.3628">
@@ -15,16 +15,16 @@
 </linearGradient>
 <path d="M55.645,54.79h-26.5c0,0-13.249-0.381-20.089-3.347c-4.56-1.975-4.702-4.181-4.702-4.181V3.5h51.291  V54.79z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.999" x2="29.999" y1="3.0728" y2="54.3628">
-<stop offset="0" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+<stop offset="0" style="stop-color:#E7EBE8"/>
+<stop offset="0.703" style="stop-color:#919595"/>
+<stop offset="1" style="stop-color:#B9BDBC"/>
 </linearGradient>
 <path d="M4.354,3.5v43.763c0,0,0.048,0.672,0.855,1.611V4.356h49.58v49.582H19.324  c5.195,0.719,9.82,0.852,9.82,0.852h26.5V3.5H4.354z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="18.7158" x2="16.7993" y1="47.938" y2="54.272">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.1939" style="stop-color:#E6E9E8"/>
-<stop offset="0.9333" style="stop-color:#84878A"/>
-<stop offset="1" style="stop-color:#84878A"/>
+<stop offset="0.1939" style="stop-color:#E7E8E7"/>
+<stop offset="0.9333" style="stop-color:#868788"/>
+<stop offset="1" style="stop-color:#868788"/>
 </linearGradient>
 <path d="M31.211,54.79c0,0-12.406,0.569-17.906-8.515  c0,0-7.511,5.564-8.951,0.987C4.967,50.406,10.504,54.903,31.211,54.79z" fill="url(#SVGID_4_)" fill-rule="evenodd"/>
 <rect fill="#F5F5F5" height="0.855" width="42.741" x="8.628" y="39.55"/>
@@ -41,29 +41,29 @@
 <polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
 <path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06  c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0  l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204  c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+<stop offset="0" style="stop-color:#93BD66"/>
+<stop offset="1" style="stop-color:#22403B"/>
 </linearGradient>
 <path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729  c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493  c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#A6C87E"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#BCD39A"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4__)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.4667" style="stop-color:#347940"/>
+<stop offset="1" style="stop-color:#173636"/>
 </linearGradient>
 <path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229  c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84  c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5_)"/>
 <rect fill="none" height="30" width="30" y="0.487"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_positioning.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_positioning.svg	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="307.1426" x2="307.1426" y1="-338.7412" y2="-384.8441">
-<stop offset="0" style="stop-color:#4FB7EB"/>
-<stop offset="1" style="stop-color:#1755B3"/>
-</linearGradient>
-<polygon fill="url(#SVGID_1_)" points="49.362,7.722 57.042,8.771 57.042,51.648 43.521,53.498 30,50.807 22.283,52.262 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="304.2402" x2="304.2402" y1="-352.3188" y2="-384.8111">
-<stop offset="0" style="stop-color:#8EFFF5"/>
-<stop offset="1" style="stop-color:#1D9DD8"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2_)" points="43.521,20.192 43.521,53.498 30,50.807 30,39.762 "/>
-<polygon fill-opacity="0.25" points="50.26,7.855 43.521,22.093 30,41.684 23.377,52.074 20.223,52.66   47.878,7.523 " stroke-opacity="0.25"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="291.7021" x2="291.7021" y1="-338.3325" y2="-384.5055">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="1" style="stop-color:#FFC501"/>
-</linearGradient>
-<polygon fill="url(#SVGID_3_)" points="45.482,9.658 43.416,20.78 30,40.236 22.332,52.27 15.73,53.498 2.962,51.096 2.962,7.848   15.355,6.921 30,8.953 43.521,6.921 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="290.3457" x2="290.3457" y1="-382.6211" y2="-339.5177">
-<stop offset="0" style="stop-color:#E69400"/>
-<stop offset="1" style="stop-color:#F9DE4F"/>
-</linearGradient>
-<polygon fill="url(#SVGID_4_)" points="30,8.953 30,40.236 22.332,52.27 15.73,53.498 15.73,6.975 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="313.9336" x2="313.9336" y1="-351.3516" y2="-338.7017">
-<stop offset="0" style="stop-color:#E69400"/>
-<stop offset="1" style="stop-color:#F9DE4F"/>
-</linearGradient>
-<polygon fill="url(#SVGID_5_)" points="43.521,6.921 43.521,20.625 49.384,7.724 "/>
-<path d="M16.481,53.352l11.489-17.232l-4.841-2.406l-7.339,10.152  l-7.168,8.281l-2.29-0.424l9.407-11.078l5.523-7.85l-5.784-2.85L2.962,27.38v-1.32l12.994,2.686l6.07,2.979l6.841-9.601  l-13.339-6.657L2.962,13.258v-2.043l12.972,2.171l13.968,6.974l4.003-6.803l-3.908-1.373l-5.807-4.013l2.769,0.383l3.052,2.231  l4.549,1.657l2.689-4.566L39.882,7.5l-3.506,5.913l4.999,2.689l2.188-3.465l2.257-5.396l1.268,0.173l-3.548,7.662  c0,0-8.686,13.464-13.521,20.694L18.318,53.018L16.481,53.352z M28.837,35.115l-4.9-2.488l6.735-9.472l4.503,2.186L28.837,35.115z   M31.748,21.279l4.714,2.353l4.213-6.433l-4.958-2.667L31.748,21.279L31.748,21.279z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="292.3779" x2="292.3779" y1="-384.0728" y2="-350.2898">
-<stop offset="0" style="stop-color:#FCE28D"/>
-<stop offset="0.8121" style="stop-color:#FEF7DF"/>
-<stop offset="1" style="stop-color:#FEF7DF"/>
-</linearGradient>
-<path d="M46.025,7.262l-2.477,5.932c0,0-1.337,2.112-2.076,3.277l-5.486-2.949l3.527-5.948l-1.79,0.241  l-3.054,4.999l-4.627-1.698l-3.417-2.63l-2.113-0.292l5.51,3.755l4.268,1.503l-4.279,7.275l-14.134-7.056L2.962,11.49v1.483  l12.62,2.208l13.677,6.826l-0.164,0.276l-6.977,9.794l-6.366-3.1L2.959,26.357L2.962,27.1l12.753,2.652l5.966,2.938L15.758,41  L6.646,51.789l1.694,0.316l7.417-8.592l7.282-10.158l5.416,2.668L16.874,53.285l1.054-0.197l12.089-18.129l13.552-20.4l3.267-7.185  L46.025,7.262z M30.009,33.498l-1.264,1.945l-5.27-2.695l6.604-9.387l0.519-0.686l5.138,2.565L30.009,33.498z M36.559,23.992  l-5.202-2.597l4.253-7.233l5.463,2.937L36.559,23.992z" fill="url(#SVGID_6_)"/>
-<polygon fill="#FFFFFF" points="38.255,46.385 43.528,35.268 48.269,46.385 43.528,43.514 "/>
-<polygon fill-opacity="0.4" points="48.269,46.385 43.528,35.268 43.528,43.514 " stroke-opacity="0.4"/>
-<path d="M20.926,5.4c-1.043,0-1.892,0.833-1.892,1.857c0,1.022,0.849,1.855,1.892,1.855  c1.042,0,1.891-0.833,1.891-1.855C22.818,6.232,21.968,5.4,20.926,5.4z" fill="none"/>
-<rect fill="none" height="60" width="60.001"/>
-<path d="M21.041,33.514l5.39-9.33l9.33-5.389l-9.33-5.388l-2.635-5.315l-5.098-0.706  l-3.045,6.021l-9.33,5.388l9.331,5.389L21.041,33.514z M23.442,13.688h2.705v2.706h-2.705V13.688z M23.442,21.197h2.705V23.9h-2.705  V21.197z M15.936,13.688h2.705v2.706h-2.705V13.688z M15.936,21.197h2.705V23.9h-2.705V21.197z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="288.5215" x2="288.5215" y1="-336.2764" y2="-362.4492">
-<stop offset="0" style="stop-color:#DAFF8C"/>
-<stop offset="0.1879" style="stop-color:#DAFF8C"/>
-<stop offset="1" style="stop-color:#77C949"/>
-</linearGradient>
-<polygon fill="url(#SVGID_7_)" points="34.261,18.043 26.898,13.793 26.898,16.394 22.691,16.394 22.691,12.186 25.292,12.186   21.041,4.826 16.791,12.186 19.392,12.186 19.392,16.394 15.184,16.394 15.184,13.793 7.823,18.043 15.184,22.294 15.184,19.694   19.392,19.694 19.392,23.9 16.791,23.9 21.041,31.262 25.292,23.9 22.691,23.9 22.691,19.694 26.898,19.694 26.898,22.294 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="288.5215" x2="288.5215" y1="-337.4956" y2="-361.0748">
-<stop offset="0" style="stop-color:#AEE737"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<polygon fill="url(#SVGID_8_)" points="18.092,24.651 20.142,24.651 20.142,18.943 14.434,18.943 14.434,20.992 9.326,18.043   14.434,15.095 14.434,17.145 20.142,17.145 20.142,11.435 18.092,11.435 21.041,6.328 23.991,11.435 21.941,11.435 21.941,17.145   27.65,17.145 27.65,15.095 32.757,18.043 27.65,20.992 27.65,18.943 21.941,18.943 21.941,24.651 23.991,24.651 21.041,29.758 "/>
-<path d="M21.041,22.492c-2.039,0-3.697-1.659-3.697-3.698s1.659-3.698,3.697-3.698  c2.039,0,3.698,1.659,3.698,3.698S23.08,22.492,21.041,22.492L21.041,22.492z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="288.5215" x2="288.5215" y1="-346.1563" y2="-352.2564">
-<stop offset="0" style="stop-color:#DAFF8C"/>
-<stop offset="0.1879" style="stop-color:#DAFF8C"/>
-<stop offset="1" style="stop-color:#77C949"/>
-</linearGradient>
-<circle cx="21.041" cy="18.129" fill="url(#SVGID_9_)" r="3.031"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="288.5215" x2="288.5215" y1="-346.814" y2="-351.5732">
-<stop offset="0" style="stop-color:#AEE737"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path d="M21.041,20.493c-1.304,0-2.364-1.061-2.364-2.365c0-1.304,1.06-2.366,2.364-2.366  c1.305,0,2.365,1.06,2.365,2.366C23.406,19.432,22.346,20.493,21.041,20.493L21.041,20.493z" fill="url(#SVGID_10_)"/>
-</g>
-</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_positioning_info.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_positioning_info.svg	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="307.1426" x2="307.1426" y1="-338.7412" y2="-384.8441">
-<stop offset="0" style="stop-color:#4FB7EB"/>
-<stop offset="1" style="stop-color:#1755B3"/>
-</linearGradient>
-<polygon fill="url(#SVGID_1_)" points="49.362,7.722 57.042,8.771 57.042,51.648 43.521,53.498 30,50.807 22.283,52.262 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="304.2402" x2="304.2402" y1="-352.3188" y2="-384.8111">
-<stop offset="0" style="stop-color:#8EFFF5"/>
-<stop offset="1" style="stop-color:#1D9DD8"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2_)" points="43.521,20.192 43.521,53.498 30,50.807 30,39.762 "/>
-<polygon fill-opacity="0.25" points="50.26,7.855 43.521,22.093 30,41.684 23.377,52.074 20.223,52.66   47.878,7.523 " stroke-opacity="0.25"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="291.7021" x2="291.7021" y1="-338.3325" y2="-384.5055">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="1" style="stop-color:#FFC501"/>
-</linearGradient>
-<polygon fill="url(#SVGID_3_)" points="45.482,9.658 43.416,20.78 30,40.236 22.332,52.27 15.73,53.498 2.962,51.096 2.962,7.848   15.355,6.921 30,8.953 43.521,6.921 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="290.3457" x2="290.3457" y1="-382.6211" y2="-339.5177">
-<stop offset="0" style="stop-color:#E69400"/>
-<stop offset="1" style="stop-color:#F9DE4F"/>
-</linearGradient>
-<polygon fill="url(#SVGID_4_)" points="30,8.953 30,40.236 22.332,52.27 15.73,53.498 15.73,6.975 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="313.9336" x2="313.9336" y1="-351.3516" y2="-338.7017">
-<stop offset="0" style="stop-color:#E69400"/>
-<stop offset="1" style="stop-color:#F9DE4F"/>
-</linearGradient>
-<polygon fill="url(#SVGID_5_)" points="43.521,6.921 43.521,20.625 49.384,7.724 "/>
-<path d="M16.481,53.352l11.489-17.232l-4.841-2.406l-7.339,10.152  l-7.168,8.281l-2.29-0.424l9.407-11.078l5.523-7.85l-5.784-2.85L2.962,27.38v-1.32l12.994,2.686l6.07,2.979l6.841-9.601  l-13.339-6.657L2.962,13.258v-2.043l12.972,2.171l13.968,6.974l4.003-6.803l-3.908-1.373l-5.807-4.013l2.769,0.383l3.052,2.231  l4.549,1.657l2.689-4.566L39.882,7.5l-3.506,5.913l4.999,2.689l2.188-3.465l2.257-5.396l1.268,0.173l-3.548,7.662  c0,0-8.686,13.464-13.521,20.694L18.318,53.018L16.481,53.352z M28.837,35.115l-4.9-2.488l6.735-9.472l4.503,2.186L28.837,35.115z   M31.748,21.279l4.714,2.353l4.213-6.433l-4.958-2.667L31.748,21.279L31.748,21.279z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="292.3779" x2="292.3779" y1="-384.0728" y2="-350.2898">
-<stop offset="0" style="stop-color:#FCE28D"/>
-<stop offset="0.8121" style="stop-color:#FEF7DF"/>
-<stop offset="1" style="stop-color:#FEF7DF"/>
-</linearGradient>
-<path d="M46.025,7.262l-2.477,5.932c0,0-1.337,2.112-2.076,3.277l-5.486-2.949l3.527-5.948l-1.79,0.241  l-3.054,4.999l-4.627-1.698l-3.417-2.63l-2.113-0.292l5.51,3.755l4.268,1.503l-4.279,7.275l-14.134-7.056L2.962,11.49v1.483  l12.62,2.208l13.677,6.826l-0.164,0.276l-6.977,9.794l-6.366-3.1L2.959,26.357L2.962,27.1l12.753,2.652l5.966,2.938L15.758,41  L6.646,51.789l1.694,0.316l7.417-8.592l7.282-10.158l5.416,2.668L16.874,53.285l1.054-0.197l12.089-18.129l13.552-20.4l3.267-7.185  L46.025,7.262z M30.009,33.498l-1.264,1.945l-5.27-2.695l6.604-9.387l0.519-0.686l5.138,2.565L30.009,33.498z M36.559,23.992  l-5.202-2.597l4.253-7.233l5.463,2.937L36.559,23.992z" fill="url(#SVGID_6_)"/>
-<polygon fill="#FFFFFF" points="38.255,46.385 43.528,35.268 48.269,46.385 43.528,43.514 "/>
-<polygon fill-opacity="0.4" points="48.269,46.385 43.528,35.268 43.528,43.514 " stroke-opacity="0.4"/>
-<path d="M20.926,5.4c-1.043,0-1.892,0.833-1.892,1.857c0,1.022,0.849,1.855,1.892,1.855  c1.042,0,1.891-0.833,1.891-1.855C22.818,6.232,21.968,5.4,20.926,5.4z" fill="none"/>
-<rect fill="none" height="60" width="60.001"/>
-<path d="M21.041,33.514l5.39-9.33l9.33-5.389l-9.33-5.388l-2.635-5.315l-5.098-0.706  l-3.045,6.021l-9.33,5.388l9.331,5.389L21.041,33.514z M23.442,13.688h2.705v2.706h-2.705V13.688z M23.442,21.197h2.705V23.9h-2.705  V21.197z M15.936,13.688h2.705v2.706h-2.705V13.688z M15.936,21.197h2.705V23.9h-2.705V21.197z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="288.5215" x2="288.5215" y1="-336.2764" y2="-362.4492">
-<stop offset="0" style="stop-color:#DAFF8C"/>
-<stop offset="0.1879" style="stop-color:#DAFF8C"/>
-<stop offset="1" style="stop-color:#77C949"/>
-</linearGradient>
-<polygon fill="url(#SVGID_7_)" points="34.261,18.043 26.898,13.793 26.898,16.394 22.691,16.394 22.691,12.186 25.292,12.186   21.041,4.826 16.791,12.186 19.392,12.186 19.392,16.394 15.184,16.394 15.184,13.793 7.823,18.043 15.184,22.294 15.184,19.694   19.392,19.694 19.392,23.9 16.791,23.9 21.041,31.262 25.292,23.9 22.691,23.9 22.691,19.694 26.898,19.694 26.898,22.294 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="288.5215" x2="288.5215" y1="-337.4956" y2="-361.0748">
-<stop offset="0" style="stop-color:#AEE737"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<polygon fill="url(#SVGID_8_)" points="18.092,24.651 20.142,24.651 20.142,18.943 14.434,18.943 14.434,20.992 9.326,18.043   14.434,15.095 14.434,17.145 20.142,17.145 20.142,11.435 18.092,11.435 21.041,6.328 23.991,11.435 21.941,11.435 21.941,17.145   27.65,17.145 27.65,15.095 32.757,18.043 27.65,20.992 27.65,18.943 21.941,18.943 21.941,24.651 23.991,24.651 21.041,29.758 "/>
-<path d="M21.041,22.492c-2.039,0-3.697-1.659-3.697-3.698s1.659-3.698,3.697-3.698  c2.039,0,3.698,1.659,3.698,3.698S23.08,22.492,21.041,22.492L21.041,22.492z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="288.5215" x2="288.5215" y1="-346.1563" y2="-352.2564">
-<stop offset="0" style="stop-color:#DAFF8C"/>
-<stop offset="0.1879" style="stop-color:#DAFF8C"/>
-<stop offset="1" style="stop-color:#77C949"/>
-</linearGradient>
-<circle cx="21.041" cy="18.129" fill="url(#SVGID_9_)" r="3.031"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="288.5215" x2="288.5215" y1="-346.814" y2="-351.5732">
-<stop offset="0" style="stop-color:#AEE737"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<path d="M21.041,20.493c-1.304,0-2.364-1.061-2.364-2.365c0-1.304,1.06-2.366,2.364-2.366  c1.305,0,2.365,1.06,2.365,2.366C23.406,19.432,22.346,20.493,21.041,20.493L21.041,20.493z" fill="url(#SVGID_10_)"/>
-</g>
-<g transform="matrix(1 0 0 1 30 30)">
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<path d="M15,30C6.729,30,0,23.271,0,15C0,6.729,6.729,0,15,0s15,6.729,15,15C30,23.271,23.271,30,15,30L15,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<path d="M15.159,10.697c0.525,0,0.947-0.13,1.264-0.39  c0.316-0.259,0.474-0.615,0.474-1.07c0-0.44-0.164-0.795-0.49-1.061c-0.326-0.264-0.741-0.398-1.248-0.398  c-0.531,0-0.951,0.132-1.261,0.395c-0.311,0.262-0.465,0.617-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07  C14.224,10.567,14.641,10.697,15.159,10.697z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M15.159,10.369c0.525,0,0.947-0.129,1.264-0.389  c0.316-0.26,0.474-0.615,0.474-1.07c0-0.441-0.164-0.795-0.49-1.061c-0.326-0.266-0.741-0.398-1.248-0.398  c-0.531,0-0.951,0.13-1.261,0.394c-0.311,0.263-0.465,0.616-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07  C14.224,10.24,14.641,10.369,15.159,10.369z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<radialGradient cx="-2178.8628" cy="3345.4287" gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="26.49">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
-</radialGradient>
-<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1c7.721,0,14,6.28,14,14S22.72,29,15,29L15,29z" fill="url(#SVGID_1__)"/>
-<polygon fill-opacity="0.1" points="12.46,13.847 13.555,13.847 13.555,23.318 16.741,23.318 16.741,12.032   12.46,12.032 " stroke-opacity="0.1"/>
-<polygon fill-opacity="0.2" points="12.46,13.519 13.555,13.519 13.555,22.99 16.741,22.99 16.741,11.704   12.46,11.704 " stroke-opacity="0.2"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2179.3994" x2="-2179.3994" y1="3340.2148" y2="3324.8184">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2__)" points="12.46,13.191 13.555,13.191 13.555,22.663 16.741,22.663 16.741,11.377 12.46,11.377 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-2178.8477" x2="-2178.8477" y1="3340.2158" y2="3324.8235">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
-</linearGradient>
-<path d="M15.148,10.205c0.524,0,0.945-0.129,1.262-0.389c0.316-0.259,0.475-0.615,0.475-1.07  c0-0.441-0.163-0.795-0.489-1.061c-0.327-0.264-0.743-0.397-1.248-0.397c-0.531,0-0.952,0.131-1.262,0.394  c-0.312,0.262-0.466,0.617-0.466,1.064c0,0.455,0.159,0.812,0.477,1.07C14.212,10.076,14.63,10.205,15.148,10.205z" fill="url(#SVGID_3__)"/>
-</g>
-</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_power_management.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_power_management.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_power_management.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,36 +6,36 @@
 <rect fill="none" height="60" width="60"/>
 </g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="11.4556" x2="48.9027" y1="32.1465" y2="32.1465">
-<stop offset="0" style="stop-color:#AFB6BA"/>
-<stop offset="0.2667" style="stop-color:#DDE3E6"/>
-<stop offset="0.6545" style="stop-color:#949DA1"/>
-<stop offset="0.8788" style="stop-color:#D9DFE1"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#B2B7B6"/>
+<stop offset="0.2667" style="stop-color:#E0E3E1"/>
+<stop offset="0.6545" style="stop-color:#989D9D"/>
+<stop offset="0.8788" style="stop-color:#DBDFDD"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M48.544,55.771c0,0.678-0.55,1.228-1.228,1.228H12.684c-0.678,0-1.228-0.55-1.228-1.228V8.522  c0-0.678,0.55-1.228,1.228-1.228h34.633c0.678,0,1.228,0.55,1.228,1.228V55.771z" fill="url(#SVGID_1_)"/>
 <rect fill-opacity="0.4" height="36.816" width="29.726" x="15.137" y="12.204"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.4556" x2="48.5444" y1="55.7715" y2="55.7715">
 <stop offset="0" style="stop-color:#808080"/>
-<stop offset="0.5" style="stop-color:#231F20"/>
+<stop offset="0.5" style="stop-color:#222021"/>
 <stop offset="1" style="stop-color:#808080"/>
 </linearGradient>
 <path d="M47.317,55.771H12.684c-0.678,0-1.228-0.55-1.228-1.228v0.614v0.613  c0,0.678,0.55,1.228,1.228,1.228h34.633c0.678,0,1.228-0.55,1.228-1.228v-0.613v-0.614C48.544,55.222,47.995,55.771,47.317,55.771z" fill="url(#SVGID_2_)" fill-opacity="0.4"/>
 <path d="M47.317,7.295H12.684c-0.678,0-1.228,0.55-1.228,1.228v0.613  c0-0.678,0.55-1.227,1.228-1.227h34.633c0.678,0,1.228,0.549,1.228,1.227V8.522C48.544,7.845,47.995,7.295,47.317,7.295z" fill="#FFFFFF" fill-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="22.2319" x2="37.769" y1="5.147" y2="5.147">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.303" style="stop-color:#FFFFFF"/>
-<stop offset="0.7212" style="stop-color:#909496"/>
-<stop offset="1" style="stop-color:#D1D6D7"/>
+<stop offset="0.7212" style="stop-color:#929494"/>
+<stop offset="1" style="stop-color:#D3D5D4"/>
 </linearGradient>
 <path d="M37.769,7.295V4.839c0-1.016-0.792-1.84-1.768-1.84H23.999c-0.976,0-1.767,0.824-1.767,1.84v2.456  H37.769z" fill="url(#SVGID_3_)"/>
 <path d="M36.001,2.999H23.999c-0.976,0-1.767,0.824-1.767,1.84v0.615  c0-1.018,0.791-1.842,1.767-1.842h12.003c0.976,0,1.768,0.824,1.768,1.842V4.839C37.769,3.823,36.977,2.999,36.001,2.999z" fill="#FFFFFF" fill-opacity="0.4"/>
 <rect fill-opacity="0.4" height="0.613" width="15.537" x="22.232" y="6.682"/>
 <rect fill-opacity="0.2" height="0.614" width="15.537" x="22.232" y="6.067"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.6558" x2="44.6947" y1="38.2822" y2="38.2822">
-<stop offset="0" style="stop-color:#5AA913"/>
-<stop offset="0.3212" style="stop-color:#A8F222"/>
-<stop offset="0.7697" style="stop-color:#58A813"/>
-<stop offset="1" style="stop-color:#8FD31D"/>
+<stop offset="0" style="stop-color:#417C40"/>
+<stop offset="0.3212" style="stop-color:#97B460"/>
+<stop offset="0.7697" style="stop-color:#407B40"/>
+<stop offset="1" style="stop-color:#799C54"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="21.477" width="29.726" x="15.137" y="27.544"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="0.612" width="29.726" x="15.137" y="27.544"/>
@@ -46,9 +46,9 @@
 <path d="M15.137,12.204v36.816h29.726V12.204H15.137z M44.249,48.407H15.751V12.818h28.497V48.407z" fill-opacity="0.1"/>
 <rect fill-opacity="0.3" height="1.227" width="29.726" x="15.137" y="12.204"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11.4556" x2="48.5444" y1="53.0107" y2="53.0107">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.5" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#A6A8AB"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.5" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#A8A9AA"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" fill-opacity="0.3" height="0.613" width="37.089" x="11.456" y="52.704"/>
 <rect fill="#FFFFFF" fill-opacity="0.3" height="0.613" width="37.089" x="11.456" y="53.317"/>
@@ -63,41 +63,41 @@
 <path d="M16.827,22.331v-2.51h-3.667v2.602l0.015,0.235c0.001,0.012,0.105,1.172-0.536,1.902  c-0.449,0.512-1.251,0.771-2.383,0.771H5.302v3.674h4.954c2.232,0,3.961-0.679,5.137-2.019  C16.954,25.208,16.881,22.957,16.827,22.331z" fill="#333333"/>
 <path d="M16.217,22.385l-0.004-0.027v-2.536h-2.441v2.583l0.014,0.216l-0.002-0.012  c0.019,0.209,0.09,1.473-0.685,2.356c-0.571,0.65-1.527,0.979-2.843,0.979H5.302v2.449h4.954c2.049,0,3.622-0.609,4.676-1.811  C16.327,24.993,16.268,22.968,16.217,22.385z" fill="#4D4D4D"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="6.4722" x2="16.7294" y1="29.0205" y2="21.2034">
-<stop offset="0" style="stop-color:#A9AAAD"/>
+<stop offset="0" style="stop-color:#AAABAC"/>
 <stop offset="1" style="stop-color:#4D4D4D"/>
 </linearGradient>
 <path d="M15.604,22.412l-0.002-0.027v-2.563h-1.219v2.563l0.014,0.196c0.025,0.334,0.072,1.751-0.838,2.788  c-0.693,0.787-1.803,1.187-3.303,1.187H5.302v1.225h4.954c1.864,0,3.284-0.539,4.216-1.602  C15.708,24.771,15.653,22.96,15.604,22.412z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="9.1841" x2="11.6328" y1="4.3623" y2="4.3623">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+<stop offset="0.7091" style="stop-color:#6A6C6E"/>
+<stop offset="1" style="stop-color:#AAAFAE"/>
 </linearGradient>
 <path d="M11.633,6.87c0,0.475-0.342,0.859-0.764,0.859H9.947c-0.422,0-0.763-0.385-0.763-0.859V1.855  c0-0.476,0.341-0.86,0.763-0.86h0.922c0.422,0,0.764,0.385,0.764,0.86V6.87z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="18.061" x2="20.5103" y1="4.3623" y2="4.3623">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+<stop offset="0.7091" style="stop-color:#6A6C6E"/>
+<stop offset="1" style="stop-color:#AAAFAE"/>
 </linearGradient>
 <path d="M20.51,6.87c0,0.475-0.342,0.859-0.764,0.859h-0.922c-0.422,0-0.764-0.385-0.764-0.859V1.855  c0-0.476,0.342-0.86,0.764-0.86h0.922c0.422,0,0.764,0.385,0.764,0.86V6.87z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="7.6772" y2="19.8455">
-<stop offset="0" style="stop-color:#A9AAAD"/>
+<stop offset="0" style="stop-color:#AAABAC"/>
 <stop offset="1" style="stop-color:#333333"/>
 </linearGradient>
 <path d="M23.266,18.903c0,0.507-0.418,0.918-0.932,0.918H7.667c-0.515,0-0.932-0.411-0.932-0.918L5.816,8.495  c0-0.508,0.417-0.919,0.931-0.919h16.505c0.514,0,0.932,0.411,0.932,0.919L23.266,18.903z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="5.5771" x2="24.3763" y1="13.6392" y2="13.6392">
 <stop offset="0" style="stop-color:#333333"/>
-<stop offset="0.3" style="stop-color:#A9AAAD"/>
-<stop offset="0.7" style="stop-color:#A9AAAD"/>
+<stop offset="0.3" style="stop-color:#AAABAC"/>
+<stop offset="0.7" style="stop-color:#AAABAC"/>
 <stop offset="1" style="stop-color:#333333"/>
 </linearGradient>
 <path d="M7.667,19.089c-0.176,0-0.32-0.137-0.32-0.306v-0.027L6.429,8.476c0.01-0.16,0.149-0.286,0.318-0.286  h16.505c0.168,0,0.308,0.126,0.318,0.286l-0.918,10.28v0.027c0,0.169-0.143,0.306-0.318,0.306H7.667z" fill="url(#SVGID_5__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="4.8979" x2="25.0414" y1="8.0356" y2="8.0356">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+<stop offset="0.7091" style="stop-color:#6A6C6E"/>
+<stop offset="1" style="stop-color:#AAAFAE"/>
 </linearGradient>
 <path d="M25.102,9.261c0,0.507-0.416,0.918-0.932,0.918H5.829c-0.514,0-0.931-0.411-0.931-0.918V6.812  c0-0.508,0.417-0.919,0.931-0.919H24.17c0.516,0,0.932,0.411,0.932,0.919V9.261z" fill="url(#SVGID_6_)"/>
 <path d="M24.17,5.893H5.829c-0.514,0-0.931,0.411-0.931,0.919v0.306  c0-0.507,0.417-0.918,0.931-0.918H24.17c0.516,0,0.932,0.411,0.932,0.918V6.812C25.102,6.304,24.686,5.893,24.17,5.893z" fill="#FFFFFF" fill-opacity="0.3"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_presentation_player.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_presentation_player.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_presentation_player.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -26,10 +26,10 @@
 <rect fill-opacity="0.1" height="3.111" stroke-opacity="0.1" width="51.16" x="4.42" y="10.346"/>
 <rect fill-opacity="0.2" height="1.729" stroke-opacity="0.2" width="51.16" x="4.42" y="10.346"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="5.7334" y2="10.6915">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+<stop offset="0" style="stop-color:#B7BCBA"/>
+<stop offset="0.2667" style="stop-color:#E7EBE8"/>
+<stop offset="0.703" style="stop-color:#919595"/>
+<stop offset="1" style="stop-color:#B9BDBC"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="4.873" width="56" x="2" y="5.818"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="56.9375" x2="56.9375" y1="5.7334" y2="10.6915">
@@ -47,10 +47,10 @@
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="4.873" width="2.123" x="2" y="5.818"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="29.999" x2="29.999" y1="54.1147" y2="51.2821">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+<stop offset="0" style="stop-color:#B7BCBA"/>
+<stop offset="0.2667" style="stop-color:#E7EBE8"/>
+<stop offset="0.703" style="stop-color:#919595"/>
+<stop offset="1" style="stop-color:#B9BDBC"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="2.683" width="54.584" x="2.707" y="51.498"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="56.583" x2="56.583" y1="54.1147" y2="51.2821">
@@ -71,14 +71,14 @@
 <rect fill="url(#SVGID_12_)" height="21.432" width="6.223" x="32.016" y="23.711"/>
 <rect fill-opacity="0.25" height="24.889" stroke-opacity="0.25" width="6.223" x="22.336" y="20.945"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="24.7559" x2="24.7559" y1="20.1851" y2="44.97">
-<stop offset="0" style="stop-color:#8CC944"/>
-<stop offset="1" style="stop-color:#358C0C"/>
+<stop offset="0" style="stop-color:#89A16C"/>
+<stop offset="1" style="stop-color:#326644"/>
 </linearGradient>
 <rect fill="url(#SVGID_13_)" height="24.889" width="6.223" x="21.645" y="20.254"/>
 <rect fill-opacity="0.25" height="7.604" stroke-opacity="0.25" width="6.221" x="11.967" y="38.229"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="14.3857" x2="14.3857" y1="37.5381" y2="45.3728">
-<stop offset="0" style="stop-color:#DD7E28"/>
-<stop offset="1" style="stop-color:#D8300A"/>
+<stop offset="0" style="stop-color:#A7815E"/>
+<stop offset="1" style="stop-color:#9A5148"/>
 </linearGradient>
 <rect fill="url(#SVGID_14_)" height="7.604" width="6.221" x="11.275" y="37.538"/>
 <rect fill-opacity="0.25" height="29.037" stroke-opacity="0.25" width="6.221" x="43.078" y="16.797"/>
@@ -92,14 +92,14 @@
 <rect fill="none" height="60" width="60"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="45.4971" x2="45.4971" y1="15.5684" y2="44.6055">
-<stop offset="0" style="stop-color:#8CC944"/>
-<stop offset="1" style="stop-color:#358C0C"/>
+<stop offset="0" style="stop-color:#89A16C"/>
+<stop offset="1" style="stop-color:#326644"/>
 </linearGradient>
 </defs>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="35.127" x2="35.127" y1="23.854" y2="45.9286">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 </defs>
 </g>
@@ -108,18 +108,18 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29.999C6.729,29.999,0,23.271,0,15S6.729,0.001,15,0.001c8.271,0,15,6.729,15,14.999  S23.271,29.999,15,29.999L15,29.999z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 579.9604 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-1129.9209" x2="-1129.9209" y1="3388.3521" y2="3444.3481">
-<stop offset="0" style="stop-color:#D5F5B5"/>
-<stop offset="1" style="stop-color:#40AD00"/>
+<stop offset="0" style="stop-color:#D9E2C8"/>
+<stop offset="1" style="stop-color:#347940"/>
 </linearGradient>
 <path d="M15,28.999C7.279,28.999,1,22.72,1,15C1,7.281,7.279,1.001,15,1.001c7.718,0,14,6.28,14,13.999  C29,22.72,22.718,28.999,15,28.999L15,28.999z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2179.0005" x2="-2179.0005" y1="2906.6362" y2="2878.8359">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+<stop offset="0" style="stop-color:#93BD66"/>
+<stop offset="1" style="stop-color:#22403B"/>
 </linearGradient>
 <path d="M28.599,15c0,7.512-6.09,13.6-13.599,13.6C7.486,28.6,1.4,22.512,1.4,15C1.4,7.491,7.486,1.4,15,1.4  C22.509,1.4,28.599,7.491,28.599,15z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="16.5117" x2="16.5117" y1="21.3633" y2="7.2163">
-<stop offset="0" style="stop-color:#82DA3B"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#89AA6B"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3__)" points="10.353,7.134 22.671,14.21 10.353,21.429 "/>
 <polygon fill="#FFFFFF" points="11.11,8.444 22.008,14.734 11.11,21.026 "/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_profiles.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_profiles.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_profiles.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,63 +4,63 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="17.9414" x2="17.9414" y1="5.0361" y2="34.0517">
-<stop offset="0" style="stop-color:#73E3FF"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#9DD5C4"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M7.014,26.609h21.855V4.753C16.799,4.753,7.014,14.538,7.014,26.609z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="17.9678" x2="17.9678" y1="6.0098" y2="52.2334">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M7.82,25.855C8.563,15.003,17.264,6.301,28.115,5.559v20.296H7.82z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="16.4346" x2="16.4346" y1="31.7661" y2="55.483">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M27.408,55.246c-12.492,0-22.654-10.163-22.654-22.654v-0.708h23.361v23.362H27.408z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="16.4404" x2="16.4404" y1="32.5273" y2="54.7021">
-<stop offset="0" style="stop-color:#DBDFE0"/>
-<stop offset="1" style="stop-color:#7D8588"/>
+<stop offset="0" style="stop-color:#DDDFDD"/>
+<stop offset="1" style="stop-color:#808485"/>
 </linearGradient>
 <path d="M27.361,54.48C15.492,54.09,5.91,44.507,5.52,32.638h21.842V54.48z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="44.3184" x2="44.3184" y1="5.0361" y2="34.0517">
-<stop offset="0" style="stop-color:#73E3FF"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#9DD5C4"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M33.391,4.753v21.855h21.855C55.246,14.538,45.461,4.753,33.391,4.753z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="44.293" x2="44.293" y1="6.0098" y2="52.2334">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M34.145,25.855V5.559c10.852,0.743,19.555,9.445,20.297,20.296H34.145z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="44.3184" x2="44.3184" y1="31.248" y2="52.7565">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M33.391,52.985c12.07,0,21.855-9.784,21.855-21.854H33.391V52.985z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="44.293" x2="44.293" y1="6.0107" y2="52.2332">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M34.145,31.884h20.297c-0.742,10.852-9.445,19.553-20.297,20.296V31.884z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="17.9414" x2="17.9414" y1="4.5654" y2="41.5914">
-<stop offset="0" style="stop-color:#2277CC"/>
-<stop offset="1" style="stop-color:#092259"/>
+<stop offset="0" style="stop-color:#557499"/>
+<stop offset="1" style="stop-color:#242141"/>
 </linearGradient>
 <path d="M28.869,4.766v21.843H7.027C7.416,14.739,17,5.156,28.869,4.766 M29.623,4  C16.721,4,6.26,14.459,6.26,27.362h23.363V4L29.623,4z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="16.4346" x2="16.4346" y1="31.0054" y2="55.875">
-<stop offset="0" style="stop-color:#DBE1E3"/>
-<stop offset="1" style="stop-color:#505657"/>
+<stop offset="0" style="stop-color:#DDE1DF"/>
+<stop offset="1" style="stop-color:#525455"/>
 </linearGradient>
 <path d="M28.115,31.884v23.362c-12.881,0-23.361-10.48-23.361-23.362H28.115 M28.869,31.13H4v0.754  C4,45.181,14.818,56,28.115,56h0.754V31.13L28.869,31.13z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="44.3184" x2="44.3184" y1="4.5654" y2="41.5914">
-<stop offset="0" style="stop-color:#2277CC"/>
-<stop offset="1" style="stop-color:#092259"/>
+<stop offset="0" style="stop-color:#557499"/>
+<stop offset="1" style="stop-color:#242141"/>
 </linearGradient>
 <path d="M33.391,4.766c11.869,0.39,21.453,9.973,21.844,21.843H33.391V4.766 M32.637,4v23.362H56  C56,14.459,45.541,4,32.637,4L32.637,4z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="44.3184" x2="44.3184" y1="30.1255" y2="53.881">
-<stop offset="0" style="stop-color:#2277CC"/>
-<stop offset="1" style="stop-color:#092259"/>
+<stop offset="0" style="stop-color:#557499"/>
+<stop offset="1" style="stop-color:#242141"/>
 </linearGradient>
 <path d="M55.234,31.13C54.844,43,45.26,52.583,33.391,52.973V31.13H55.234 M56,30.376H32.637v23.362  C45.541,53.739,56,43.279,56,30.376L56,30.376z" fill="url(#SVGID_12_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -69,29 +69,29 @@
 <polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
 <path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06  c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0  l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204  c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+<stop offset="0" style="stop-color:#93BD66"/>
+<stop offset="1" style="stop-color:#22403B"/>
 </linearGradient>
 <path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729  c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493  c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#A6C87E"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#BCD39A"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4__)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.4667" style="stop-color:#347940"/>
+<stop offset="1" style="stop-color:#173636"/>
 </linearGradient>
 <path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229  c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84  c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5__)"/>
 <rect fill="none" height="30" width="30" y="0.487"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_psm.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_psm.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_psm.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,34 +4,34 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -126 -15.001)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="137.4561" x2="174.9032" y1="-47.1479" y2="-47.1479">
-<stop offset="0" style="stop-color:#AFB6BA"/>
-<stop offset="0.2667" style="stop-color:#DDE3E6"/>
-<stop offset="0.6545" style="stop-color:#949DA1"/>
-<stop offset="0.8788" style="stop-color:#D9DFE1"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#B2B7B6"/>
+<stop offset="0.2667" style="stop-color:#E0E3E1"/>
+<stop offset="0.6545" style="stop-color:#989D9D"/>
+<stop offset="0.8788" style="stop-color:#DBDFDD"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M48.544,55.771c0,0.678-0.55,1.229-1.228,1.229H12.685c-0.679,0-1.229-0.551-1.229-1.229V8.522  c0-0.678,0.55-1.228,1.229-1.228h34.632c0.679,0,1.229,0.55,1.229,1.228L48.544,55.771L48.544,55.771z" fill="url(#SVGID_1_)"/>
 <rect fill-opacity="0.4" height="36.815" width="29.726" x="15.138" y="12.204"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -126 -15.001)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="137.4561" x2="174.5449" y1="-70.772" y2="-70.772">
 <stop offset="0" style="stop-color:#808080"/>
-<stop offset="0.5" style="stop-color:#231F20"/>
+<stop offset="0.5" style="stop-color:#222021"/>
 <stop offset="1" style="stop-color:#808080"/>
 </linearGradient>
 <path d="M47.316,55.771H12.685c-0.679,0-1.229-0.551-1.229-1.229v0.615v0.611  c0,0.68,0.55,1.229,1.229,1.229h34.632c0.679,0,1.229-0.549,1.229-1.229v-0.611v-0.615C48.544,55.222,47.995,55.771,47.316,55.771z" fill="url(#SVGID_2_)" fill-opacity="0.4"/>
 <path d="M47.316,7.295H12.685c-0.679,0-1.229,0.55-1.229,1.228v0.613  c0-0.678,0.55-1.227,1.229-1.227h34.632c0.679,0,1.229,0.549,1.229,1.227V8.522C48.544,7.845,47.995,7.295,47.316,7.295z" fill="#FFFFFF" fill-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -126 -15.001)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="148.2314" x2="163.7695" y1="-20.1479" y2="-20.1479">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.303" style="stop-color:#FFFFFF"/>
-<stop offset="0.7212" style="stop-color:#909496"/>
-<stop offset="1" style="stop-color:#D1D6D7"/>
+<stop offset="0.7212" style="stop-color:#929494"/>
+<stop offset="1" style="stop-color:#D3D5D4"/>
 </linearGradient>
 <path d="M37.77,7.295V4.839c0-1.016-0.793-1.84-1.769-1.84H23.999c-0.977,0-1.768,0.824-1.768,1.84v2.456  H37.77z" fill="url(#SVGID_3_)"/>
 <path d="M36.001,2.999H23.999c-0.977,0-1.768,0.824-1.768,1.84v0.615  c0-1.018,0.791-1.842,1.768-1.842h12.003c0.977,0,1.768,0.824,1.768,1.842V4.839C37.77,3.823,36.977,2.999,36.001,2.999z" fill="#FFFFFF" fill-opacity="0.4"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -126 -15.001)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="141.6563" x2="170.6951" y1="-54.5112" y2="-54.5112">
-<stop offset="0" style="stop-color:#5AA913"/>
-<stop offset="0.3212" style="stop-color:#A8F222"/>
-<stop offset="0.7697" style="stop-color:#58A813"/>
-<stop offset="1" style="stop-color:#8FD31D"/>
+<stop offset="0" style="stop-color:#417C40"/>
+<stop offset="0.3212" style="stop-color:#97B460"/>
+<stop offset="0.7697" style="stop-color:#407B40"/>
+<stop offset="1" style="stop-color:#799C54"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="19.021" width="29.726" x="15.138" y="30"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="0.613" width="29.726" x="15.138" y="30"/>
@@ -45,24 +45,24 @@
 <path d="M15.138,12.204v36.815h29.726V12.204H15.138z M44.249,48.408H15.751v-35.59h28.497L44.249,48.408  L44.249,48.408z" fill-opacity="0.1"/>
 <rect fill-opacity="0.3" height="1.227" width="29.726" x="15.138" y="12.204"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -126 -15.001)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="137.4561" x2="174.5449" y1="-68.0103" y2="-68.0103">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.5" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#A6A8AB"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.5" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#A8A9AA"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" fill-opacity="0.3" height="0.611" width="37.089" x="11.456" y="52.705"/>
 <rect fill="#FFFFFF" fill-opacity="0.3" height="0.613" width="37.089" x="11.456" y="53.316"/>
 <rect fill="#FFFFFF" fill-opacity="0.2" height="34.363" width="12.542" x="20.047" y="13.431"/>
 <path d="M31.69,41.021c-4.318,0-8.339-2.324-10.49-6.063c-3.324-5.779-1.327-13.185,4.451-16.51  c1.828-1.051,3.904-1.606,6.006-1.606c1.105,0,2.208,0.151,3.277,0.449c0.316,0.088,0.537,0.374,0.545,0.702  c0.006,0.328-0.203,0.622-0.516,0.723c-0.549,0.178-1.029,0.387-1.471,0.641c-3.531,2.031-4.752,6.558-2.72,10.09  c1.314,2.287,3.772,3.707,6.413,3.707c1.285,0,2.558-0.342,3.679-0.986c0.44-0.256,0.876-0.576,1.292-0.951  c0.141-0.127,0.319-0.191,0.499-0.191c0.133,0,0.266,0.035,0.385,0.107c0.281,0.17,0.418,0.504,0.336,0.822  c-0.818,3.174-2.83,5.82-5.665,7.453C35.877,40.462,33.796,41.021,31.69,41.021L31.69,41.021z" fill-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="31.4941" x2="31.4941" y1="17.105" y2="40.8411">
-<stop offset="0" style="stop-color:#F1D152"/>
-<stop offset="0.4788" style="stop-color:#E39700"/>
-<stop offset="1" style="stop-color:#EDBA00"/>
+<stop offset="0" style="stop-color:#C1B682"/>
+<stop offset="0.4788" style="stop-color:#9F7844"/>
+<stop offset="1" style="stop-color:#A68C47"/>
 </linearGradient>
 <path d="M41.237,32.812c-3.896,2.242-8.87,0.9-11.109-2.994c-2.24-3.896-0.898-8.867,2.994-11.106  c0.522-0.299,1.066-0.526,1.612-0.703c-2.831-0.79-5.962-0.497-8.712,1.084c-5.433,3.126-7.303,10.062-4.178,15.494  c3.126,5.432,10.063,7.301,15.496,4.176c2.747-1.582,4.581-4.145,5.315-6.994C42.227,32.156,41.757,32.511,41.237,32.812z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="31.1113" x2="31.1113" y1="18.7026" y2="41.0685">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.5" style="stop-color:#FFE34F"/>
-<stop offset="1" style="stop-color:#FCEE21"/>
+<stop offset="0.5" style="stop-color:#CAC184"/>
+<stop offset="1" style="stop-color:#BAB563"/>
 </linearGradient>
 <path d="M31.69,39.533c-3.788,0-7.313-2.037-9.201-5.316c-2.914-5.067-1.163-11.562,3.904-14.478  c1.603-0.921,3.422-1.408,5.264-1.408c0.211,0,0.424,0.006,0.635,0.02c-3.887,2.559-5.159,7.753-2.809,11.839  c1.579,2.746,4.531,4.453,7.703,4.453c1.37,0,2.727-0.322,3.956-0.936c-0.919,1.836-2.353,3.363-4.173,4.41  C35.36,39.042,33.536,39.533,31.69,39.533L31.69,39.533z" fill="url(#SVGID_7_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,26 +4,26 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="2.0928" y2="37.9271">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.7636" style="stop-color:#144DA3"/>
-<stop offset="1" style="stop-color:#36B5FF"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.7636" style="stop-color:#3F4A78"/>
+<stop offset="1" style="stop-color:#72B9C3"/>
 </linearGradient>
 <path d="M14.814,10.715V3.508C19.178,2.505,23.314,2,27.238,2c5.785,0,10.221,1.121,13.311,3.364  s4.635,5.532,4.635,9.873c0,2.526-0.596,4.665-1.783,6.417c-1.191,1.752-9.396,9.994-10.205,11.121  c-0.809,1.128-1.213,2.465-1.213,4.01v1.544h-11.51v-2.06c0-2.502,0.547-4.612,1.639-6.342c1.09-1.729,2.994-3.868,5.715-6.419  c2.133-1.985,4.781-6.593,4.781-7.573c0-4.436-2.674-6.655-8.018-6.655C21.576,9.28,18.322,9.759,14.814,10.715z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="2.5591" y2="37.7967">
-<stop offset="0" style="stop-color:#6BCBF2"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#94CAC2"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M21.223,37.579v-1.31c0-2.343,0.512-4.342,1.521-5.941c1.051-1.666,2.934-3.776,5.596-6.272  c2.016-1.876,5.018-6.732,5.018-8.12c0-3.378-1.521-7.405-8.768-7.405c-2.695,0-5.629,0.383-8.717,1.137l-0.309,0.075V4.107  l0.197-0.043c4.018-0.872,7.879-1.314,11.477-1.314c5.596,0,9.928,1.084,12.869,3.222c2.912,2.112,4.326,5.144,4.326,9.266  c0,2.359-0.557,4.376-1.654,5.996c-0.646,0.95-3.703,4.159-6.158,6.737c-2.273,2.389-3.68,3.872-4.035,4.367  c-0.898,1.254-1.354,2.75-1.354,4.447v0.794H21.223z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="26.6924" x2="26.6924" y1="43.6758" y2="58.1758">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.7636" style="stop-color:#144DA3"/>
-<stop offset="1" style="stop-color:#36B5FF"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.7636" style="stop-color:#3F4A78"/>
+<stop offset="1" style="stop-color:#72B9C3"/>
 </linearGradient>
 <path d="M26.672,58c-1.938,0-3.602-0.686-5-2.059c-1.396-1.373-2.094-3.052-2.094-5.037  c0-1.962,0.693-3.641,2.076-5.038c1.385-1.397,3.059-2.095,5.018-2.095c1.961,0,3.641,0.697,5.037,2.095  c1.398,1.397,2.098,3.076,2.098,5.038c0,1.985-0.699,3.664-2.098,5.037C30.313,57.314,28.633,58,26.672,58z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="26.6924" x2="26.6924" y1="44.436" y2="57.4074">
-<stop offset="0" style="stop-color:#63C1EF"/>
-<stop offset="0.1152" style="stop-color:#63C1EF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#8DC5C2"/>
+<stop offset="0.1152" style="stop-color:#8DC5C2"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M26.672,57.25c-1.748,0-3.211-0.604-4.475-1.844c-1.258-1.237-1.869-2.71-1.869-4.502  c0-1.771,0.607-3.245,1.859-4.511c1.248-1.26,2.715-1.872,4.484-1.872c1.771,0,3.246,0.613,4.508,1.875  c1.264,1.263,1.877,2.737,1.877,4.508c0,1.792-0.613,3.265-1.873,4.503C29.92,56.647,28.445,57.25,26.672,57.25L26.672,57.25z" fill="url(#SVGID_4_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_radio.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_radio.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_radio.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,28 +4,28 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="11.647" y2="52.3348">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
 </linearGradient>
 <path d="M58,50.776c0,0.858-0.697,1.556-1.557,1.556H3.555C2.694,52.332,2,51.635,2,50.776V13.443  c0-0.859,0.694-1.556,1.555-1.556h52.889c0.859,0,1.557,0.696,1.557,1.556V50.776z" fill="url(#SVGID_1_)"/>
 <path d="M56.443,11.888H3.555C2.694,11.888,2,12.584,2,13.443v12.056l56-6.158v-5.897  C58,12.584,57.303,11.888,56.443,11.888z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M56.443,12.666c0.428,0,0.777,0.349,0.777,0.777v37.333c0,0.428-0.35,0.778-0.777,0.778H3.555  c-0.43,0-0.778-0.351-0.778-0.778V13.443c0-0.429,0.349-0.777,0.778-0.777H56.443 M56.443,11.888H3.555  C2.694,11.888,2,12.584,2,13.443v37.333c0,0.858,0.694,1.556,1.555,1.556h52.889c0.859,0,1.557-0.697,1.557-1.556V13.443  C58,12.584,57.303,11.888,56.443,11.888L56.443,11.888z" fill="#D83506"/>
-<path d="M56.443,51.555H3.555C2.694,51.555,2,50.857,2,49.999v0.777c0,0.858,0.694,1.556,1.555,1.556h52.889  c0.859,0,1.557-0.697,1.557-1.556v-0.777C58,50.857,57.303,51.555,56.443,51.555z" fill="#600909"/>
+<path d="M56.443,12.666c0.428,0,0.777,0.349,0.777,0.777v37.333c0,0.428-0.35,0.778-0.777,0.778H3.555  c-0.43,0-0.778-0.351-0.778-0.778V13.443c0-0.429,0.349-0.777,0.778-0.777H56.443 M56.443,11.888H3.555  C2.694,11.888,2,12.584,2,13.443v37.333c0,0.858,0.694,1.556,1.555,1.556h52.889c0.859,0,1.557-0.697,1.557-1.556V13.443  C58,12.584,57.303,11.888,56.443,11.888L56.443,11.888z" fill="#995145"/>
+<path d="M56.443,51.555H3.555C2.694,51.555,2,50.857,2,49.999v0.777c0,0.858,0.694,1.556,1.555,1.556h52.889  c0.859,0,1.557-0.697,1.557-1.556v-0.777C58,50.857,57.303,51.555,56.443,51.555z" fill="#46232D"/>
 <path d="M56.443,11.888H3.555C2.694,11.888,2,12.584,2,13.443v0.778c0-0.86,0.694-1.556,1.555-1.556  h52.889c0.859,0,1.557,0.695,1.557,1.556v-0.778C58,12.584,57.303,11.888,56.443,11.888z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="45.9424" x2="45.9424" y1="32.6411" y2="20.912">
-<stop offset="0" style="stop-color:#444243"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<stop offset="0" style="stop-color:#434343"/>
+<stop offset="1" style="stop-color:#222021"/>
 </linearGradient>
 <circle cx="45.942" cy="26.611" fill="url(#SVGID_2_)" r="6.946"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="45.9424" x2="45.9424" y1="33.9702" y2="28.6358">
 <stop offset="0" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#413F3F"/>
+<stop offset="1" style="stop-color:#404040"/>
 </linearGradient>
 <path d="M45.943,33.558c-3.754,0-6.803-2.979-6.935-6.698c-0.003,0.084-0.013,0.163-0.013,0.248  c0,3.836,3.109,6.946,6.947,6.946c3.836,0,6.945-3.11,6.945-6.946c0-0.085-0.01-0.164-0.01-0.248  C52.744,30.578,49.695,33.558,45.943,33.558z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="45.9443" x2="45.9443" y1="35.3247" y2="17.436">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="1" style="stop-color:#9D1010"/>
+<stop offset="0" style="stop-color:#B36B4D"/>
+<stop offset="1" style="stop-color:#733A43"/>
 </linearGradient>
 <path d="M45.943,35.609c-4.933,0-8.944-4.013-8.944-8.943c0-4.933,4.012-8.945,8.944-8.945  s8.945,4.013,8.945,8.945C54.889,31.597,50.876,35.609,45.943,35.609L45.943,35.609z M45.943,18.888  c-4.29,0-7.778,3.488-7.778,7.778c0,4.287,3.488,7.776,7.778,7.776c4.287,0,7.779-3.489,7.779-7.776  C53.723,22.376,50.23,18.888,45.943,18.888L45.943,18.888z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="45.9434" x2="45.9434" y1="20.5371" y2="32.7461">
@@ -58,11 +58,11 @@
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="10.889" width="28" x="6.277" y="20.055"/>
 <rect fill="#D9D9D9" height="0.777" width="28" x="6.277" y="30.943"/>
-<polygon fill="#A6A8AB" points="31.945,25.499 31.945,27.832 29.609,27.832 29.609,26.276 28.832,26.276 28.832,27.832   26.498,27.832 26.498,26.276 25.723,26.276 25.723,27.832 23.387,27.832 23.387,26.276 22.61,26.276 22.61,27.832 20.277,27.832   20.277,25.499 19.499,25.499 19.499,27.832 17.166,27.832 17.166,26.276 16.388,26.276 16.388,27.832 14.056,27.832 14.056,26.276   13.276,26.276 13.276,27.832 10.944,27.832 10.944,26.276 10.165,26.276 10.165,27.832 8.609,27.832 8.609,25.499 7.833,25.499   7.833,28.609 8.609,28.609 10.165,28.609 10.944,28.609 13.276,28.609 14.056,28.609 16.388,28.609 17.166,28.609 19.499,28.609   20.277,28.609 22.61,28.609 23.387,28.609 25.723,28.609 26.498,28.609 28.832,28.609 29.609,28.609 31.945,28.609 32.721,28.609   32.721,27.832 32.721,25.499 "/>
-<rect fill="#E00000" height="10.889" width="1.556" x="20.301" y="20.055"/>
+<polygon fill="#A8A9AA" points="31.945,25.499 31.945,27.832 29.609,27.832 29.609,26.276 28.832,26.276 28.832,27.832   26.498,27.832 26.498,26.276 25.723,26.276 25.723,27.832 23.387,27.832 23.387,26.276 22.61,26.276 22.61,27.832 20.277,27.832   20.277,25.499 19.499,25.499 19.499,27.832 17.166,27.832 17.166,26.276 16.388,26.276 16.388,27.832 14.056,27.832 14.056,26.276   13.276,26.276 13.276,27.832 10.944,27.832 10.944,26.276 10.165,26.276 10.165,27.832 8.609,27.832 8.609,25.499 7.833,25.499   7.833,28.609 8.609,28.609 10.165,28.609 10.944,28.609 13.276,28.609 14.056,28.609 16.388,28.609 17.166,28.609 19.499,28.609   20.277,28.609 22.61,28.609 23.387,28.609 25.723,28.609 26.498,28.609 28.832,28.609 29.609,28.609 31.945,28.609 32.721,28.609   32.721,27.832 32.721,25.499 "/>
+<rect fill="#9D4349" height="10.889" width="1.556" x="20.301" y="20.055"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="9.127" x2="9.127" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="9.127" cy="41.832" fill="url(#SVGID_10_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="9.126" x2="9.126" y1="40.7729" y2="42.8472">
@@ -71,8 +71,8 @@
 </linearGradient>
 <circle cx="9.126" cy="41.832" fill="url(#SVGID_11_)" r="1.039"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="13.7295" x2="13.7295" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <path d="M15.285,41.832c0,0.858-0.693,1.556-1.556,1.556c-0.857,0-1.555-0.697-1.555-1.556  c0-0.861,0.697-1.556,1.555-1.556C14.592,40.276,15.285,40.971,15.285,41.832z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="13.7295" x2="13.7295" y1="40.7729" y2="42.8472">
@@ -81,8 +81,8 @@
 </linearGradient>
 <circle cx="13.73" cy="41.832" fill="url(#SVGID_13_)" r="1.038"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="18.3955" x2="18.3955" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="18.396" cy="41.832" fill="url(#SVGID_14_)" r="1.555"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="18.3955" x2="18.3955" y1="40.7729" y2="42.8472">
@@ -91,8 +91,8 @@
 </linearGradient>
 <circle cx="18.396" cy="41.832" fill="url(#SVGID_15_)" r="1.038"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="23.0615" x2="23.0615" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="23.062" cy="41.832" fill="url(#SVGID_16_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="23.0635" x2="23.0635" y1="40.7729" y2="42.8472">
@@ -101,8 +101,8 @@
 </linearGradient>
 <circle cx="23.063" cy="41.832" fill="url(#SVGID_17_)" r="1.038"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="27.7295" x2="27.7295" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="27.729" cy="41.832" fill="url(#SVGID_18_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="27.7295" x2="27.7295" y1="40.7729" y2="42.8472">
@@ -111,8 +111,8 @@
 </linearGradient>
 <circle cx="27.729" cy="41.832" fill="url(#SVGID_19_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="32.3965" x2="32.3965" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="32.396" cy="41.832" fill="url(#SVGID_20_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="32.3965" x2="32.3965" y1="40.7729" y2="42.8472">
@@ -121,8 +121,8 @@
 </linearGradient>
 <circle cx="32.396" cy="41.832" fill="url(#SVGID_21_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="9.127" x2="9.127" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="9.127" cy="46.499" fill="url(#SVGID_22_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="9.126" x2="9.126" y1="45.4399" y2="47.5142">
@@ -131,8 +131,8 @@
 </linearGradient>
 <circle cx="9.126" cy="46.499" fill="url(#SVGID_23_)" r="1.039"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="13.7295" x2="13.7295" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <path d="M15.285,46.499c0,0.858-0.693,1.556-1.556,1.556c-0.857,0-1.555-0.697-1.555-1.556  c0-0.861,0.697-1.556,1.555-1.556C14.592,44.943,15.285,45.638,15.285,46.499z" fill="url(#SVGID_24_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="13.7295" x2="13.7295" y1="45.4399" y2="47.5142">
@@ -141,8 +141,8 @@
 </linearGradient>
 <circle cx="13.73" cy="46.499" fill="url(#SVGID_25_)" r="1.038"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="18.3955" x2="18.3955" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="18.396" cy="46.499" fill="url(#SVGID_26_)" r="1.555"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="18.3955" x2="18.3955" y1="45.4399" y2="47.5142">
@@ -151,8 +151,8 @@
 </linearGradient>
 <circle cx="18.396" cy="46.499" fill="url(#SVGID_27_)" r="1.038"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="23.0615" x2="23.0615" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="23.062" cy="46.499" fill="url(#SVGID_28_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="23.0635" x2="23.0635" y1="45.4399" y2="47.5142">
@@ -161,8 +161,8 @@
 </linearGradient>
 <circle cx="23.063" cy="46.499" fill="url(#SVGID_29_)" r="1.038"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="27.7295" x2="27.7295" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="27.729" cy="46.499" fill="url(#SVGID_30_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="27.7295" x2="27.7295" y1="45.4399" y2="47.5142">
@@ -171,8 +171,8 @@
 </linearGradient>
 <circle cx="27.729" cy="46.499" fill="url(#SVGID_31_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="32.3965" x2="32.3965" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="32.396" cy="46.499" fill="url(#SVGID_32_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="32.3965" x2="32.3965" y1="45.4399" y2="47.5142">
@@ -181,8 +181,8 @@
 </linearGradient>
 <circle cx="32.396" cy="46.499" fill="url(#SVGID_33_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="36.999" x2="36.999" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="36.999" cy="41.832" fill="url(#SVGID_34_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35_" x1="36.999" x2="36.999" y1="40.7729" y2="42.8472">
@@ -191,8 +191,8 @@
 </linearGradient>
 <circle cx="36.999" cy="41.832" fill="url(#SVGID_35_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_36_" x1="41.666" x2="41.666" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="41.666" cy="41.832" fill="url(#SVGID_36_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_37_" x1="41.666" x2="41.666" y1="40.7729" y2="42.8472">
@@ -201,8 +201,8 @@
 </linearGradient>
 <circle cx="41.666" cy="41.832" fill="url(#SVGID_37_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_38_" x1="46.333" x2="46.333" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="46.333" cy="41.832" fill="url(#SVGID_38_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_39_" x1="46.333" x2="46.333" y1="40.7729" y2="42.8472">
@@ -211,8 +211,8 @@
 </linearGradient>
 <circle cx="46.333" cy="41.832" fill="url(#SVGID_39_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_40_" x1="50.999" x2="50.999" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <path d="M52.553,41.832c0,0.858-0.691,1.556-1.553,1.556c-0.858,0-1.556-0.697-1.556-1.556  c0-0.861,0.697-1.556,1.556-1.556C51.861,40.276,52.553,40.971,52.553,41.832z" fill="url(#SVGID_40_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_41_" x1="50.999" x2="50.999" y1="40.7729" y2="42.8472">
@@ -221,8 +221,8 @@
 </linearGradient>
 <path d="M52.037,41.832c0,0.573-0.467,1.037-1.037,1.037c-0.573,0-1.039-0.464-1.039-1.037  s0.466-1.037,1.039-1.037C51.57,40.795,52.037,41.259,52.037,41.832z" fill="url(#SVGID_41_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_42_" x1="36.999" x2="36.999" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="36.999" cy="46.499" fill="url(#SVGID_42_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_43_" x1="36.999" x2="36.999" y1="45.4399" y2="47.5142">
@@ -231,8 +231,8 @@
 </linearGradient>
 <circle cx="36.999" cy="46.499" fill="url(#SVGID_43_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_44_" x1="41.666" x2="41.666" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="41.666" cy="46.499" fill="url(#SVGID_44_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_45_" x1="41.666" x2="41.666" y1="45.4399" y2="47.5142">
@@ -241,8 +241,8 @@
 </linearGradient>
 <circle cx="41.666" cy="46.499" fill="url(#SVGID_45_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_46_" x1="46.333" x2="46.333" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <circle cx="46.333" cy="46.499" fill="url(#SVGID_46_)" r="1.556"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_47_" x1="46.333" x2="46.333" y1="45.4399" y2="47.5142">
@@ -251,8 +251,8 @@
 </linearGradient>
 <circle cx="46.333" cy="46.499" fill="url(#SVGID_47_)" r="1.037"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_48_" x1="50.999" x2="50.999" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <path d="M52.553,46.499c0,0.858-0.691,1.556-1.553,1.556c-0.858,0-1.556-0.697-1.556-1.556  c0-0.861,0.697-1.556,1.556-1.556C51.861,44.943,52.553,45.638,52.553,46.499z" fill="url(#SVGID_48_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_49_" x1="50.999" x2="50.999" y1="45.4399" y2="47.5142">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_received_voice_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_received_voice_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_received_voice_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -43,18 +43,18 @@
 <polygon fill="none" points="30.096,0 0.096,0 0.096,14.833 0,14.833 0.096,14.933 0.096,30 14.601,30 15.021,30.438 15.447,30   30.096,30 30.096,14.963 30.215,14.841 30.096,14.841 "/>
 <polygon fill-opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841   15.021,30.438 " stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2176.5142" x2="-2176.5142" y1="2984.646" y2="2957.3247">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="2.846,15.859 15.025,28.575 27.398,15.845 20.732,15.843 20.727,1.292 9.375,1.291   9.375,15.859 "/>
 <line fill="none" x1="20.727" x2="9.375" y1="1.297" y2="1.296"/>
-<polygon fill="#E7FFB9" points="9.375,1 20.729,1.001 20.727,1.593 9.375,1.592 "/>
-<polygon fill="#E7FFB9" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
-<polygon fill="#E7FFB9" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
+<polygon fill="#E4EACE" points="9.375,1 20.729,1.001 20.727,1.593 9.375,1.592 "/>
+<polygon fill="#E4EACE" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
+<polygon fill="#E4EACE" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2165.6621" x2="-2187.9482" y1="2963.2173" y2="2963.2173">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="27.016,15.844 15.025,28.15 3.172,15.829 2.348,15.83 15.025,29 27.842,15.844 "/>
 <rect fill="none" height="30" width="30" x="0.096"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_reset.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_reset.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_reset.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,15 +5,15 @@
 <g>
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="49.8477" y2="54.1016">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#E4E0C1"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="4.254" width="56" x="2" y="49.848"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="6.7896" x2="13.5899" y1="18.2217" y2="18.2217">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.3152" style="stop-color:#FFFFFF"/>
-<stop offset="0.7333" style="stop-color:#989C9E"/>
-<stop offset="1" style="stop-color:#C6CBCC"/>
+<stop offset="0.7333" style="stop-color:#9A9C9C"/>
+<stop offset="1" style="stop-color:#C8CAC9"/>
 </linearGradient>
 <path d="M14.522,30c0,0.301-0.243,0.545-0.544,0.545H6.354c-0.301,0-0.544-0.244-0.544-0.545L7.444,6.443    c0-0.301,0.243-0.545,0.544-0.545h4.356c0.301,0,0.545,0.244,0.545,0.545L14.522,30z" fill="url(#SVGID_2_)"/>
 <rect fill="#FFFFFF" fill-opacity="0.5" height="0.709" stroke-opacity="0.5" width="56" x="2" y="49.848"/>
@@ -28,41 +28,41 @@
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="2.836" width="14.177" x="3.418" y="27.829"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="29.9995" x2="29.9995" y1="44.1777" y2="49.1389">
-<stop offset="0" style="stop-color:#986842"/>
-<stop offset="1" style="stop-color:#72361C"/>
+<stop offset="0" style="stop-color:#7E675C"/>
+<stop offset="1" style="stop-color:#583636"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="5.67" width="53.164" x="3.418" y="44.178"/>
 <rect fill-opacity="0.4" height="0.709" stroke-opacity="0.4" width="53.164" x="3.418" y="49.139"/>
 <rect fill-opacity="0.2" height="0.709" stroke-opacity="0.2" width="53.164" x="3.418" y="48.43"/>
 <rect fill="#E6E6E6" height="0.709" width="53.164" x="3.418" y="44.178"/>
-<rect fill="#875C39" fill-opacity="0.4" height="0.709" stroke-opacity="0.4" width="56" x="2" y="53.393"/>
+<rect fill="#705950" fill-opacity="0.4" height="0.709" stroke-opacity="0.4" width="56" x="2" y="53.393"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="12.2778" x2="12.2778" y1="49.9531" y2="35.3014">
-<stop offset="0" style="stop-color:#7F5031"/>
-<stop offset="1" style="stop-color:#572915"/>
+<stop offset="0" style="stop-color:#684E48"/>
+<stop offset="1" style="stop-color:#43292B"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="14.887" width="10.634" x="6.961" y="34.961"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="12.2778" x2="12.2778" y1="35.5713" y2="49.5233">
-<stop offset="0" style="stop-color:#E09A61"/>
-<stop offset="1" style="stop-color:#8D4F2D"/>
+<stop offset="0" style="stop-color:#BAA287"/>
+<stop offset="1" style="stop-color:#70504A"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="14.176" width="9.216" x="7.67" y="35.672"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="12.2778" x2="12.2778" y1="36.2832" y2="49.5394">
-<stop offset="0" style="stop-color:#986842"/>
-<stop offset="1" style="stop-color:#72361C"/>
+<stop offset="0" style="stop-color:#7E675C"/>
+<stop offset="1" style="stop-color:#583636"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="13.469" width="7.798" x="8.379" y="36.379"/>
 <rect fill-opacity="0.2" height="4.252" stroke-opacity="0.2" width="2.836" x="13.234" y="40.988"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.6523" x2="14.6523" y1="41.6748" y2="44.466">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+<stop offset="0.6606" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#BABCBB"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="2.836" width="1.418" x="13.943" y="41.695"/>
 <g>
 <rect fill-opacity="0.2" height="5.67" stroke-opacity="0.2" width="9.215" x="21.375" y="26.545"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="25.9824" x2="25.9824" y1="31.5059" y2="27.2524">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#C7C9CA"/>
+<stop offset="1" style="stop-color:#C8C9C9"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="4.254" width="7.797" x="22.084" y="27.252"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="25.9824" x2="25.9824" y1="27.9629" y2="30.7969">
@@ -73,7 +73,7 @@
 <rect fill-opacity="0.2" height="5.67" stroke-opacity="0.2" width="9.215" x="31.299" y="26.545"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="35.9063" x2="35.9063" y1="31.5059" y2="27.2524">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#C7C9CA"/>
+<stop offset="1" style="stop-color:#C8C9C9"/>
 </linearGradient>
 <rect fill="url(#SVGID_12_)" height="4.254" width="7.797" x="32.008" y="27.252"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="35.9063" x2="35.9063" y1="27.9629" y2="30.7969">
@@ -84,7 +84,7 @@
 <rect fill-opacity="0.2" height="5.672" stroke-opacity="0.2" width="9.215" x="21.375" y="34.342"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="25.9824" x2="25.9824" y1="39.3027" y2="35.0508">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#C7C9CA"/>
+<stop offset="1" style="stop-color:#C8C9C9"/>
 </linearGradient>
 <rect fill="url(#SVGID_14_)" height="4.252" width="7.797" x="22.084" y="35.051"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="25.9824" x2="25.9824" y1="35.7598" y2="38.5957">
@@ -95,7 +95,7 @@
 <rect fill-opacity="0.2" height="5.672" stroke-opacity="0.2" width="9.215" x="31.299" y="34.342"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="35.9063" x2="35.9063" y1="39.3027" y2="35.0508">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#C7C9CA"/>
+<stop offset="1" style="stop-color:#C8C9C9"/>
 </linearGradient>
 <rect fill="url(#SVGID_16_)" height="4.252" width="7.797" x="32.008" y="35.051"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="35.9063" x2="35.9063" y1="35.7598" y2="38.5957">
@@ -106,7 +106,7 @@
 <rect fill-opacity="0.2" height="5.67" stroke-opacity="0.2" width="9.216" x="41.223" y="26.545"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="45.8301" x2="45.8301" y1="31.5059" y2="27.2524">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#C7C9CA"/>
+<stop offset="1" style="stop-color:#C8C9C9"/>
 </linearGradient>
 <rect fill="url(#SVGID_18_)" height="4.254" width="7.798" x="41.932" y="27.252"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="45.8301" x2="45.8301" y1="27.9629" y2="30.7969">
@@ -117,7 +117,7 @@
 <rect fill-opacity="0.2" height="5.672" stroke-opacity="0.2" width="9.216" x="41.223" y="34.342"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="45.8301" x2="45.8301" y1="39.3027" y2="35.0508">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#C7C9CA"/>
+<stop offset="1" style="stop-color:#C8C9C9"/>
 </linearGradient>
 <rect fill="url(#SVGID_20_)" height="4.252" width="7.798" x="41.932" y="35.051"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="45.8301" x2="45.8301" y1="35.7598" y2="38.5957">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ring_tone.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ring_tone.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ring_tone.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,25 +4,25 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07  c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11  c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304  v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001  z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" fill-opacity="0.6" height="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
@@ -31,80 +31,80 @@
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+<stop offset="0" style="stop-color:#AADAC6"/>
+<stop offset="1" style="stop-color:#6A99AA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
-<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
+<rect fill="#BCE2D2" height="0.767" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+<stop offset="1" style="stop-color:#D3D7D5"/>
 </linearGradient>
 <path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785  c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+<stop offset="0" style="stop-color:#6F7172"/>
+<stop offset="1" style="stop-color:#BFC2C1"/>
 </linearGradient>
 <path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51  c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951  h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183  h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606  c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
 <path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534  h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303  c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307  c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+<stop offset="0" style="stop-color:#C6B17B"/>
+<stop offset="0.7455" style="stop-color:#98604F"/>
+<stop offset="1" style="stop-color:#7F3736"/>
 </linearGradient>
 <path d="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307  c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -113,29 +113,29 @@
 <polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
 <path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06  c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0  l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204  c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+<stop offset="0" style="stop-color:#93BD66"/>
+<stop offset="1" style="stop-color:#22403B"/>
 </linearGradient>
 <path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729  c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493  c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#A6C87E"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#BCD39A"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4__)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.4667" style="stop-color:#347940"/>
+<stop offset="1" style="stop-color:#173636"/>
 </linearGradient>
 <path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229  c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84  c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5__)"/>
 <rect fill="none" height="30" width="30" y="0.487"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,9 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="1.999" y2="57.9139">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.8182" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#7B7E80"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.8182" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#7D7E7F"/>
 </linearGradient>
 <path d="M8.957,57.999c-1.365,0-2.473-1.108-2.473-2.473V4.472c0-1.364,1.107-2.473,2.473-2.473h30.801  c1.115,0,2.607,0.619,3.396,1.406l8.951,8.95c0.789,0.79,1.408,2.281,1.408,3.396v39.774c0,1.364-1.111,2.473-2.473,2.473H8.957z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="3.2646" y2="56.7327">
@@ -16,8 +16,8 @@
 </linearGradient>
 <path d="M51.041,56.674H8.957c-0.633,0-1.146-0.513-1.146-1.147V4.469c0-0.629,0.514-1.145,1.146-1.145  h30.801c0.766,0,1.912,0.477,2.459,1.021l8.953,8.948c0.543,0.546,1.018,1.693,1.018,2.459v39.774  C52.188,56.161,51.676,56.674,51.041,56.674L51.041,56.674z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="4.6533" y2="55.3477">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+<stop offset="0" style="stop-color:#E7E8E7"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M50.863,55.348H9.137V4.653h30.621c0.412,0,1.227,0.336,1.521,0.629l8.957,8.95  c0.289,0.293,0.627,1.105,0.627,1.52V55.348L50.863,55.348z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="27.3711" x2="27.3711" y1="51.1084" y2="24.5269">
@@ -27,59 +27,59 @@
 <rect fill="url(#SVGID_4_)" height="26.784" width="31.227" x="11.758" y="24.426"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1.326" stroke-opacity="0.4" width="31.227" x="11.758" y="51.21"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="16.2236" x2="16.2236" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="7.305" width="5.682" x="13.383" y="42.197"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30.1895" x2="30.1895" y1="25.9839" y2="48.9336">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="7.304" width="5.254" x="27.563" y="25.967"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="23.3125" x2="23.3125" y1="25.9839" y2="48.9336">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="7.304" width="5.254" x="20.686" y="25.967"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="37.8779" x2="37.8779" y1="25.9839" y2="48.9336">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="7.304" width="6.877" x="34.439" y="25.967"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.1895" x2="30.1895" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="7.305" width="5.254" x="27.563" y="42.197"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="23.3125" x2="23.3125" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="7.305" width="5.254" x="20.686" y="42.197"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="27.3496" x2="27.3496" y1="25.9839" y2="48.8929">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <polygon fill="url(#SVGID_11_)" points="18.975,34.894 18.975,25.967 13.383,25.967 13.383,40.574 41.316,40.574 41.316,34.894 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="37.8779" x2="37.8779" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_12_)" height="7.305" width="6.877" x="34.439" y="42.197"/>
 <rect fill="none" height="60" width="60"/>
@@ -91,21 +91,21 @@
 <path d="M15.159,10.697c0.525,0,0.947-0.13,1.264-0.39  c0.316-0.259,0.474-0.615,0.474-1.07c0-0.44-0.164-0.795-0.49-1.061c-0.326-0.264-0.741-0.398-1.248-0.398  c-0.531,0-0.951,0.132-1.261,0.395c-0.311,0.262-0.465,0.617-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07  C14.224,10.567,14.641,10.697,15.159,10.697z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <path d="M15.159,10.369c0.525,0,0.947-0.129,1.264-0.389  c0.316-0.26,0.474-0.615,0.474-1.07c0-0.441-0.164-0.795-0.49-1.061c-0.326-0.266-0.741-0.398-1.248-0.398  c-0.531,0-0.951,0.13-1.261,0.394c-0.311,0.263-0.465,0.616-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07  C14.224,10.24,14.641,10.369,15.159,10.369z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <radialGradient cx="-2178.8628" cy="3345.4287" gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="26.49">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </radialGradient>
 <path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1c7.721,0,14,6.28,14,14S22.72,29,15,29L15,29z" fill="url(#SVGID_1__)"/>
 <polygon fill-opacity="0.1" points="12.46,13.847 13.555,13.847 13.555,23.318 16.741,23.318 16.741,12.032   12.46,12.032 " stroke-opacity="0.1"/>
 <polygon fill-opacity="0.2" points="12.46,13.519 13.555,13.519 13.555,22.99 16.741,22.99 16.741,11.704   12.46,11.704 " stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2179.3994" x2="-2179.3994" y1="3340.2148" y2="3324.8184">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#F9FCF9"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="12.46,13.191 13.555,13.191 13.555,22.663 16.741,22.663 16.741,11.377 12.46,11.377 "/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-2178.8477" x2="-2178.8477" y1="3340.2158" y2="3324.8235">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#F9FCF9"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M15.148,10.205c0.524,0,0.945-0.129,1.262-0.389c0.316-0.259,0.475-0.615,0.475-1.07  c0-0.441-0.163-0.795-0.489-1.061c-0.327-0.264-0.743-0.397-1.248-0.397c-0.531,0-0.952,0.131-1.262,0.394  c-0.312,0.262-0.466,0.617-0.466,1.064c0,0.455,0.159,0.812,0.477,1.07C14.212,10.076,14.63,10.205,15.148,10.205z" fill="url(#SVGID_3__)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_search.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_search.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_search.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -18,39 +18,39 @@
 </linearGradient>
 <path d="M2.565,50.126c-0.754,0.753-0.754,1.987,0,2.74l4.568,4.568c0.752,0.754,1.986,0.754,2.74,0  l10.505-10.505c0.753-0.754,0.753-1.986,0-2.74L15.81,39.62c-0.752-0.753-1.984-0.752-2.738,0L2.565,50.126z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.5071 0.5071 5299.6968 1575.5687)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="4824.3057" x2="4813.9697" y1="3708.6299" y2="3708.6299">
-<stop offset="0" style="stop-color:#E0E4E6"/>
-<stop offset="0.3333" style="stop-color:#B0B6B8"/>
-<stop offset="0.3333" style="stop-color:#9FA6A8"/>
-<stop offset="0.6848" style="stop-color:#6A7173"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E2E4E3"/>
+<stop offset="0.3333" style="stop-color:#B2B6B5"/>
+<stop offset="0.3333" style="stop-color:#A2A5A5"/>
+<stop offset="0.6848" style="stop-color:#6D6F70"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="10.976,56.332 3.668,49.023 11.857,40.833 19.165,48.143 "/>
 <path d="M36.649,25.261c-7.902,0-15.16-1.912-20.893-5.105C17.397,10.043,26.169,2.321,36.743,2.321  c10.541,0,19.287,7.673,20.97,17.737C51.954,23.309,44.632,25.261,36.649,25.261z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(-0.9773 0 0 0.9773 4277.1611 57.5776)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="4338.9121" x2="4338.9121" y1="-19.5293" y2="-50.7046">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.4667" style="stop-color:#347940"/>
+<stop offset="1" style="stop-color:#173636"/>
 </linearGradient>
 <circle cx="36.742" cy="23.257" fill="url(#SVGID_4_)" fill-opacity="0.7" r="15.233" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="36.7432" x2="36.7432" y1="44.6318" y2="1.9579">
-<stop offset="0" style="stop-color:#BEC7CC"/>
-<stop offset="0.1939" style="stop-color:#9AA4A6"/>
-<stop offset="0.697" style="stop-color:#D4D9DB"/>
-<stop offset="0.897" style="stop-color:#ECF3F5"/>
-<stop offset="1" style="stop-color:#ECF3F5"/>
+<stop offset="0" style="stop-color:#C2C8C6"/>
+<stop offset="0.1939" style="stop-color:#9EA2A2"/>
+<stop offset="0.697" style="stop-color:#D6D9D7"/>
+<stop offset="0.897" style="stop-color:#EFF2F0"/>
+<stop offset="1" style="stop-color:#EFF2F0"/>
 </linearGradient>
 <path d="M36.743,2c-11.738,0-21.258,9.518-21.258,21.257s9.52,21.257,21.258,21.257  s21.258-9.518,21.258-21.257S48.481,2,36.743,2z M36.743,39.287c-8.413,0-16.07-7.617-16.07-16.03C20.673,14.844,28.33,7,36.743,7  c8.414,0,16.216,7.844,16.216,16.257C52.959,31.67,45.157,39.287,36.743,39.287z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="36.7422" x2="36.7422" y1="2.2324" y2="42.8653">
-<stop offset="0" style="stop-color:#E5EBED"/>
-<stop offset="0.5818" style="stop-color:#C4CCCE"/>
-<stop offset="0.8545" style="stop-color:#8D9699"/>
-<stop offset="0.9758" style="stop-color:#CAD2D4"/>
-<stop offset="1" style="stop-color:#CAD2D4"/>
+<stop offset="0" style="stop-color:#E7EBE8"/>
+<stop offset="0.5818" style="stop-color:#C7CBC9"/>
+<stop offset="0.8545" style="stop-color:#919595"/>
+<stop offset="0.9758" style="stop-color:#CDD1CF"/>
+<stop offset="1" style="stop-color:#CDD1CF"/>
 </linearGradient>
 <path d="M36.743,3.063c-11.151,0-20.195,9.042-20.195,20.193c0,11.151,9.044,20.194,20.195,20.194  c11.152,0,20.193-9.043,20.193-20.194C56.937,12.105,47.896,3.063,36.743,3.063z M36.743,39.287c-8.413,0-16.07-7.617-16.07-16.03  C20.673,14.844,28.33,7,36.743,7c8.414,0,16.216,7.844,16.216,16.257C52.959,31.67,45.157,39.287,36.743,39.287z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="36.7422" x2="36.7422" y1="39.6108" y2="7.5044">
-<stop offset="0" style="stop-color:#E5EBED"/>
-<stop offset="1" style="stop-color:#515759"/>
+<stop offset="0" style="stop-color:#E7EBE8"/>
+<stop offset="1" style="stop-color:#535557"/>
 </linearGradient>
 <path d="M36.743,6.96c-9.002,0-16.298,7.297-16.298,16.297s7.296,16.297,16.298,16.297  c9,0,16.296-7.297,16.296-16.297S45.743,6.96,36.743,6.96z M36.743,38.491c-8.413,0-15.234-6.821-15.234-15.234  c0-8.413,6.821-15.233,15.234-15.233c8.414,0,15.232,6.821,15.232,15.233C51.976,31.67,45.157,38.491,36.743,38.491z" fill="url(#SVGID_7_)"/>
 <path d="M36.653,24.873c-5.037,0-9.799-0.81-14.051-2.244c0.332-7.532,6.525-13.543,14.141-13.543  c7.594,0,13.775,5.979,14.135,13.484C46.583,24.04,41.76,24.873,36.653,24.873z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_security.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_security.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_security.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -21,22 +21,22 @@
 </linearGradient>
 <path d="M14.389,28.259v-7.991c0.122-8.604,7.231-15.612,15.847-15.612c8.617,0,15.727,7.016,15.848,15.637  v6.862h-2.385v-6.888c-0.156-7.299-6.195-13.224-13.463-13.224c-7.267,0-13.306,5.915-13.462,13.188v8.027L14.389,28.259  L14.389,28.259z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 39.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-94.52" x2="-50.52" y1="-1.6851" y2="-1.6851">
-<stop offset="0" style="stop-color:#ED8C0D"/>
-<stop offset="0.24" style="stop-color:#FFE692"/>
-<stop offset="0.75" style="stop-color:#ED8C0D"/>
-<stop offset="0.8667" style="stop-color:#FFB81F"/>
-<stop offset="1" style="stop-color:#ED8C0D"/>
+<stop offset="0" style="stop-color:#AA8250"/>
+<stop offset="0.24" style="stop-color:#DED7B3"/>
+<stop offset="0.75" style="stop-color:#AA8250"/>
+<stop offset="0.8667" style="stop-color:#BCA162"/>
+<stop offset="1" style="stop-color:#AA8250"/>
 </linearGradient>
 <path d="M52,55.76c0,0.76-0.615,1.375-1.375,1.375H9.375C8.616,57.135,8,56.518,8,55.76V27.571  c0-0.759,0.616-1.375,1.375-1.375h41.25c0.76,0,1.375,0.616,1.375,1.375V55.76z" fill="url(#SVGID_4_)"/>
 <path d="M50.625,26.196H9.375C8.616,26.196,8,26.812,8,27.571v1.375  c0-0.759,0.616-1.375,1.375-1.375h41.25c0.76,0,1.375,0.616,1.375,1.375v-1.375C52,26.812,51.385,26.196,50.625,26.196z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill="#EE8F11" fill-opacity="0.5" height="4.813" stroke-opacity="0.5" width="44" x="8" y="32.385"/>
+<rect fill="#AC8653" fill-opacity="0.5" height="4.813" stroke-opacity="0.5" width="44" x="8" y="32.385"/>
 <rect fill-opacity="0.25" height="0.688" stroke-opacity="0.25" width="44" x="8" y="32.385"/>
 <path d="M50.625,57.135H9.375C8.616,57.135,8,56.518,8,55.76v-1.375  c0,0.758,0.616,1.375,1.375,1.375h41.25c0.76,0,1.375-0.617,1.375-1.375v1.375C52,56.518,51.385,57.135,50.625,57.135z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<rect fill="#FEE38E" fill-opacity="0.4" height="0.688" stroke-opacity="0.4" width="44" x="8" y="37.196"/>
-<path d="M30,54.674c-1.378,0-2.5-1.121-2.5-2.5V48.5  c-1.538-0.885-2.5-2.517-2.5-4.326c0-2.756,2.243-5,5-5s5,2.244,5,5c0,1.811-0.962,3.441-2.5,4.326v3.674  C32.5,53.553,31.379,54.674,30,54.674L30,54.674z" fill="#FFE591" fill-opacity="0.25" stroke-opacity="0.25"/>
+<rect fill="#DCD5B0" fill-opacity="0.4" height="0.688" stroke-opacity="0.4" width="44" x="8" y="37.196"/>
+<path d="M30,54.674c-1.378,0-2.5-1.121-2.5-2.5V48.5  c-1.538-0.885-2.5-2.517-2.5-4.326c0-2.756,2.243-5,5-5s5,2.244,5,5c0,1.811-0.962,3.441-2.5,4.326v3.674  C32.5,53.553,31.379,54.674,30,54.674L30,54.674z" fill="#DED7B2" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 39.9805)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-72.52" x2="-72.52" y1="-13.209" y2="-0.4489">
-<stop offset="0" style="stop-color:#A67C52"/>
-<stop offset="1" style="stop-color:#603813"/>
+<stop offset="0" style="stop-color:#8D7B6B"/>
+<stop offset="1" style="stop-color:#492C2A"/>
 </linearGradient>
 <path d="M34,44.174c0-2.209-1.791-4-4-4s-4,1.791-4,4c0,1.678,1.035,3.109,2.5,3.703v4.297  c0,0.83,0.672,1.5,1.5,1.5s1.5-0.67,1.5-1.5v-4.297C32.965,47.283,34,45.852,34,44.174z" fill="url(#SVGID_5_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_server_locked.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_server_locked.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_server_locked.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,17 +3,17 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.3877" x2="29.3877" y1="52.6611" y2="57.6064">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+<stop offset="0.7091" style="stop-color:#6A6C6E"/>
+<stop offset="1" style="stop-color:#AAAFAE"/>
 </linearGradient>
 <path d="M52.041,56.938c0,0.339-0.274,0.612-0.612,0.612H7.347c-0.338,0-0.612-0.273-0.612-0.612v-3.673  c0-0.339,0.274-0.612,0.612-0.612h44.082c0.338,0,0.612,0.273,0.612,0.612V56.938z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="10.4082" x2="49.5918" y1="22.6533" y2="22.6533">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+<stop offset="0" style="stop-color:#B7BCBA"/>
+<stop offset="0.2667" style="stop-color:#E7EBE8"/>
+<stop offset="0.703" style="stop-color:#919595"/>
+<stop offset="1" style="stop-color:#B9BDBC"/>
 </linearGradient>
 <path d="M48.113,2.449H11.889c-0.815,0-1.48,0.668-1.48,1.485v38.923h39.184V3.935  C49.592,3.117,48.926,2.449,48.113,2.449z" fill="url(#SVGID_2_)"/>
 <path d="M48.113,2.449c0.813,0,1.479,0.668,1.479,1.485v38.923H10.408V3.935c0-0.817,0.666-1.485,1.48-1.485H48.113   M48.113,3.626H11.889c-0.173,0-0.318,0.142-0.318,0.309v37.747H48.43V3.935C48.43,3.768,48.285,3.626,48.113,3.626L48.113,3.626z" fill="#FFFFFF"/>
@@ -34,8 +34,8 @@
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="4.706" width="27.939" x="16.031" y="8.534"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="20.0767" x2="20.0767" y1="9.5928" y2="12.0647">
-<stop offset="0" style="stop-color:#17BFFF"/>
-<stop offset="1" style="stop-color:#0D5186"/>
+<stop offset="0" style="stop-color:#5DA9B9"/>
+<stop offset="1" style="stop-color:#313C62"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="2.354" width="5.848" x="17.153" y="9.711"/>
 <rect fill="#FFFFFF" fill-opacity="0.25" height="1.176" stroke-opacity="0.25" width="5.848" x="17.153" y="9.711"/>
@@ -181,19 +181,19 @@
 </linearGradient>
 <path d="M6.945,14.102V9.979c0.063-4.44,3.731-8.055,8.177-8.055S23.234,5.542,23.3,9.99v3.541h-1.231V9.979  c-0.08-3.767-3.196-6.824-6.945-6.824c-3.75,0-6.865,3.053-6.946,6.805v4.142H6.945z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="271.1289" x2="293.832" y1="-382.0376" y2="-382.0376">
-<stop offset="0" style="stop-color:#ED8C0D"/>
-<stop offset="0.24" style="stop-color:#FFE692"/>
-<stop offset="0.75" style="stop-color:#ED8C0D"/>
-<stop offset="0.8667" style="stop-color:#FFB81F"/>
-<stop offset="1" style="stop-color:#ED8C0D"/>
+<stop offset="0" style="stop-color:#AA8250"/>
+<stop offset="0.24" style="stop-color:#DED7B3"/>
+<stop offset="0.75" style="stop-color:#AA8250"/>
+<stop offset="0.8667" style="stop-color:#BCA162"/>
+<stop offset="1" style="stop-color:#AA8250"/>
 </linearGradient>
 <path d="M26.352,28.29c0,0.392-0.317,0.71-0.709,0.71H4.358c-0.392,0-0.709-0.318-0.709-0.71V13.747  c0-0.392,0.317-0.711,0.709-0.711h21.283c0.393,0,0.709,0.319,0.709,0.711V28.29H26.352z" fill="url(#SVGID_4__)"/>
 <path d="M25.643,13.036H4.358c-0.392,0-0.709,0.319-0.709,0.711v0.709  c0-0.392,0.317-0.709,0.709-0.709h21.283c0.393,0,0.709,0.317,0.709,0.709v-0.709C26.352,13.355,26.033,13.036,25.643,13.036z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M25.643,29H4.358c-0.392,0-0.709-0.318-0.709-0.71v-0.709  c0,0.392,0.317,0.709,0.709,0.709h21.283c0.393,0,0.709-0.317,0.709-0.709v0.709C26.352,28.682,26.033,29,25.643,29z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<path d="M15,25.82c-0.689,0-1.25-0.562-1.25-1.25v-1.838  c-0.769-0.441-1.25-1.256-1.25-2.162c0-1.379,1.122-2.5,2.5-2.5c1.379,0,2.5,1.121,2.5,2.5c0,0.904-0.48,1.721-1.25,2.162v1.838  C16.25,25.26,15.689,25.82,15,25.82L15,25.82z" fill="#FFE591" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M15,25.82c-0.689,0-1.25-0.562-1.25-1.25v-1.838  c-0.769-0.441-1.25-1.256-1.25-2.162c0-1.379,1.122-2.5,2.5-2.5c1.379,0,2.5,1.121,2.5,2.5c0,0.904-0.48,1.721-1.25,2.162v1.838  C16.25,25.26,15.689,25.82,15,25.82L15,25.82z" fill="#DED7B2" fill-opacity="0.25" stroke-opacity="0.25"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="282.4805" x2="282.4805" y1="-386.0986" y2="-379.7186">
-<stop offset="0" style="stop-color:#A67C52"/>
-<stop offset="1" style="stop-color:#603813"/>
+<stop offset="0" style="stop-color:#8D7B6B"/>
+<stop offset="1" style="stop-color:#492C2A"/>
 </linearGradient>
 <path d="M17,20.57c0-1.104-0.896-2-2-2c-1.104,0-2,0.896-2,2c0,0.839,0.518,1.555,1.25,1.852v2.148  c0,0.414,0.336,0.75,0.75,0.75s0.75-0.336,0.75-0.75v-2.148C16.482,22.125,17,21.409,17,20.57z" fill="url(#SVGID_5__)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_settings.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_settings.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_settings.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,17 +5,17 @@
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="4.5" y2="55.3778">
 <stop offset="0" style="stop-color:#E8E8E8"/>
-<stop offset="0.3576" style="stop-color:#B2BDC2"/>
-<stop offset="0.7455" style="stop-color:#595C5E"/>
-<stop offset="1" style="stop-color:#A1ABB0"/>
+<stop offset="0.3576" style="stop-color:#B7BDBC"/>
+<stop offset="0.7455" style="stop-color:#5B5B5D"/>
+<stop offset="1" style="stop-color:#A6ABAB"/>
 </linearGradient>
 <path d="M6.412,55.5c-1.055,0-1.912-0.857-1.912-1.911V6.411C4.5,5.357,5.357,4.5,6.412,4.5h47.176  c1.055,0,1.913,0.857,1.913,1.911v47.178c0,1.054-0.858,1.911-1.913,1.911H6.412z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.001" x2="30.001" y1="5.7139" y2="54.1698">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.1455" style="stop-color:#D7DDDE"/>
+<stop offset="0.1455" style="stop-color:#D9DCDA"/>
 <stop offset="0.3212" style="stop-color:#FFFFFF"/>
-<stop offset="0.7333" style="stop-color:#8E9699"/>
-<stop offset="1" style="stop-color:#D5E2E6"/>
+<stop offset="0.7333" style="stop-color:#919596"/>
+<stop offset="1" style="stop-color:#DAE1DD"/>
 </linearGradient>
 <path d="M6.412,54.286c-0.385,0-0.697-0.313-0.697-0.697V6.411c0-0.384,0.313-0.697,0.697-0.697h47.176  c0.387,0,0.699,0.313,0.699,0.697v47.178c0,0.385-0.313,0.697-0.699,0.697H6.412z" fill="url(#SVGID_2_)"/>
 <path d="M53.588,5.106H6.412c-0.719,0-1.305,0.586-1.305,1.305v47.178  c0,0.719,0.586,1.305,1.305,1.305h47.176c0.72,0,1.307-0.586,1.307-1.305V6.411C54.895,5.692,54.308,5.106,53.588,5.106z   M53.68,53.589c0,0.05-0.041,0.09-0.092,0.09H6.412c-0.049,0-0.09-0.04-0.09-0.09V6.411c0-0.049,0.041-0.09,0.09-0.09h47.176  c0.051,0,0.092,0.041,0.092,0.09V53.589z" fill="#FFFFFF" fill-opacity="0.5"/>
@@ -25,17 +25,17 @@
 </linearGradient>
 <path d="M13,48.519c-1.339,0-2.428-1.09-2.428-2.429V13.304c0-1.34,1.089-2.43,2.428-2.43  h1.215c1.339,0,2.429,1.09,2.429,2.43V46.09c0,1.339-1.09,2.429-2.429,2.429H13z" fill="url(#SVGID_3_)" fill-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.9473" x2="11.1119" y1="29.6973" y2="29.6973">
-<stop offset="0" style="stop-color:#595C5E"/>
-<stop offset="0.3" style="stop-color:#ABB2B5"/>
-<stop offset="0.7" style="stop-color:#ABB2B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#5B5B5D"/>
+<stop offset="0.3" style="stop-color:#AEB2B1"/>
+<stop offset="0.7" style="stop-color:#AEB2B1"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M16.036,46.09c0,1.006-0.815,1.822-1.821,1.822H13c-1.006,0-1.821-0.816-1.821-1.822V13.304  c0-1.008,0.815-1.821,1.821-1.821h1.215c1.006,0,1.821,0.813,1.821,1.821V46.09z" fill="url(#SVGID_4_)"/>
 <path d="M14.215,11.482H13c-1.006,0-1.821,0.813-1.821,1.821V46.09c0,1.006,0.815,1.822,1.821,1.822h1.215  c1.006,0,1.821-0.816,1.821-1.822V13.304C16.036,12.296,15.221,11.482,14.215,11.482z M15.429,46.09  c0,0.669-0.544,1.214-1.214,1.214H13c-0.67,0-1.214-0.545-1.214-1.214V13.304c0-0.67,0.544-1.215,1.214-1.215h1.215  c0.67,0,1.214,0.545,1.214,1.215V46.09z" fill-opacity="0.1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11.7861" x2="15.4287" y1="36.0713" y2="36.0713">
-<stop offset="0" style="stop-color:#5AA913"/>
-<stop offset="0.497" style="stop-color:#A2ED21"/>
-<stop offset="1" style="stop-color:#58A813"/>
+<stop offset="0" style="stop-color:#417C40"/>
+<stop offset="0.497" style="stop-color:#93B05E"/>
+<stop offset="1" style="stop-color:#407B40"/>
 </linearGradient>
 <path d="M13,47.304c-0.67,0-1.214-0.545-1.214-1.214V26.054c0-0.668,0.544-1.215,1.214-1.215h1.215  c0.67,0,1.214,0.547,1.214,1.215V46.09c0,0.669-0.544,1.214-1.214,1.214H13z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="13.6074" x2="13.6074" y1="19.6782" y2="28.6905">
@@ -44,29 +44,29 @@
 </linearGradient>
 <path d="M10.572,28.483c-1.34,0-2.43-1.09-2.43-2.43v-4.25c0-1.34,1.09-2.428,2.43-2.428  h6.071c1.339,0,2.429,1.088,2.429,2.428v4.25c0,1.34-1.09,2.43-2.429,2.43H10.572z" fill="url(#SVGID_6_)" fill-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="13.6074" x2="13.6074" y1="19.4058" y2="27.2627">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="1" style="stop-color:#222021"/>
 </linearGradient>
 <path d="M10.572,27.268c-1.006,0-1.822-0.816-1.822-1.82v-4.252  c0-1.004,0.816-1.819,1.822-1.819h6.071c1.004,0,1.821,0.815,1.821,1.819v4.252c0,1.004-0.817,1.82-1.821,1.82H10.572z" fill="url(#SVGID_7_)" fill-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="13.6074" x2="13.6074" y1="20.2031" y2="26.8131">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.1212" style="stop-color:#FFFFFF"/>
-<stop offset="0.4182" style="stop-color:#B0B6B8"/>
-<stop offset="0.4182" style="stop-color:#9FA6A8"/>
-<stop offset="0.6606" style="stop-color:#7D8588"/>
-<stop offset="0.9697" style="stop-color:#ADB3B5"/>
-<stop offset="0.9697" style="stop-color:#595C5E"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0.4182" style="stop-color:#B2B6B5"/>
+<stop offset="0.4182" style="stop-color:#A2A5A5"/>
+<stop offset="0.6606" style="stop-color:#808485"/>
+<stop offset="0.9697" style="stop-color:#AFB3B2"/>
+<stop offset="0.9697" style="stop-color:#5B5B5D"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M17.857,25.447c0,0.671-0.543,1.214-1.214,1.214h-6.071c-0.672,0-1.215-0.543-1.215-1.214v-4.252  c0-0.669,0.543-1.214,1.215-1.214h6.071c0.671,0,1.214,0.545,1.214,1.214V25.447z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="13.6074" x2="13.6074" y1="20.7715" y2="26.1783">
-<stop offset="0" style="stop-color:#E5E9EB"/>
-<stop offset="0.1212" style="stop-color:#E5E9EB"/>
-<stop offset="0.4182" style="stop-color:#B0B6B8"/>
-<stop offset="0.4182" style="stop-color:#9FA6A8"/>
-<stop offset="0.6606" style="stop-color:#7D8588"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7E9E8"/>
+<stop offset="0.1212" style="stop-color:#E7E9E8"/>
+<stop offset="0.4182" style="stop-color:#B2B6B5"/>
+<stop offset="0.4182" style="stop-color:#A2A5A5"/>
+<stop offset="0.6606" style="stop-color:#808485"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M10.572,26.054c-0.336,0-0.607-0.272-0.607-0.606v-4.252c0-0.335,0.271-0.605,0.607-0.605h6.071  c0.335,0,0.606,0.271,0.606,0.605v4.252c0,0.334-0.271,0.606-0.606,0.606H10.572z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="25.75" x2="25.75" y1="11.021" y2="48.3899">
@@ -75,17 +75,17 @@
 </linearGradient>
 <path d="M25.143,48.519c-1.339,0-2.428-1.09-2.428-2.429V13.304  c0-1.34,1.089-2.43,2.428-2.43h1.215c1.339,0,2.429,1.09,2.429,2.43V46.09c0,1.339-1.09,2.429-2.429,2.429H25.143z" fill="url(#SVGID_10_)" fill-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="28.0898" x2="23.2554" y1="29.6973" y2="29.6973">
-<stop offset="0" style="stop-color:#595C5E"/>
-<stop offset="0.3" style="stop-color:#ABB2B5"/>
-<stop offset="0.7" style="stop-color:#ABB2B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#5B5B5D"/>
+<stop offset="0.3" style="stop-color:#AEB2B1"/>
+<stop offset="0.7" style="stop-color:#AEB2B1"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M28.179,46.09c0,1.006-0.815,1.822-1.821,1.822h-1.215c-1.005,0-1.82-0.816-1.82-1.822V13.304  c0-1.008,0.815-1.821,1.82-1.821h1.215c1.006,0,1.821,0.813,1.821,1.821V46.09z" fill="url(#SVGID_11_)"/>
 <path d="M26.357,11.482h-1.215c-1.005,0-1.82,0.813-1.82,1.821V46.09c0,1.006,0.815,1.822,1.82,1.822h1.215  c1.006,0,1.821-0.816,1.821-1.822V13.304C28.179,12.296,27.363,11.482,26.357,11.482z M27.571,46.09  c0,0.669-0.544,1.214-1.214,1.214h-1.215c-0.67,0-1.214-0.545-1.214-1.214V13.304c0-0.67,0.544-1.215,1.214-1.215h1.215  c0.67,0,1.214,0.545,1.214,1.215V46.09z" fill-opacity="0.1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="23.9287" x2="27.5713" y1="37.5898" y2="37.5898">
-<stop offset="0" style="stop-color:#5AA913"/>
-<stop offset="0.497" style="stop-color:#A2ED21"/>
-<stop offset="1" style="stop-color:#58A813"/>
+<stop offset="0" style="stop-color:#417C40"/>
+<stop offset="0.497" style="stop-color:#93B05E"/>
+<stop offset="1" style="stop-color:#407B40"/>
 </linearGradient>
 <path d="M25.143,47.304c-0.67,0-1.214-0.545-1.214-1.214v-17c0-0.67,0.544-1.214,1.214-1.214h1.215  c0.67,0,1.214,0.544,1.214,1.214v17c0,0.669-0.544,1.214-1.214,1.214H25.143z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="25.75" x2="25.75" y1="26.9634" y2="35.9757">
@@ -94,29 +94,29 @@
 </linearGradient>
 <path d="M22.715,35.769c-1.339,0-2.429-1.09-2.429-2.43V29.09  c0-1.34,1.09-2.429,2.429-2.429h6.071c1.339,0,2.429,1.089,2.429,2.429v4.249c0,1.34-1.09,2.43-2.429,2.43H22.715z" fill="url(#SVGID_13_)" fill-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="25.75" x2="25.75" y1="26.6909" y2="34.5488">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="1" style="stop-color:#222021"/>
 </linearGradient>
 <path d="M22.715,34.554c-1.005,0-1.822-0.816-1.822-1.821v-4.249  c0-1.006,0.817-1.822,1.822-1.822h6.071c1.005,0,1.821,0.816,1.821,1.822v4.249c0,1.005-0.816,1.821-1.821,1.821H22.715z" fill="url(#SVGID_14_)" fill-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="25.75" x2="25.75" y1="27.4893" y2="34.0982">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.1212" style="stop-color:#FFFFFF"/>
-<stop offset="0.4182" style="stop-color:#B0B6B8"/>
-<stop offset="0.4182" style="stop-color:#9FA6A8"/>
-<stop offset="0.6606" style="stop-color:#7D8588"/>
-<stop offset="0.9697" style="stop-color:#ADB3B5"/>
-<stop offset="0.9697" style="stop-color:#595C5E"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0.4182" style="stop-color:#B2B6B5"/>
+<stop offset="0.4182" style="stop-color:#A2A5A5"/>
+<stop offset="0.6606" style="stop-color:#808485"/>
+<stop offset="0.9697" style="stop-color:#AFB3B2"/>
+<stop offset="0.9697" style="stop-color:#5B5B5D"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M30,32.732c0,0.671-0.543,1.214-1.214,1.214h-6.071c-0.671,0-1.215-0.543-1.215-1.214v-4.249  c0-0.672,0.544-1.216,1.215-1.216h6.071c0.671,0,1.214,0.544,1.214,1.216V32.732z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="25.75" x2="25.75" y1="28.0571" y2="33.463">
-<stop offset="0" style="stop-color:#E5E9EB"/>
-<stop offset="0.1212" style="stop-color:#E5E9EB"/>
-<stop offset="0.4182" style="stop-color:#B0B6B8"/>
-<stop offset="0.4182" style="stop-color:#9FA6A8"/>
-<stop offset="0.6606" style="stop-color:#7D8588"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7E9E8"/>
+<stop offset="0.1212" style="stop-color:#E7E9E8"/>
+<stop offset="0.4182" style="stop-color:#B2B6B5"/>
+<stop offset="0.4182" style="stop-color:#A2A5A5"/>
+<stop offset="0.6606" style="stop-color:#808485"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M22.715,33.339c-0.335,0-0.607-0.271-0.607-0.606v-4.249c0-0.336,0.272-0.607,0.607-0.607h6.071  c0.335,0,0.607,0.271,0.607,0.607v4.249c0,0.335-0.272,0.606-0.607,0.606H22.715z" fill="url(#SVGID_16_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="42.1426" x2="42.1426" y1="14.0352" y2="45.034">
@@ -130,17 +130,17 @@
 </linearGradient>
 <path d="M36.982,44.71c-0.775,0-1.407-0.632-1.407-1.407V16.091  c0-0.775,0.632-1.408,1.407-1.408h10.322c0.775,0,1.406,0.633,1.406,1.408v27.212c0,0.775-0.631,1.407-1.406,1.407H36.982z" fill="url(#SVGID_18_)" fill-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="42.1436" x2="42.1436" y1="44.3218" y2="15.0707">
-<stop offset="0" style="stop-color:#5F6366"/>
-<stop offset="1" style="stop-color:#3E4142"/>
+<stop offset="0" style="stop-color:#616264"/>
+<stop offset="1" style="stop-color:#3F4041"/>
 </linearGradient>
 <path d="M48.242,43.303c0,0.519-0.419,0.938-0.938,0.938H36.982c-0.518,0-0.938-0.42-0.938-0.938V16.091  c0-0.518,0.42-0.938,0.938-0.938h10.322c0.519,0,0.938,0.42,0.938,0.938V43.303z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="42.1436" x2="42.1436" y1="16.8999" y2="43.2099">
-<stop offset="0" style="stop-color:#9CA4A6"/>
-<stop offset="0.1" style="stop-color:#F0F2F3"/>
-<stop offset="0.5" style="stop-color:#BBBEBF"/>
-<stop offset="0.9" style="stop-color:#F3F5F5"/>
-<stop offset="0.95" style="stop-color:#8E9699"/>
-<stop offset="1" style="stop-color:#686E70"/>
+<stop offset="0" style="stop-color:#9FA3A3"/>
+<stop offset="0.1" style="stop-color:#F1F2F1"/>
+<stop offset="0.5" style="stop-color:#BCBEBD"/>
+<stop offset="0.9" style="stop-color:#F4F4F4"/>
+<stop offset="0.95" style="stop-color:#919596"/>
+<stop offset="1" style="stop-color:#6A6C6E"/>
 </linearGradient>
 <path d="M36.982,43.771c-0.258,0-0.469-0.21-0.469-0.468V17.03c0-0.26,0.211-0.471,0.469-0.471h10.322  c0.259,0,0.469,0.211,0.469,0.471v26.272c0,0.258-0.21,0.468-0.469,0.468H36.982z" fill="url(#SVGID_20_)"/>
 <path d="M47.305,18.437H36.982c-0.258,0-0.469,0.211-0.469,0.469v0.471c0-0.26,0.211-0.471,0.469-0.471h10.322  c0.259,0,0.469,0.211,0.469,0.471v-0.471C47.773,18.647,47.563,18.437,47.305,18.437z" fill="#FFFFFF"/>
@@ -152,7 +152,7 @@
 <stop offset="1" style="stop-color:#808080"/>
 </linearGradient>
 <path d="M38.859,22.66c-0.26,0-0.469-0.212-0.469-0.471v-1.876  c0-0.26,0.209-0.47,0.469-0.47h6.568c0.26,0,0.469,0.21,0.469,0.47v1.876c0,0.259-0.209,0.471-0.469,0.471H38.859z" fill="url(#SVGID_21_)" fill-opacity="0.4"/>
-<rect fill="#FF1D25" height="1.876" width="6.568" x="38.859" y="20.313"/>
+<rect fill="#BB6861" height="1.876" width="6.568" x="38.859" y="20.313"/>
 <polygon fill-opacity="0.3" points="44.959,20.313 39.328,20.313 38.859,20.313 38.859,20.782 38.859,22.189 39.328,22.189   39.328,20.782 44.959,20.782 44.959,22.189 45.428,22.189 45.428,20.782 45.428,20.313 "/>
 <rect fill="none" height="60" width="60"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sim.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sim.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sim.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,9 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="1.999" y2="57.9139">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.8182" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#7B7E80"/>
+<stop offset="0" style="stop-color:#A2A4A4"/>
+<stop offset="0.8182" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#7D7E7F"/>
 </linearGradient>
 <path d="M8.957,57.999c-1.365,0-2.473-1.108-2.473-2.473V4.472c0-1.364,1.107-2.473,2.473-2.473h30.801  c1.115,0,2.607,0.619,3.396,1.406l8.951,8.95c0.789,0.79,1.408,2.281,1.408,3.396v39.774c0,1.364-1.111,2.473-2.473,2.473H8.957z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="3.2646" y2="56.7327">
@@ -16,8 +16,8 @@
 </linearGradient>
 <path d="M51.041,56.674H8.957c-0.633,0-1.146-0.513-1.146-1.147V4.469c0-0.629,0.514-1.145,1.146-1.145  h30.801c0.766,0,1.912,0.477,2.459,1.021l8.953,8.948c0.543,0.546,1.018,1.693,1.018,2.459v39.774  C52.188,56.161,51.676,56.674,51.041,56.674L51.041,56.674z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="4.6533" y2="55.3477">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+<stop offset="0" style="stop-color:#E7E8E7"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M50.863,55.348H9.137V4.653h30.621c0.412,0,1.227,0.336,1.521,0.629l8.957,8.95  c0.289,0.293,0.627,1.105,0.627,1.52V55.348L50.863,55.348z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="27.3711" x2="27.3711" y1="51.1084" y2="24.5269">
@@ -27,59 +27,59 @@
 <rect fill="url(#SVGID_4_)" height="26.784" width="31.227" x="11.758" y="24.426"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1.326" stroke-opacity="0.4" width="31.227" x="11.758" y="51.21"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="16.2236" x2="16.2236" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="7.305" width="5.682" x="13.383" y="42.197"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30.1895" x2="30.1895" y1="25.9839" y2="48.9336">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="7.304" width="5.254" x="27.563" y="25.967"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="23.3125" x2="23.3125" y1="25.9839" y2="48.9336">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="7.304" width="5.254" x="20.686" y="25.967"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="37.8779" x2="37.8779" y1="25.9839" y2="48.9336">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="7.304" width="6.877" x="34.439" y="25.967"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.1895" x2="30.1895" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="7.305" width="5.254" x="27.563" y="42.197"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="23.3125" x2="23.3125" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="7.305" width="5.254" x="20.686" y="42.197"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="27.3496" x2="27.3496" y1="25.9839" y2="48.8929">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <polygon fill="url(#SVGID_11_)" points="18.975,34.894 18.975,25.967 13.383,25.967 13.383,40.574 41.316,40.574 41.316,34.894 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="37.8779" x2="37.8779" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+<stop offset="0" style="stop-color:#D5D19D"/>
+<stop offset="0.33" style="stop-color:#B9A56D"/>
+<stop offset="0.66" style="stop-color:#AD9861"/>
+<stop offset="1" style="stop-color:#B38E4E"/>
 </linearGradient>
 <rect fill="url(#SVGID_12_)" height="7.305" width="6.877" x="34.439" y="42.197"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sisx.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sisx.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sisx.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,12 +4,12 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.8462" x2="27.8462" y1="3.1968" y2="48.3761">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.4606" style="stop-color:#BDC2C4"/>
-<stop offset="0.7333" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.4606" style="stop-color:#BFC2C1"/>
+<stop offset="0.7333" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M51.065,18.041H31.027v-2.398c2.141-1.259,4.403-2.609,4.403-5.143c0-3.896-4.045-7.064-7.938-7.064  c-3.895,0-7.937,3.168-7.937,7.064c0,2.535,2.265,3.891,4.415,5.146v2.396h-5.701c-1.445,0-2.627,1.183-2.627,2.626v13.048h-1.453  c-1.211-2.092-2.594-4.378-5.185-4.378C5.136,29.337,2,33.348,2,37.217c0,3.868,3.136,7.879,7.003,7.879  c2.591,0,3.974-2.286,5.185-4.377h1.453v3.885c0,1.445,1.183,2.627,2.627,2.627h6.205v-3.62c-1.889-1.104-3.882-2.296-3.882-4.526  c0-3.426,3.556-6.213,6.981-6.213s6.983,2.787,6.983,6.213c0,2.229-1.99,3.417-3.873,4.525v3.621h20.383  c1.445,0,2.628-1.182,2.628-2.627V20.667C53.693,19.224,52.51,18.041,51.065,18.041z" fill="url(#SVGID_1_)"/>
 <path d="M18.268,18.759h5.701v-0.718h-5.701c-1.445,0-2.627,1.183-2.627,2.626v0.718  C15.641,19.941,16.823,18.759,18.268,18.759z" fill="#FFFFFF"/>
@@ -21,43 +21,43 @@
 <path d="M53.693,32.871H40.51l-0.113,0.01L40.34,32.89c-1.32,0.21-2.018,1.202-2.179,1.638  l-1.121,2.339c-0.058,0.08-0.11,0.163-0.155,0.242c-0.064,0.112-0.118,0.222-0.127,0.247c-0.047,0.096-0.09,0.197-0.148,0.367  c-0.1,0.307-0.148,0.6-0.148,0.893v8.615h15.32c0.754,0,1.43-0.326,1.911-0.836V32.871z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
 <path d="M53.693,33.59H40.51l-0.057,0.009c-0.986,0.157-1.513,0.888-1.645,1.239l-1.151,2.401  c-0.056,0.073-0.106,0.149-0.153,0.231c-0.045,0.078-0.082,0.154-0.102,0.201c-0.037,0.073-0.067,0.15-0.109,0.273  c-0.076,0.233-0.114,0.452-0.114,0.67v8.615h14.603c0.754,0,1.43-0.326,1.911-0.836V33.59z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="47.9429" x2="47.9429" y1="34.2842" y2="38.7279">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="1" style="stop-color:#7DC51A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="1" style="stop-color:#66924D"/>
 </linearGradient>
 <path d="M57.619,37.628l-1.189-2.479c0,0-0.269-0.707-1.11-0.841H40.568  c-0.843,0.134-1.111,0.841-1.111,0.841l-1.188,2.479c-0.289,0.325-0.356,0.74-0.371,0.987h20.092  C57.975,38.368,57.908,37.953,57.619,37.628z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="47.9487" x2="47.9487" y1="37.0742" y2="57.0715">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#D11414"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="1" style="stop-color:#984D51"/>
 </linearGradient>
 <path d="M58,55.128c0,0.793-0.644,1.437-1.436,1.437H39.333c-0.791,0-1.436-0.644-1.436-1.437V38.615  c0-0.793,0.645-1.436,1.436-1.436h17.232c0.792,0,1.436,0.643,1.436,1.436V55.128z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9487" x2="47.9487" y1="51.5391" y2="37.1797">
-<stop offset="0" style="stop-color:#961414"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#6F3B44"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <path d="M40.769,51.539h14.359c0.793,0,1.437-0.645,1.437-1.438V37.18H39.333v12.922  C39.333,50.895,39.976,51.539,40.769,51.539z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="47.9478" x2="47.9478" y1="50.2227" y2="56.8339">
-<stop offset="0" style="stop-color:#961414"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#6F3B44"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <path d="M55.87,51.326c-0.17,0.104-0.359,0.168-0.564,0.194c-0.047,0.011-0.103,0.019-0.177,0.019H40.769  c-0.074,0-0.13-0.008-0.177-0.019c-0.205-0.026-0.395-0.091-0.564-0.194l-1.929,4.525c0.25,0.424,0.706,0.713,1.233,0.713h17.232  c0.527,0,0.983-0.289,1.232-0.713L55.87,51.326z" fill="url(#SVGID_5_)"/>
 <path d="M55.305,52.238c0.205-0.025,0.395-0.092,0.564-0.193l1.731,4.062c0.073-0.078,0.142-0.161,0.196-0.255  l-1.928-4.525c-0.17,0.104-0.359,0.168-0.564,0.194c-0.047,0.011-0.103,0.019-0.177,0.019H40.769c-0.074,0-0.13-0.008-0.177-0.019  c-0.205-0.026-0.395-0.091-0.564-0.194l-1.929,4.525c0.056,0.094,0.124,0.177,0.198,0.255l1.73-4.062  c0.17,0.102,0.359,0.168,0.564,0.193c0.047,0.011,0.103,0.018,0.177,0.018" fill-opacity="0.15" stroke-opacity="0.15"/>
 <path d="M39.333,37.18v12.922c0,0.793,0.644,1.438,1.437,1.438h14.359c0.793,0,1.437-0.645,1.437-1.438V37.18H39.333z   M55.846,50.102c0,0.396-0.322,0.719-0.718,0.719H40.769c-0.396,0-0.718-0.322-0.718-0.719V37.896h15.795V50.102z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="47.9487" x2="47.9487" y1="34.292" y2="37.2548">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#D11414"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="1" style="stop-color:#984D51"/>
 </linearGradient>
 <path d="M56.565,35.742c0-0.793-0.644-1.435-1.437-1.435H40.769c-0.793,0-1.437,0.642-1.437,1.435v1.438  h17.232V35.742z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="47.8735" x2="47.8735" y1="37.4336" y2="34.3221">
-<stop offset="0" style="stop-color:#EC4B27"/>
-<stop offset="1" style="stop-color:#FF9A4D"/>
+<stop offset="0" style="stop-color:#B17362"/>
+<stop offset="1" style="stop-color:#CAA782"/>
 </linearGradient>
 <path d="M39.333,37.18h17.232c0.465,0,0.874,0.225,1.137,0.568  c-0.027-0.041-0.049-0.082-0.083-0.12l-1.189-2.479c0,0-0.269-0.707-1.11-0.841H40.568c-0.843,0.134-1.111,0.841-1.111,0.841  l-1.188,2.479c-0.102,0.113-0.167,0.237-0.223,0.362C38.28,37.512,38.765,37.18,39.333,37.18z" fill="url(#SVGID_7_)" fill-opacity="0.65" stroke-opacity="0.65"/>
-<path d="M57.787,37.869c0.007,0.012,0.011,0.021,0.017,0.033C57.797,37.891,57.792,37.881,57.787,37.869z" fill="#C7FF5A"/>
-<path d="M37.985,38.139c-0.003,0.01-0.006,0.02-0.01,0.029C37.979,38.158,37.982,38.148,37.985,38.139z" fill="#C7FF5A"/>
+<path d="M57.787,37.869c0.007,0.012,0.011,0.021,0.017,0.033C57.797,37.891,57.792,37.881,57.787,37.869z" fill="#BBCE8B"/>
+<path d="M37.985,38.139c-0.003,0.01-0.006,0.02-0.01,0.029C37.979,38.158,37.982,38.148,37.985,38.139z" fill="#BBCE8B"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="47.9487" x2="47.9487" y1="37.0742" y2="57.0715">
-<stop offset="0" style="stop-color:#FDDB2B"/>
-<stop offset="0.5455" style="stop-color:#FF9A4D"/>
-<stop offset="1" style="stop-color:#EC4B27"/>
+<stop offset="0" style="stop-color:#BEB16A"/>
+<stop offset="0.5455" style="stop-color:#CAA782"/>
+<stop offset="1" style="stop-color:#B17362"/>
 </linearGradient>
 <path d="M56.565,37.18H39.333c-0.791,0-1.436,0.643-1.436,1.436v16.513c0,0.793,0.645,1.437,1.436,1.437  h17.232c0.792,0,1.436-0.644,1.436-1.437V38.615C58,37.822,57.357,37.18,56.565,37.18z M57.282,55.128  c0,0.396-0.322,0.718-0.717,0.718H39.333c-0.395,0-0.717-0.322-0.717-0.718V38.615c0-0.396,0.322-0.719,0.717-0.719h17.232  c0.395,0,0.717,0.322,0.717,0.719V55.128z" fill="url(#SVGID_8_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_social_media.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_social_media.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_social_media.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,39 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="50.17" y2="7.62">
-<stop offset="0" stop-color="#004E8C"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<stop offset="0" stop-color="#2A3662"/>
+<stop offset="1" stop-color="#546F9F"/>
 </linearGradient>
 <circle cx="30" cy="28.98" fill="url(#SVGID_1)" r="21.43"/>
 <radialGradient cx="29.68" cy="21.59" gradientUnits="userSpaceOnUse" id="SVGID_2" r="25.79">
-<stop offset="0" stop-color="#94FFFF"/>
-<stop offset="0.5" stop-color="#36B5FF"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<stop offset="0" stop-color="#B4DFC6"/>
+<stop offset="0.5" stop-color="#72B9C3"/>
+<stop offset="1" stop-color="#546F9F"/>
 </radialGradient>
 <path d="M50.88,28.98c0,11.53-9.346,20.88-20.88,20.88s-20.88-9.345-20.88-20.88c0-11.53,9.349-20.88,20.88-20.88s20.88,9.36,20.88,20.88z" fill="url(#SVGID_2)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="7.92" y2="49.97">
-<stop offset="0" stop-color="#31A7F8"/>
-<stop offset="0.5" stop-color="#1E74DC"/>
-<stop offset="1" stop-color="#88D6EB"/>
+<stop offset="0" stop-color="#6DACBC"/>
+<stop offset="0.5" stop-color="#5778A3"/>
+<stop offset="1" stop-color="#A6CDC2"/>
 </linearGradient>
 <path d="M30,8.107c-11.53,0-20.88,9.349-20.88,20.88s9.349,20.88,20.88,20.88,20.88-9.345,20.88-20.88c0-11.53-9.35-20.88-20.88-20.88zm0,39.92c-10.84,0-19.66-8.817-19.66-19.66s8.82-19.66,19.66-19.66,19.66,8.819,19.66,19.66c0,10.85-8.82,19.66-19.66,19.66z" fill="url(#SVGID_3)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="9.46" x2="12.78" y1="31.83" y2="31.83">
-<stop offset="0" stop-color="#58595B"/>
+<stop offset="0" stop-color="#59595A"/>
 <stop offset="1" stop-color="#000000"/>
 </linearGradient>
 <path d="M11.08,28.64c-0.222-0.295-0.725-0.295-0.946-0.295-0.437,0-0.669,0.311-0.673,0.616v0.021,0.031c0,0.537,0.03,1.14,0.094,1.871,0.013,0.139,0.03,0.276,0.047,0.414l0.024,0.201c0.055,0.434,0.121,0.861,0.195,1.274l0.035,0.183c0.032,0.162,0.063,0.323,0.097,0.483,0.089,0.405,0.198,0.827,0.332,1.29,0.019,0.066,0.037,0.135,0.054,0.199,0.029,0.109,0.058,0.217,0.091,0.322l0.005,0.014,0.012,0.033c-0.003-0.01-0.008-0.023-0.01-0.037l1.197-0.081c0.019-0.187,0.025-0.382,0.019-0.575-0.01-0.303-0.021-0.676-0.108-0.991l1.112-1.493,0.121-0.162v-1.595l-0.16-0.18-1.52-1.53z" fill="url(#SVGID_4)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="15.86" x2="50.59" y1="25.75" y2="25.75">
-<stop offset="0" stop-color="#58595B"/>
+<stop offset="0" stop-color="#59595A"/>
 <stop offset="1" stop-color="#000000"/>
 </linearGradient>
 <path d="M50.58,24.89c-0.015-0.079-0.029-0.135-0.043-0.191-0.012-0.042-0.021-0.084-0.029-0.125-0.105-0.495-0.236-1.006-0.391-1.525l-0.02-0.07c-0.033-0.117-0.067-0.234-0.105-0.349-0.188-0.587-0.393-1.148-0.607-1.666-0.028-0.065-0.057-0.125-0.085-0.188l-0.045-0.101c-0.206-0.473-0.435-0.947-0.677-1.402l-0.03-0.059c-0.046-0.089-0.092-0.181-0.141-0.269-0.295-0.532-0.603-1.04-0.918-1.511-0.032-0.049-0.069-0.102-0.106-0.154-0.023-0.031-0.045-0.062-0.066-0.092-0.301-0.437-0.617-0.862-0.946-1.268l-0.063-0.081c-0.045-0.055-0.089-0.112-0.135-0.167-0.381-0.456-0.783-0.898-1.199-1.316-0.055-0.057-0.114-0.115-0.176-0.172l-0.049-0.046c-0.375-0.369-0.774-0.731-1.183-1.074l-0.081-0.069c-0.041-0.037-0.082-0.073-0.125-0.106-0.446-0.367-0.93-0.728-1.435-1.075-0.063-0.042-0.126-0.083-0.19-0.124l-0.076-0.05c-0.455-0.301-0.93-0.589-1.404-0.853l-0.074-0.042c-0.039-0.022-0.078-0.045-0.118-0.068-0.528-0.283-1.081-0.55-1.643-0.792l-0.12-0.056-0.153-0.063c-0.148-0.062-0.297-0.114-0.444-0.166-0.076-0.026-0.152-0.053-0.228-0.08l-0.282-0.105-0.254,0.162c-0.171,0.108-0.841,0.491-1.236,0.715-0.438-0.059-1.499-0.192-2.569-0.295,0.33-0.032,0.786-0.069,1.429-0.111l0.091-1.204-0.048-0.012c-0.038-0.011-0.077-0.02-0.116-0.029l-0.091-0.018-0.075-0.014c-0.654-0.132-1.271-0.227-1.882-0.291l-0.004-0.001h-0.09c-0.698-0.07-1.409-0.106-2.113-0.106-0.62,0-1.262,0.032-1.963,0.101-0.109,0.01-0.214,0.021-0.321,0.032-0.693,0.078-1.299,0.169-1.873,0.286l-0.02,0.003-0.014,0.002c-0.603,0.125-1.211,0.281-1.856,0.477-0.058,0.018-0.115,0.037-0.173,0.055l-0.13,0.043c-0.547,0.175-1.083,0.37-1.596,0.582-0.042,0.018-0.071,0.029-0.099,0.039l-0.078,0.031c-0.564,0.241-1.128,0.512-1.688,0.812-0.061,0.031-0.119,0.066-0.177,0.1l-0.072,0.042c-0.157,0.087-0.316,0.186-0.472,0.283l-0.204,0.127-1.118,0.684,1.242,0.416c0.186,0.062,0.385,0.093,0.592,0.093,0.669,0,1.317-0.329,1.837-0.593,0.209-0.105,0.521-0.264,0.648-0.288,0.152,0.045,0.306,0.068,0.458,0.068,0.569,0,1.035-0.306,1.447-0.578l0.111-0.071c0.133-0.043,0.362-0.128,0.818-0.299,0.465-0.174,1.314-0.493,1.541-0.547,0.44-0.005,0.966-0.068,1.339-0.3,0.352,0.058,0.976,0.157,1.619,0.241-0.046,0.029-0.092,0.059-0.132,0.097-0.209,0.192-1.335,0.533-1.679,0.577-0.648,0.082-0.908,0.408-1.012,0.666-0.135,0.336-0.053,0.672,0.078,0.946-0.245,0.162-0.545,0.342-0.804,0.478,0.001-0.006,0.002-0.012,0.003-0.019,0.093-0.517,0.161-0.89-0.09-1.189-0.128-0.153-0.318-0.241-0.519-0.241-0.295,0-0.525,0.183-0.711,0.362-0.519,0.502-0.833,1.129-0.953,1.365l-0.022,0.044-0.018,0.035c-0.225,0.431-0.318,0.737-0.192,1.688-0.056,0.04-0.219,0.102-0.446,0.102-0.03,0-0.058-0.003-0.079-0.004-0.146-0.158-0.348-0.247-0.575-0.247-0.523,0-1.237,0.589-2.124,1.754l-0.284,0.374,0.29,0.37,0.269,0.344c-4.215,3.258-4.247,3.443-4.292,3.716-0.007,0.024-0.044,0.138-0.094,0.293-0.628,1.952-0.977,3.412-0.637,4.195,0.785,1.813,1.669,3.504,2.816,3.598,0.101,0.009,0.212,0.012,0.332,0.012,1.05,0,2.753-0.318,3.571-0.485,0.152,0.283,0.335,0.615,0.437,0.795l0.182,0.322,0.37-0.012c0.004,0,0.2-0.006,0.447-0.006,0.287,0,0.479,0.008,0.602,0.016,0.446,1.307,1.3,4.318,1.141,4.943l-0.002,0.002c-1.441,2.16,0.305,4.975,1.144,6.328,0.066,0.107,0.126,0.203,0.177,0.287,0.324,0.922,0.716,1.531,1.545,1.531,0.062,0,0.124-0.004,0.188-0.007,0.046-0.003,0.095-0.005,0.146-0.005,0.092,0,0.158,0.011,0.226,0.035l0.076,0.027,0.08,0.008c0.155,0.012,0.306,0.034,0.453,0.055,0.255,0.035,0.519,0.071,0.789,0.071,0.721,0,1.293-0.272,1.787-0.856,0.018-0.002,0.036-0.003,0.054-0.006,0.519-0.071,0.712-0.331,0.778-0.564,0.039-0.038,0.09-0.086,0.131-0.124,0.205-0.188,0.447-0.411,0.615-0.675,0.076-0.044,0.162-0.096,0.258-0.152,0.167-0.104,0.355-0.217,0.504-0.293,0.131-0.04,0.246-0.116,0.334-0.225,0.209-0.257,0.166-0.548,0.131-0.783-0.035-0.242-0.07-0.49,0.061-0.758,0.737-0.354,2.051-1.23,2.262-1.373l-0.001,0.017c-0.013,0.116-0.048,0.431-0.101,0.628-0.278,0.28-0.512,0.703-0.586,0.846l-0.048,0.094-0.015,0.104c-0.018,0.138-0.094,0.851,0.307,1.311,0.201,0.23,0.49,0.359,0.813,0.359,0.102,0,0.209-0.014,0.318-0.039,1.027-0.232,2.85-2.702,2.998-4.065,0.072-0.656-0.186-1.173-0.704-1.417l-0.387-0.183-0.304,0.302-1.125,1.126c-0.381,0.034-0.678,0.147-0.879,0.325,0.012-0.479-0.036-0.973-0.087-1.451-0.155-1.445-0.185-2.369,0.703-2.996l0.045-0.032,0.038-0.04c0.32-0.326,0.676-0.61,1.052-0.912,0.88-0.707,1.79-1.438,2.332-2.759l0.022-0.056c0.174-0.451,0.437-1.131,0.082-1.651-0.09-0.128-0.275-0.326-0.625-0.396,0.461-0.186,0.816-0.333,0.852-0.345l0.106-0.044,0.083-0.08,1.899-1.822,0.278-0.269-0.122-0.366c-0.017-0.047-0.12-0.335-0.411-0.748,0.554,0.075,1.029,0.208,1.185,0.326,0.057,0.125,0.171,0.397,0.292,0.683,2.088,4.924,2.383,5.177,2.926,5.186,0.021,0,0.037,0.002,0.051,0.003,0.043,0.003,0.083,0.005,0.119,0.005,0.309,0,0.486-0.158,0.564-0.252,0.227-0.273,0.163-0.608,0.139-0.734l-0.008-0.043c-0.025-0.294-0.009-1.618,0.034-2.706,0.003,0.002,0.004,0.006,0.007,0.01l1.119-0.445-0.04-0.09zm-16.46-6.02c-0.086,0.003-0.181,0.008-0.281,0.012-0.322,0.014-0.689,0.031-1.054,0.031-0.956,0-1.173-0.118-1.195-0.132-0.114-0.082-0.23-0.143-0.351-0.188,0.217-0.048,0.465-0.214,0.72-0.708,0.25,0.487,0.592,0.917,1.114,0.917,0.141,0,0.277-0.034,0.406-0.101,0.17,0.01,0.46,0.11,0.63,0.17zm-0.37-2.66c-0.072,0-0.131-0.003-0.176-0.007,0.049-0.128,0.108-0.202,0.154-0.244,0.061,0.093,0.141,0.175,0.232,0.245-0.07,0-0.14,0.01-0.2,0.01zm-3.8,1.27c0.327,0.641,0.569,0.917,0.762,1.037-0.475,0.039-0.833,0.34-1.126,0.625-0.206-0.068-0.565-0.286-0.672-0.438-0.063-0.089-0.138-0.166-0.22-0.232,0.52-0.14,0.97-0.62,1.26-0.99zm-1.81-0.47l-0.678-0.034-2.279-0.111c0.278-0.228,0.542-0.444,0.697-0.57,0.042-0.014,0.205-0.06,0.606-0.06,0.242,0,0.473,0.017,0.62,0.029l1.03,0.74z" fill="url(#SVGID_5)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="30.34" cy="14.28" gradientUnits="userSpaceOnUse" id="SVGID_6" r="23.56">
-<stop offset="0" stop-color="#7AF200"/>
-<stop offset="0.32" stop-color="#7AF200"/>
-<stop offset="0.73" stop-color="#1CAD0F"/>
-<stop offset="1" stop-color="#007A3A"/>
+<stop offset="0" stop-color="#71A949"/>
+<stop offset="0.32" stop-color="#71A949"/>
+<stop offset="0.73" stop-color="#3E7E53"/>
+<stop offset="1" stop-color="#254F55"/>
 </radialGradient>
 <path d="M10.07,28.97v0.018c0,0.622,0.039,1.237,0.093,1.843,0.017,0.199,0.046,0.398,0.069,0.599,0.053,0.417,0.116,0.829,0.19,1.237,0.042,0.217,0.082,0.434,0.127,0.646,0.093,0.422,0.203,0.838,0.321,1.248,0.05,0.17,0.089,0.343,0.14,0.508,0.007,0.018,0.014,0.034,0.018,0.053,0.017-0.162,0.021-0.327,0.017-0.497-0.04-1.199-0.233-1.045-0.233-1.045l1.357-1.823v-1.162l-1.589-1.59c-0.01,0-0.52-0.08-0.52-0.04z" fill="url(#SVGID_6)"/>
 <path d="M22.83,10.95c0.587,0.192,1.066-0.2,1.613-0.548,0.193-0.04,2.338-0.896,2.57-0.896,0.231,0,1.01-0.03,1.204-0.34,0,0,3.357,0.583,3.862,0.389,0.277-0.108,1.434-0.2,2.426-0.265-0.057-0.012-0.107-0.029-0.162-0.041-0.055-0.011-0.106-0.019-0.162-0.03-0.623-0.125-1.252-0.226-1.894-0.29-0.005,0-0.01,0-0.015-0.002-0.674-0.068-1.359-0.104-2.053-0.104-0.643,0-1.277,0.039-1.906,0.098-0.11,0.011-0.22,0.023-0.331,0.035-0.608,0.066-1.21,0.155-1.8,0.273-0.01,0.004-0.021,0.005-0.031,0.006-0.613,0.126-1.213,0.283-1.802,0.464-0.102,0.03-0.199,0.064-0.301,0.096-0.523,0.168-1.038,0.356-1.544,0.564-0.06,0.026-0.12,0.047-0.18,0.071-0.556,0.238-1.099,0.501-1.629,0.784-0.08,0.043-0.157,0.089-0.235,0.134-0.227,0.125-0.44,0.267-0.66,0.401,1.07,0.38,2.43-0.99,3.01-0.79z" fill="url(#SVGID_6)"/>
@@ -68,27 +69,27 @@
 </linearGradient>
 <polygon fill="url(#SVGID_12)" points="45.41,20.15,13.5,20.15,13.5,17.7,45.41,17.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="30.11" x2="30.11" y1="29.69" y2="50.46">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="1" stop-color="#231F20"/>
+<stop offset="0" stop-color="#A8A9AA"/>
+<stop offset="1" stop-color="#222021"/>
 </linearGradient>
 <path d="M35.36,45.61l-0.757-0.28-0.134-0.055-0.16-0.062-0.428-0.172c-0.199-0.361-0.211-1.13-0.064-1.471l-0.262-0.146,0.283,0.101c0.043-0.067,0.084-0.136,0.126-0.208l0.043-0.069c0.319-0.522,0.617-1.071,0.885-1.634,0.669-0.076,1.322-0.654,1.659-1.489,0.387-0.95,0.262-1.936-0.283-2.444,0.493-2.213,0.152-4.221-0.959-5.652-1.123-1.449-2.96-2.258-5.325-2.335-2.061,0-3.124,0.913-3.877,1.834-0.559,0.129-1.289,0.453-1.808,1.257-0.7,1.084-0.787,2.715-0.259,4.851-0.583,0.487-0.74,1.474-0.365,2.456,0.353,0.922,1.079,1.539,1.808,1.539h0.013c0.114,0.242,0.234,0.479,0.357,0.711h-0.039l0.277,0.453s0.419,0.688,0.447,0.73c0.111,0.174,0.204,0.962-0.004,1.44l-0.567,0.249c-0.331,0.129-0.744,0.285-1.191,0.455-1.251,0.477-2.672,1.017-3.214,1.305-0.548,0.291-1.022,0.639-1.431,1.033,2.953,1.533,6.304,2.406,9.861,2.406,3.646,0,7.078-0.914,10.08-2.52-0.555-0.522-1.066-0.816-1.269-0.923-0.53-0.28-2.15-0.88-3.46-1.37z" fill="url(#SVGID_13)" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="30.11" x2="30.11" y1="29.99" y2="50.46">
-<stop offset="0" stop-color="#A9AAAD"/>
+<stop offset="0" stop-color="#AAABAC"/>
 <stop offset="1" stop-color="#000000"/>
 </linearGradient>
 <path d="M35.26,45.89l-0.766-0.284-0.129-0.052-0.164-0.063-0.518-0.207c-0.324-0.445-0.318-1.407-0.137-1.838l0.012-0.021c0.01-0.023,0.019-0.043,0.031-0.063,0.041-0.066,0.084-0.134,0.121-0.201l0.045-0.069c0.344-0.563,0.662-1.157,0.947-1.769,0.016,0.001,0.029,0.001,0.045,0.001,0.599,0,1.213-0.526,1.531-1.312,0.37-0.914,0.217-1.848-0.339-2.216,0.026-0.114,0.039-0.177,0.039-0.177,0.474-2.127,0.153-4.049-0.903-5.41-1.066-1.377-2.824-2.144-5.089-2.219-1.961,0-2.952,0.856-3.712,1.805-0.537,0.104-1.234,0.394-1.722,1.15-0.675,1.044-0.731,2.663-0.171,4.814-0.597,0.337-0.785,1.283-0.425,2.224,0.309,0.804,0.923,1.347,1.529,1.347,0.064,0,0.13-0.007,0.191-0.02,0.213,0.455,0.441,0.9,0.684,1.326h-0.01l0.362,0.592s0.055,0.092,0.082,0.134c0.185,0.288,0.271,1.284-0.036,1.83l-0.676,0.296c-0.334,0.129-0.747,0.287-1.187,0.454-1.246,0.474-2.66,1.012-3.187,1.292-0.489,0.259-0.921,0.564-1.293,0.912,2.885,1.445,6.138,2.264,9.584,2.264,3.533,0,6.863-0.86,9.801-2.376-0.495-0.449-0.942-0.707-1.126-0.802-0.48-0.25-2.09-0.85-3.39-1.33z" fill="url(#SVGID_14)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <radialGradient cx="30.36" cy="49.25" gradientUnits="userSpaceOnUse" id="SVGID_15" r="8.41">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.2" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<stop offset="0" stop-color="#DDC4B0"/>
+<stop offset="0.2" stop-color="#DDC4B0"/>
+<stop offset="0.96" stop-color="#A57665"/>
+<stop offset="1" stop-color="#A57665"/>
 </radialGradient>
 <path d="M33.78,45.44c-0.79-0.343-0.766-2.028-0.439-2.538,0.057-0.089,0.109-0.178,0.164-0.268h-6.62c0.054,0.09,0.106,0.179,0.163,0.268,0.327,0.51,0.352,2.195-0.439,2.538-0.792,0.345,3.68,3.339,3.68,3.339s4.29-2.99,3.5-3.34z" fill="url(#SVGID_15)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16" x1="30.19" x2="30.19" y1="45.13" y2="52.06">
-<stop offset="0" stop-color="#3BC8EB"/>
-<stop offset="0.39" stop-color="#2D9BD2"/>
-<stop offset="0.89" stop-color="#1347BA"/>
-<stop offset="1" stop-color="#1347BA"/>
+<stop offset="0" stop-color="#70B4B6"/>
+<stop offset="0.39" stop-color="#5F8BA1"/>
+<stop offset="0.89" stop-color="#455188"/>
+<stop offset="1" stop-color="#455188"/>
 </linearGradient>
 <path d="M38.54,47.2c-0.832-0.434-4.959-1.878-5.036-1.968l-3.151,2.619-3.386-2.721c-0.094,0.139-4.171,1.568-5.116,2.069-1.08,0.573-2.844,1.892-2.844,4.86h22.38c0-2.97-2.01-4.43-2.84-4.86z" fill="url(#SVGID_16)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="30.22" x2="30.22" y1="44.68" y2="48.73">
@@ -98,166 +99,167 @@
 </linearGradient>
 <polygon fill="url(#SVGID_17)" points="26.19,45.47,30.35,48.78,34.25,45.54,33.5,45.23,30.35,47.85,26.96,45.13"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18" x1="19.6" x2="26.39" y1="48.84" y2="48.84">
-<stop offset="0" stop-color="#85EFFF"/>
-<stop offset="1" stop-color="#3BA1D9"/>
+<stop offset="0" stop-color="#AADAC6"/>
+<stop offset="1" stop-color="#6A99AA"/>
 </linearGradient>
 <path d="M26.39,45.99s-5.931,1.549-5.931,5.703h-0.854c-0.01-2.55,1.99-4.54,6.78-5.7z" fill="url(#SVGID_18)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19" x1="33.92" x2="40.7" y1="48.75" y2="48.75">
-<stop offset="0" stop-color="#85EFFF"/>
-<stop offset="1" stop-color="#3BA1D9"/>
+<stop offset="0" stop-color="#AADAC6"/>
+<stop offset="1" stop-color="#6A99AA"/>
 </linearGradient>
 <path d="M33.92,45.9s5.932,1.549,5.932,5.704h0.854c0-2.56-1.99-4.54-6.78-5.7z" fill="url(#SVGID_19)"/>
 <polygon fill="#020202" fill-opacity="0.3" points="30.35,48.78,26.19,45.47,25.95,45.57,30.35,49.08,34.5,45.63,34.25,45.53" stroke-opacity="0.3"/>
 <radialGradient cx="30.12" cy="33.65" gradientUnits="userSpaceOnUse" id="SVGID_20" r="11.29">
-<stop offset="0" stop-color="#FFE2D9"/>
-<stop offset="0.51" stop-color="#FFC6B3"/>
-<stop offset="0.76" stop-color="#FFA98E"/>
-<stop offset="1" stop-color="#E88160"/>
+<stop offset="0" stop-color="#F4EDE4"/>
+<stop offset="0.51" stop-color="#E8D9CA"/>
+<stop offset="0.76" stop-color="#DDC4B0"/>
+<stop offset="1" stop-color="#BF9C89"/>
 </radialGradient>
 <path d="M35.68,37.69c-0.028-0.014-0.062-0.016-0.089-0.024-0.006-0.002-0.011-0.004-0.016-0.004-0.045-0.013-0.088-0.021-0.133-0.025-5.527-0.961-8.062-4.021-8.253-3.211-0.152,0.645-1.702,2.039-2.513,2.736,0.006,0.031,0.01,0.059,0.017,0.09,0,0,0.03,0.143,0.089,0.385-0.063,0.008-0.126,0.021-0.188,0.047-0.517,0.217-0.679,1.063-0.362,1.891,0.316,0.827,0.991,1.322,1.508,1.104,0.032-0.014,0.059-0.036,0.089-0.056,0.3,0.676,0.668,1.397,1.119,2.123,0.755,0.898,1.914,1.951,3.192,1.951,1.547,0,2.493-0.846,3.144-1.698,0.016-0.036,0.033-0.069,0.053-0.099,0.482-0.753,0.873-1.51,1.188-2.213,0.505,0.175,1.153-0.294,1.476-1.089,0.33-0.81,0.18-1.67-0.33-1.9z" fill="url(#SVGID_20)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21" x1="28.2" x2="32.97" y1="45.22" y2="40.48">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<stop offset="0" stop-color="#E8D9CA"/>
+<stop offset="1" stop-color="#DDC4B0"/>
 </linearGradient>
 <path d="M29.92,44.27c-0.942,0-1.892-0.439-2.589-1.1,0.74,0.776,1.733,1.531,2.817,1.531,1.546,0,2.493-0.846,3.144-1.698,0.015-0.036,0.031-0.069,0.053-0.099,0.48-0.753,0.873-1.51,1.188-2.213-1.76,3.08-3.07,3.58-4.61,3.58z" fill="url(#SVGID_21)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22" x1="30.1" x2="30.1" y1="30.09" y2="37.12">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M29.99,29.99c-1.917,0-2.837,0.872-3.549,1.782-1.158,0.178-2.991,1.238-1.696,5.884,0.812-0.695,2.295-2.581,2.447-3.226,0.192-0.819,2.771,2.307,8.402,3.238,0.064-0.26,0.095-0.413,0.095-0.413,0.89-3.96-1.03-7.1-5.69-7.26z" fill="url(#SVGID_22)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23" x1="32.5" x2="26.13" y1="36.82" y2="33.04">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.36" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M27.2,34.05s2.756,3.62,8.355,3.614c-0.01,0-2.64-0.41-8.36-3.61z" fill="url(#SVGID_23)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24" x1="25.56" x2="25.61" y1="32.3" y2="36.35">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M26.53,32.04s-2.699,0.161-1.697,4.734c0.01,0.01-0.32-3.13,1.7-4.73z" fill="url(#SVGID_24)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25" x1="30.99" x2="30.79" y1="30.7" y2="32.53">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<stop offset="0" stop-color="#8D7B6A"/>
+<stop offset="1" stop-color="#451F1E"/>
 </linearGradient>
 <path d="M31.3,32.67c-1.257-0.179-3.381-1.292-4.215-0.895,0,0,2.726-3.11,7.539,0.432,0,0-1.15,0.77-3.32,0.46z" fill="url(#SVGID_25)"/>
 <rect fill="none" height="30" width="30" x="15.19" y="26.32"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26" x1="15.32" x2="15.32" y1="26.12" y2="11.07">
-<stop offset="0" stop-color="#A6A8AB"/>
-<stop offset="1" stop-color="#231F20"/>
+<stop offset="0" stop-color="#A8A9AA"/>
+<stop offset="1" stop-color="#222021"/>
 </linearGradient>
 <path d="M8.773,26.07h13.09v-0.487c0-2.907-2.152-4.174-2.584-4.4-0.426-0.222-1.75-0.714-2.816-1.11l-0.617-0.229-0.11-0.044-0.131-0.05-0.35-0.14c-0.162-0.295-0.171-0.922-0.052-1.201l-0.213-0.119,0.23,0.082c0.035-0.056,0.067-0.111,0.103-0.169l0.036-0.057c0.261-0.427,0.503-0.875,0.723-1.334,0.545-0.062,1.08-0.534,1.355-1.215,0.315-0.775,0.213-1.58-0.231-1.996,0.149-0.672,0.204-1.319,0.168-1.928-4.6,3.36-7.803,8.5-8.607,14.4z" fill="url(#SVGID_26)" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27" x1="15.21" x2="15.21" y1="11.48" y2="26.12">
-<stop offset="0" stop-color="#A9AAAD"/>
+<stop offset="0" stop-color="#AAABAC"/>
 <stop offset="1" stop-color="#000000"/>
 </linearGradient>
 <path d="M8.804,25.83h12.82v-0.243c0-2.767-2.043-3.971-2.453-4.184-0.413-0.214-1.73-0.704-2.788-1.097l-0.625-0.232-0.104-0.042-0.135-0.051-0.422-0.169c-0.264-0.363-0.259-1.148-0.111-1.5l0.01-0.018c0.007-0.019,0.016-0.036,0.025-0.05,0.034-0.055,0.068-0.109,0.099-0.165l0.036-0.057c0.281-0.459,0.542-0.944,0.773-1.443h0.038c0.488,0,0.99-0.43,1.25-1.071,0.302-0.746,0.177-1.508-0.277-1.809,0.021-0.092,0.033-0.144,0.033-0.144,0.132-0.592,0.182-1.162,0.166-1.704-4.41,3.3-7.494,8.27-8.336,13.97z" fill="url(#SVGID_27)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <radialGradient cx="12.38" cy="23.06" gradientUnits="userSpaceOnUse" id="SVGID_28" r="6.87">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.2" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<stop offset="0" stop-color="#DDC4B0"/>
+<stop offset="0.2" stop-color="#DDC4B0"/>
+<stop offset="0.96" stop-color="#A57665"/>
+<stop offset="1" stop-color="#A57665"/>
 </radialGradient>
 <path d="M15.17,19.94c-0.646-0.281-0.625-1.656-0.359-2.073,0.047-0.072,0.089-0.145,0.134-0.218h-5.398c0.043,0.073,0.087,0.146,0.133,0.218,0.266,0.417,0.287,1.792-0.359,2.073s3.003,2.725,3.003,2.725,3.5-2.44,2.85-2.72z" fill="url(#SVGID_28)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29" x1="12.24" x2="12.24" y1="19.68" y2="25.34">
-<stop offset="0" stop-color="#FF7236"/>
-<stop offset="1" stop-color="#BA1212"/>
+<stop offset="0" stop-color="#C39072"/>
+<stop offset="1" stop-color="#88444B"/>
 </linearGradient>
 <path d="M19.06,21.37c-0.68-0.354-4.047-1.533-4.111-1.606l-2.573,2.138-2.764-2.221c-0.077,0.113-3.406,1.28-4.176,1.689-0.881,0.469-2.321,1.543-2.321,3.967h18.27c0-2.42-1.65-3.61-2.32-3.97z" fill="url(#SVGID_29)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30" x1="12.27" x2="12.27" y1="19.31" y2="22.62">
-<stop offset="0" stop-color="#BC1C24"/>
-<stop offset="1" stop-color="#6B1C24"/>
+<stop offset="0" stop-color="#8C4C54"/>
+<stop offset="1" stop-color="#53343E"/>
 </linearGradient>
 <polygon fill="url(#SVGID_30)" points="8.978,19.96,12.37,22.66,15.56,20.02,14.94,19.77,12.37,21.9,9.608,19.68"/>
-<path d="M9.138,20.39s-4.842,1.264-4.842,4.655h-0.697c0-2.08,1.628-3.7,5.539-4.65z" fill="#FF7B56"/>
-<path d="M15.29,20.31s4.842,1.265,4.842,4.657h0.697c0-2.09-1.63-3.71-5.54-4.66z" fill="#FF7B56"/>
+<path d="M9.138,20.39s-4.842,1.264-4.842,4.655h-0.697c0-2.08,1.628-3.7,5.539-4.65z" fill="#CCA089"/>
+<path d="M15.29,20.31s4.842,1.265,4.842,4.657h0.697c0-2.09-1.63-3.71-5.54-4.66z" fill="#CCA089"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31" x1="12.27" x2="12.27" y1="22.91" y2="19.78">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<stop offset="0" stop-color="#DDC4B0"/>
+<stop offset="0.96" stop-color="#A57665"/>
+<stop offset="1" stop-color="#A57665"/>
 </linearGradient>
 <polygon fill="url(#SVGID_31)" points="12.37,22.66,8.978,19.96,8.78,20.04,12.37,22.91,15.76,20.09,15.56,20.01"/>
 <radialGradient cx="12.19" cy="10.32" gradientUnits="userSpaceOnUse" id="SVGID_32" r="9.22">
-<stop offset="0" stop-color="#FFE2D9"/>
-<stop offset="0.51" stop-color="#FFC6B3"/>
-<stop offset="0.76" stop-color="#FFA98E"/>
-<stop offset="1" stop-color="#E88160"/>
+<stop offset="0" stop-color="#F4EDE4"/>
+<stop offset="0.51" stop-color="#E8D9CA"/>
+<stop offset="0.76" stop-color="#DDC4B0"/>
+<stop offset="1" stop-color="#BF9C89"/>
 </radialGradient>
 <path d="M16.72,13.61c-0.023-0.012-0.049-0.013-0.072-0.021-0.005-0.001-0.009-0.002-0.013-0.003-0.036-0.01-0.071-0.018-0.108-0.02-4.511-0.784-6.582-3.283-6.737-2.621-0.124,0.526-1.39,1.665-2.051,2.232,0.005,0.026,0.008,0.048,0.013,0.074,0,0,0.024,0.116,0.074,0.315-0.052,0.006-0.104,0.016-0.154,0.038-0.422,0.178-0.553,0.869-0.295,1.543,0.258,0.675,0.809,1.08,1.231,0.902,0.026-0.012,0.048-0.03,0.072-0.045,0.244,0.551,0.546,1.141,0.914,1.733,0.617,0.733,1.563,1.593,2.605,1.593,1.263,0,2.035-0.69,2.567-1.387,0.012-0.029,0.026-0.056,0.042-0.08,0.394-0.615,0.713-1.232,0.971-1.807,0.413,0.143,0.941-0.241,1.204-0.889,0.28-0.65,0.16-1.35-0.26-1.54z" fill="url(#SVGID_32)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33" x1="10.61" x2="14.51" y1="19.76" y2="15.89">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<stop offset="0" stop-color="#E8D9CA"/>
+<stop offset="1" stop-color="#DDC4B0"/>
 </linearGradient>
 <path d="M12.02,18.98c-0.769,0-1.543-0.358-2.114-0.898,0.604,0.634,1.416,1.251,2.299,1.251,1.263,0,2.035-0.69,2.567-1.387,0.012-0.029,0.026-0.057,0.042-0.081,0.394-0.615,0.713-1.232,0.971-1.806-1.43,2.52-2.5,2.93-3.76,2.93z" fill="url(#SVGID_33)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34" x1="12.17" x2="12.17" y1="7.41" y2="13.15">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M12.08,7.325c-1.564,0-2.316,0.71-2.897,1.455-0.944,0.145-2.44,1.011-1.383,4.803,0.663-0.568,1.874-2.107,1.998-2.633,0.158-0.669,2.262,1.883,6.859,2.644,0.053-0.213,0.078-0.338,0.078-0.338,0.71-3.23-0.86-5.798-4.66-5.925z" fill="url(#SVGID_34)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35" x1="14.13" x2="8.93" y1="12.9" y2="9.81">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.36" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M9.799,10.64s2.25,2.954,6.821,2.949c0,0-2.15-0.34-6.821-2.95z" fill="url(#SVGID_35)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_36" x1="8.46" x2="8.51" y1="9.21" y2="12.51">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M9.258,8.999s-2.203,0.132-1.386,3.865c0,0-0.268-2.55,1.386-3.861z" fill="url(#SVGID_36)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_37" x1="12.9" x2="12.73" y1="7.9" y2="9.4">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<stop offset="0" stop-color="#8D7B6A"/>
+<stop offset="1" stop-color="#451F1E"/>
 </linearGradient>
 <path d="M13.14,9.516c-1.025-0.146-2.76-1.055-3.44-0.73,0,0,2.225-2.539,6.154,0.352,0.01,0-0.93,0.632-2.71,0.378z" fill="url(#SVGID_37)"/>
 <rect fill="none" height="24.49" width="24.49" y="4.333"/>
 <path d="M51.07,26.07h-13.09v-0.487c0-2.907,2.152-4.174,2.584-4.4,0.425-0.222,1.75-0.714,2.815-1.11l0.617-0.229,0.109-0.044,0.132-0.05,0.35-0.14c0.162-0.295,0.171-0.922,0.051-1.201l0.214-0.119-0.23,0.082c-0.034-0.056-0.067-0.111-0.103-0.169l-0.035-0.057c-0.262-0.427-0.504-0.875-0.724-1.334-0.545-0.062-1.079-0.534-1.354-1.215-0.315-0.775-0.213-1.58,0.23-1.996-0.148-0.672-0.203-1.319-0.167-1.928,4.59,3.36,7.8,8.5,8.6,14.4z" fill="url(#SVGID_26)" fill-opacity="0.2" stroke-opacity="0.2"/>
 <path d="M51.04,25.83h-12.82v-0.243c0-2.767,2.042-3.971,2.453-4.184,0.413-0.214,1.729-0.704,2.788-1.097l0.625-0.232,0.104-0.042,0.136-0.051,0.421-0.169c0.266-0.363,0.26-1.148,0.112-1.5l-0.01-0.018c-0.007-0.019-0.016-0.036-0.025-0.05-0.034-0.055-0.067-0.109-0.099-0.165l-0.037-0.057c-0.28-0.459-0.541-0.944-0.773-1.443h-0.037c-0.488,0-0.99-0.43-1.25-1.071-0.302-0.746-0.176-1.508,0.277-1.809-0.021-0.092-0.033-0.144-0.033-0.144-0.132-0.592-0.182-1.162-0.166-1.704,4.39,3.3,7.48,8.27,8.32,13.97z" fill="url(#SVGID_27)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <radialGradient cx="47.89" cy="23.06" gradientUnits="userSpaceOnUse" id="SVGID_40" r="6.87">
-<stop offset="0" stop-color="#FFA98E"/>
-<stop offset="0.2" stop-color="#FFA98E"/>
-<stop offset="0.96" stop-color="#D45D36"/>
-<stop offset="1" stop-color="#D45D36"/>
+<stop offset="0" stop-color="#DDC4B0"/>
+<stop offset="0.2" stop-color="#DDC4B0"/>
+<stop offset="0.96" stop-color="#A57665"/>
+<stop offset="1" stop-color="#A57665"/>
 </radialGradient>
 <path d="M50.68,19.94c-0.646-0.281-0.624-1.656-0.358-2.073,0.046-0.072,0.089-0.145,0.133-0.218h-5.4c0.044,0.073,0.087,0.146,0.133,0.218,0.267,0.417,0.287,1.792-0.358,2.073-0.646,0.281,3.003,2.725,3.003,2.725s3.51-2.44,2.86-2.72z" fill="url(#SVGID_40)"/>
 <path d="M54.56,21.37c-0.68-0.354-4.048-1.533-4.11-1.606l-2.574,2.138-2.764-2.221c-0.076,0.113-3.405,1.28-4.176,1.689-0.881,0.469-2.32,1.543-2.32,3.967h18.27c-0.01-2.42-1.65-3.61-2.33-3.97z" fill="url(#SVGID_29)"/>
 <polygon fill="url(#SVGID_30)" points="44.48,19.96,47.88,22.66,51.07,20.02,50.45,19.77,47.88,21.9,45.12,19.68"/>
-<path d="M44.65,20.39s-4.842,1.264-4.842,4.655h-0.697c0-2.08,1.62-3.7,5.54-4.65z" fill="#FF7B56"/>
-<path d="M50.8,20.31s4.842,1.265,4.842,4.657h0.697c-0.01-2.09-1.64-3.71-5.54-4.66z" fill="#FF7B56"/>
+<path d="M44.65,20.39s-4.842,1.264-4.842,4.655h-0.697c0-2.08,1.62-3.7,5.54-4.65z" fill="#CCA089"/>
+<path d="M50.8,20.31s4.842,1.265,4.842,4.657h0.697c-0.01-2.09-1.64-3.71-5.54-4.66z" fill="#CCA089"/>
 <polygon fill="url(#SVGID_31)" points="47.88,22.66,44.48,19.96,44.29,20.04,47.88,22.91,51.27,20.09,51.07,20.01"/>
 <radialGradient cx="47.7" cy="10.32" gradientUnits="userSpaceOnUse" id="SVGID_44" r="9.22">
-<stop offset="0" stop-color="#FFE2D9"/>
-<stop offset="0.51" stop-color="#FFC6B3"/>
-<stop offset="0.76" stop-color="#FFA98E"/>
-<stop offset="1" stop-color="#E88160"/>
+<stop offset="0" stop-color="#F4EDE4"/>
+<stop offset="0.51" stop-color="#E8D9CA"/>
+<stop offset="0.76" stop-color="#DDC4B0"/>
+<stop offset="1" stop-color="#BF9C89"/>
 </radialGradient>
 <path d="M52.23,13.61c-0.022-0.012-0.049-0.013-0.071-0.021-0.005-0.001-0.01-0.002-0.014-0.003-0.035-0.01-0.07-0.018-0.108-0.02-4.511-0.784-6.581-3.283-6.736-2.621-0.124,0.526-1.39,1.665-2.052,2.232,0.006,0.026,0.009,0.048,0.014,0.074,0,0,0.023,0.116,0.073,0.315-0.052,0.006-0.104,0.016-0.153,0.038-0.422,0.178-0.554,0.869-0.295,1.543,0.258,0.675,0.809,1.08,1.23,0.902,0.025-0.012,0.048-0.03,0.072-0.045,0.244,0.551,0.546,1.141,0.914,1.733,0.617,0.733,1.563,1.593,2.605,1.593,1.263,0,2.035-0.69,2.566-1.387,0.012-0.029,0.026-0.056,0.042-0.08,0.394-0.615,0.712-1.232,0.971-1.807,0.413,0.143,0.94-0.241,1.204-0.889,0.29-0.65,0.17-1.35-0.25-1.54z" fill="url(#SVGID_44)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_45" x1="46.12" x2="50.02" y1="19.76" y2="15.89">
-<stop offset="0" stop-color="#FFC6B3"/>
-<stop offset="1" stop-color="#FFA98E"/>
+<stop offset="0" stop-color="#E8D9CA"/>
+<stop offset="1" stop-color="#DDC4B0"/>
 </linearGradient>
 <path d="M47.52,18.98c-0.769,0-1.543-0.358-2.113-0.898,0.604,0.634,1.416,1.251,2.299,1.251,1.264,0,2.035-0.69,2.567-1.387,0.013-0.029,0.026-0.057,0.042-0.081,0.393-0.615,0.712-1.232,0.971-1.806-1.43,2.52-2.5,2.93-3.77,2.93z" fill="url(#SVGID_45)"/>
 <path d="M47.58,7.325c-1.563,0-2.315,0.71-2.896,1.455-0.944,0.145-2.441,1.011-1.383,4.803,0.662-0.568,1.873-2.107,1.998-2.633,0.156-0.669,2.261,1.883,6.857,2.644,0.054-0.213,0.078-0.338,0.078-0.338,0.72-3.23-0.85-5.798-4.66-5.925z" fill="url(#SVGID_34)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_47" x1="49.64" x2="44.44" y1="12.9" y2="9.81">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.36" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.36" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M45.31,10.64s2.25,2.954,6.822,2.949c0,0-2.15-0.34-6.82-2.95z" fill="url(#SVGID_47)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_48" x1="43.97" x2="44.01" y1="9.21" y2="12.51">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+<stop offset="0" stop-color="#725B53"/>
+<stop offset="0.38" stop-color="#451F1E"/>
+<stop offset="1" stop-color="#261013"/>
 </linearGradient>
 <path d="M44.77,8.999s-2.203,0.132-1.386,3.865c0,0-0.27-2.55,1.39-3.861z" fill="url(#SVGID_48)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_49" x1="48.4" x2="48.24" y1="7.9" y2="9.4">
-<stop offset="0" stop-color="#A87C4F"/>
-<stop offset="1" stop-color="#632F00"/>
+<stop offset="0" stop-color="#8D7B6A"/>
+<stop offset="1" stop-color="#451F1E"/>
 </linearGradient>
 <path d="M48.65,9.516c-1.025-0.146-2.761-1.055-3.439-0.73,0,0,2.225-2.539,6.153,0.352,0,0-0.93,0.632-2.71,0.378z" fill="url(#SVGID_49)"/>
 <rect fill="none" height="24.49" width="24.49" x="35.51" y="4.333"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_speaker.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_speaker.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_speaker.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,38 +4,38 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="2" y2="57.9149">
-<stop offset="0" style="stop-color:#F0AB62"/>
-<stop offset="1" style="stop-color:#5C2B0F"/>
+<stop offset="0" style="stop-color:#C5AE8D"/>
+<stop offset="1" style="stop-color:#452627"/>
 </linearGradient>
 <path d="M52.459,55.62c0,1.314-1.065,2.38-2.38,2.38H9.92c-1.314,0-2.38-1.065-2.38-2.38V4.38  C7.54,3.065,8.605,2,9.92,2h40.159c1.314,0,2.38,1.065,2.38,2.38V55.62z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="3.1904" y2="56.7281">
-<stop offset="0" style="stop-color:#F0CEAA"/>
-<stop offset="0.6364" style="stop-color:#AF733E"/>
-<stop offset="1" style="stop-color:#C18C5B"/>
+<stop offset="0" style="stop-color:#DBD2BF"/>
+<stop offset="0.6364" style="stop-color:#8D7360"/>
+<stop offset="1" style="stop-color:#A28E7A"/>
 </linearGradient>
 <path d="M9.92,56.81c-0.656,0-1.189-0.533-1.189-1.189V4.38c0-0.656,0.533-1.189,1.189-1.189h40.159  c0.657,0,1.19,0.533,1.19,1.189v51.24c0,0.656-0.533,1.189-1.19,1.189H9.92z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.999" x2="29.999" y1="4.3799" y2="55.5422">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="0.7515" style="stop-color:#8A4117"/>
-<stop offset="1" style="stop-color:#B7763E"/>
+<stop offset="0" style="stop-color:#AF987C"/>
+<stop offset="0.7515" style="stop-color:#673F3A"/>
+<stop offset="1" style="stop-color:#937762"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="51.24" width="40.159" x="9.92" y="4.38"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="41.4912" y2="7.5526">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="1" style="stop-color:#702200"/>
+<stop offset="0" style="stop-color:#AF987C"/>
+<stop offset="1" style="stop-color:#4E2224"/>
 </linearGradient>
 <circle cx="30" cy="24.702" fill="url(#SVGID_4_)" r="17.02"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="8.8267" y2="40.4868">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.4" style="stop-color:#D3D6D7"/>
-<stop offset="0.7939" style="stop-color:#959EA2"/>
-<stop offset="1" style="stop-color:#C9CDCF"/>
+<stop offset="0.4" style="stop-color:#D4D6D5"/>
+<stop offset="0.7939" style="stop-color:#999E9E"/>
+<stop offset="1" style="stop-color:#CBCDCC"/>
 </linearGradient>
 <path d="M29.998,40.532c-8.728,0-15.828-7.101-15.828-15.83c0-8.729,7.101-15.83,15.828-15.83  c8.729,0,15.832,7.102,15.832,15.83C45.83,33.432,38.728,40.532,29.998,40.532L29.998,40.532z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="29.9971" x2="29.9971" y1="10.4238" y2="38.8273">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.297" style="stop-color:#E4E5E6"/>
-<stop offset="0.6424" style="stop-color:#949DA1"/>
+<stop offset="0.297" style="stop-color:#E5E5E5"/>
+<stop offset="0.6424" style="stop-color:#989D9D"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M29.998,38.983c-7.873,0-14.279-6.407-14.279-14.281s6.406-14.278,14.279-14.278  s14.278,6.404,14.278,14.278S37.871,38.983,29.998,38.983L29.998,38.983z" fill="url(#SVGID_6_)"/>
@@ -53,8 +53,8 @@
 <circle cx="29.998" cy="24.702" fill="url(#SVGID_8_)" r="6.607"/>
 <path d="M29.998,30.444c-3.166,0-5.742-2.575-5.742-5.742c0-3.165,2.576-5.741,5.742-5.741  s5.74,2.576,5.74,5.741C35.738,27.869,33.164,30.444,29.998,30.444L29.998,30.444z M29.998,20.059c-2.563,0-4.645,2.084-4.645,4.644  c0,2.562,2.082,4.644,4.645,4.644c2.561,0,4.643-2.082,4.643-4.644C34.641,22.143,32.559,20.059,29.998,20.059L29.998,20.059z" fill="#EBEBEB" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="45.7656" x2="45.7656" y1="54.8813" y2="50.5181">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="1" style="stop-color:#702200"/>
+<stop offset="0" style="stop-color:#AF987C"/>
+<stop offset="1" style="stop-color:#4E2224"/>
 </linearGradient>
 <circle cx="45.766" cy="52.715" fill="url(#SVGID_9_)" r="2.38"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="45.7656" x2="45.7656" y1="53.7988" y2="51.6172">
@@ -63,8 +63,8 @@
 </linearGradient>
 <path d="M45.766,53.905c-0.656,0-1.189-0.533-1.189-1.19c0-0.656,0.533-1.189,1.189-1.189  s1.189,0.533,1.189,1.189C46.955,53.372,46.422,53.905,45.766,53.905L45.766,53.905z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="13.7373" x2="13.7373" y1="54.8813" y2="50.5181">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="1" style="stop-color:#702200"/>
+<stop offset="0" style="stop-color:#AF987C"/>
+<stop offset="1" style="stop-color:#4E2224"/>
 </linearGradient>
 <circle cx="13.737" cy="52.715" fill="url(#SVGID_11_)" r="2.38"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="13.7373" x2="13.7373" y1="53.7988" y2="51.6172">
@@ -73,8 +73,8 @@
 </linearGradient>
 <path d="M13.737,53.905c-0.657,0-1.19-0.533-1.19-1.19c0-0.656,0.533-1.189,1.19-1.189  c0.656,0,1.189,0.533,1.189,1.189C14.927,53.372,14.394,53.905,13.737,53.905L13.737,53.905z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="45.7656" x2="45.7656" y1="9.9624" y2="5.5991">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="1" style="stop-color:#702200"/>
+<stop offset="0" style="stop-color:#AF987C"/>
+<stop offset="1" style="stop-color:#4E2224"/>
 </linearGradient>
 <circle cx="45.766" cy="7.796" fill="url(#SVGID_13_)" r="2.38"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="45.7656" x2="45.7656" y1="8.8799" y2="6.6982">
@@ -83,8 +83,8 @@
 </linearGradient>
 <path d="M45.766,8.986c-0.656,0-1.189-0.533-1.189-1.19c0-0.656,0.533-1.189,1.189-1.189  s1.189,0.533,1.189,1.189C46.955,8.453,46.422,8.986,45.766,8.986L45.766,8.986z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="13.7373" x2="13.7373" y1="9.9624" y2="5.5991">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="1" style="stop-color:#702200"/>
+<stop offset="0" style="stop-color:#AF987C"/>
+<stop offset="1" style="stop-color:#4E2224"/>
 </linearGradient>
 <circle cx="13.737" cy="7.796" fill="url(#SVGID_15_)" r="2.38"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="13.7373" x2="13.7373" y1="8.8799" y2="6.6982">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_stereo.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_stereo.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_stereo.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,15 +5,15 @@
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.3877" x2="30.3877" y1="2.6484" y2="33.7566">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.5879" style="stop-color:#B4BABD"/>
+<stop offset="0.5879" style="stop-color:#B7BABA"/>
 <stop offset="1" style="stop-color:#F2F2F2"/>
 </linearGradient>
 <path d="M50.762,34.911c-0.035-1.49-0.029-3.037-0.025-4.611c0.025-8.141,3.977-23.862-19.914-23.862  S9.998,17.496,9.883,31.411c-0.012,1.19-0.021,2.362-0.049,3.5l-4.436-0.1c0.027-1.118,0.035-2.269,0.047-3.438  C5.559,17.572,2.43,2,30.822,2c28.391,0,24.379,19.689,24.352,28.313c-0.004,1.536-0.008,3.044,0.023,4.498L50.762,34.911  L50.762,34.911z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.3916" x2="30.3916" y1="3.1812" y2="33.2296">
-<stop offset="0" style="stop-color:#9DA5A8"/>
-<stop offset="0.3636" style="stop-color:#C9CDCE"/>
-<stop offset="0.7455" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#D3D6D7"/>
+<stop offset="0" style="stop-color:#A0A5A5"/>
+<stop offset="0.3636" style="stop-color:#CBCDCC"/>
+<stop offset="0.7455" style="stop-color:#989D9D"/>
+<stop offset="1" style="stop-color:#D4D6D5"/>
 </linearGradient>
 <path d="M51.297,33.784c-0.012-1.138-0.01-2.303-0.006-3.483c0.004-0.937,0.055-1.977,0.109-3.084  c0.26-5.216,0.582-11.705-3.648-16.153c-3.271-3.438-8.967-5.181-16.93-5.181c-8.865,0-14.729,1.577-17.924,4.823  c-3.801,3.862-3.709,9.713-3.604,16.488c0.021,1.38,0.045,2.787,0.033,4.211l-0.035,2.939l-3.33-0.075l0.01-0.553  C5.986,32.95,5.992,32.168,6,31.379c0.01-1.362-0.008-2.726-0.027-4.077c-0.104-7.34-0.201-14.272,4.461-19.001  c3.813-3.866,10.482-5.746,20.389-5.746c8.961,0,15.471,2.06,19.35,6.124c5.16,5.402,4.803,13.116,4.543,18.748  c-0.049,1.051-0.094,2.022-0.096,2.884l-0.002,0.512c-0.002,0.98-0.004,1.949,0.008,2.898l0.008,0.549l-3.328,0.075L51.297,33.784z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="18.6035" x2="18.6035" y1="29.2012" y2="56.9375">
@@ -26,10 +26,10 @@
 <path d="M22.07,53.608c0,1.831-1.496,3.329-3.328,3.329h-3.605V29.201h3.605c1.832,0,3.328,1.497,3.328,3.329  V53.608z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="7.4629" x2="7.4629" y1="33.2002" y2="52.9385">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.1455" style="stop-color:#959EA2"/>
+<stop offset="0.1455" style="stop-color:#999E9E"/>
 <stop offset="0.3697" style="stop-color:#F2F2F2"/>
-<stop offset="0.7576" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#D3D6D7"/>
+<stop offset="0.7576" style="stop-color:#989D9D"/>
+<stop offset="1" style="stop-color:#D4D6D5"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="19.738" width="6.473" x="4.227" y="33.2"/>
 <rect fill="#FFFFFF" fill-opacity="0.35" height="19.738" stroke-opacity="0.35" width="1.109" x="4.227" y="33.2"/>
@@ -45,10 +45,10 @@
 <rect fill="#FFFFFF" fill-opacity="0.15" height="29.861" stroke-opacity="0.15" width="1.109" x="15.137" y="28.139"/>
 <rect fill-opacity="0.5" height="19.738" stroke-opacity="0.5" width="1.387" x="9.313" y="33.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11.6699" x2="11.6699" y1="28.1387" y2="58">
-<stop offset="0" style="stop-color:#CAD0D4"/>
-<stop offset="0.1273" style="stop-color:#99A1A5"/>
+<stop offset="0" style="stop-color:#CDD1D0"/>
+<stop offset="0.1273" style="stop-color:#9DA1A1"/>
 <stop offset="0.2848" style="stop-color:#F2F2F2"/>
-<stop offset="0.6485" style="stop-color:#949DA1"/>
+<stop offset="0.6485" style="stop-color:#989D9D"/>
 <stop offset="1" style="stop-color:#F2F2F2"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="10.422,30.357 10.422,55.781 12.918,58 12.918,28.139 "/>
@@ -62,10 +62,10 @@
 <path d="M37.926,53.608c0,1.831,1.498,3.329,3.328,3.329h3.605V29.201h-3.605  c-1.83,0-3.328,1.497-3.328,3.329V53.608z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -43.916 0)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-96.4502" x2="-96.4502" y1="33.2002" y2="52.9385">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.1455" style="stop-color:#959EA2"/>
+<stop offset="0.1455" style="stop-color:#999E9E"/>
 <stop offset="0.3697" style="stop-color:#F2F2F2"/>
-<stop offset="0.7576" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#D3D6D7"/>
+<stop offset="0.7576" style="stop-color:#989D9D"/>
+<stop offset="1" style="stop-color:#D4D6D5"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="19.738" width="6.471" x="49.299" y="33.2"/>
 <rect fill="#FFFFFF" fill-opacity="0.35" height="19.738" stroke-opacity="0.35" width="1.109" x="54.66" y="33.2"/>
@@ -81,10 +81,10 @@
 <rect fill="#FFFFFF" fill-opacity="0.15" height="29.861" stroke-opacity="0.15" width="1.109" x="43.752" y="28.139"/>
 <rect fill-opacity="0.5" height="19.738" stroke-opacity="0.5" width="1.387" x="49.299" y="33.2"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -43.916 0)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-92.2441" x2="-92.2441" y1="28.1387" y2="58">
-<stop offset="0" style="stop-color:#CAD0D4"/>
-<stop offset="0.1273" style="stop-color:#99A1A5"/>
+<stop offset="0" style="stop-color:#CDD1D0"/>
+<stop offset="0.1273" style="stop-color:#9DA1A1"/>
 <stop offset="0.2848" style="stop-color:#F2F2F2"/>
-<stop offset="0.6485" style="stop-color:#949DA1"/>
+<stop offset="0.6485" style="stop-color:#989D9D"/>
 <stop offset="1" style="stop-color:#F2F2F2"/>
 </linearGradient>
 <polygon fill="url(#SVGID_10_)" points="49.576,30.357 49.576,55.781 47.08,58 47.08,28.139 "/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sync.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sync.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sync.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,56 +3,56 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="26.2671" x2="26.2671" y1="6.1377" y2="31.7569">
-<stop offset="0" style="stop-color:#A6A8AB"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M13.69,40.243c-0.309-0.211-7.56-5.245-7.252-12.086  c0.198-4.412,3.463-8.415,9.705-11.898c1.036-0.577,2.176-1.153,3.391-1.711l0.326-0.148c0.21-0.095,0.425-0.189,0.64-0.283  c0.187-0.083,0.378-0.165,0.573-0.248l0.557-0.234c0.256-0.105,1.223-0.493,1.223-0.493c0.176-0.069,0.352-0.138,0.53-0.206V6.081  l22.723,11.33L23.382,28.74v-5.978c-5.189,1.273-8.968,3.829-10.175,6.915c-1.018,2.598-0.306,5.583,2.117,8.872l0.299,0.406  l-1.516,1.572L13.69,40.243z" fill="url(#SVGID_1_)" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="25.896" x2="25.896" y1="7.0449" y2="37.3736">
-<stop offset="0" style="stop-color:#A9AAAD"/>
+<stop offset="0" style="stop-color:#AAABAC"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M14.028,39.75c-0.298-0.204-7.287-5.049-6.994-11.566  c0.188-4.191,3.351-8.028,9.4-11.404c1.028-0.573,2.151-1.14,3.349-1.689l0.324-0.148c0.206-0.093,0.418-0.186,0.63-0.278  c0.188-0.082,0.376-0.164,0.568-0.245l0.555-0.234c0.25-0.104,1.213-0.489,1.213-0.489c0.297-0.117,0.599-0.233,0.905-0.349V7.045  l20.789,10.366L23.979,27.776v-5.764c-5.772,1.253-9.982,4.009-11.328,7.448c-1.097,2.802-0.358,5.979,2.193,9.443L14.028,39.75z" fill="url(#SVGID_2_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="33.7334" x2="33.7334" y1="19.688" y2="51.9872">
-<stop offset="0" style="stop-color:#A6A8AB"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M13.896,42.589L36.616,31.26v5.978  c5.19-1.273,8.968-3.829,10.177-6.914c1.017-2.598,0.304-5.583-2.119-8.873l-0.299-0.405l1.517-1.573l0.417,0.284  c0.309,0.211,7.561,5.245,7.253,12.087c-0.198,4.412-3.464,8.415-9.706,11.898l-0.138,0.076c-1.002,0.555-2.102,1.106-3.271,1.641  l-0.303,0.14c-0.216,0.097-0.434,0.193-0.65,0.288l-0.559,0.241l-0.571,0.239c-0.253,0.105-0.508,0.209-0.767,0.312l-0.455,0.182  c-0.174,0.069-0.35,0.137-0.526,0.205v6.855L13.896,42.589z" fill="url(#SVGID_3_)" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="34.1035" x2="34.1035" y1="20.4546" y2="51.1212">
-<stop offset="0" style="stop-color:#A9AAAD"/>
+<stop offset="0" style="stop-color:#AAABAC"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M15.234,42.589L36.02,32.224v5.764  c5.773-1.253,9.982-4.009,11.328-7.447c1.098-2.802,0.359-5.979-2.192-9.444l0.815-0.847c0.299,0.204,7.287,5.049,6.994,11.567  c-0.188,4.191-3.351,8.028-9.4,11.404l-0.137,0.076c-0.989,0.547-2.074,1.092-3.229,1.62l-0.304,0.14  c-0.21,0.095-0.426,0.189-0.64,0.283l-0.557,0.24l-0.565,0.237c-0.247,0.103-0.501,0.205-0.756,0.307l-0.457,0.182  c-0.294,0.116-0.595,0.232-0.901,0.348v6.302L15.234,42.589z" fill="url(#SVGID_4_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="34.873" x2="34.873" y1="23.2422" y2="46.511">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M18.001,41.993l16.783-8.368v5.271l0.76-0.146c6.556-1.256,11.398-4.38,12.956-8.356  c0.856-2.191,0.736-4.618-0.332-7.152c1.892,2.029,3.939,5.081,3.521,8.503c-0.614,4.992-6.161,9.466-16.488,13.298l-0.416,0.156  v5.161L18.001,41.993z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30.0327" x2="30.0327" y1="51.4287" y2="42.0396">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="1" style="stop-color:#66A00E"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="1" style="stop-color:#3C743A"/>
 </linearGradient>
 <path d="M16.792,42.103l18.631,9.291v-5.75c3.122-1.16,5.709-2.345,7.851-3.541H16.792z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="25.127" x2="25.127" y1="36.3267" y2="9.0388">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.5" style="stop-color:#30A4D5"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.5" style="stop-color:#6292A3"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <path d="M11.831,35.564c-1.891-2.029-3.939-5.082-3.519-8.502c0.613-4.993,6.16-9.467,16.486-13.299  l0.417-0.154V8.445l16.782,8.369l-16.782,8.367v-5.271l-0.759,0.145C17.9,21.313,13.057,24.437,11.5,28.412  C10.643,30.603,10.762,33.03,11.831,35.564L11.831,35.564z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="29.9663" x2="29.9663" y1="8.4697" y2="15.2044">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="1" style="stop-color:#30A4D5"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="1" style="stop-color:#6292A3"/>
 </linearGradient>
 <path d="M43.207,16.703l-18.631-9.29v5.75c-3.122,1.159-5.709,2.345-7.85,3.54H43.207z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="25.5229" x2="25.5229" y1="8.0708" y2="27.6391">
-<stop offset="0" style="stop-color:#93E1FF"/>
-<stop offset="0.0061" style="stop-color:#93E1FF"/>
-<stop offset="1" style="stop-color:#1185BF"/>
+<stop offset="0" style="stop-color:#B3DFCE"/>
+<stop offset="0.0061" style="stop-color:#B3DFCE"/>
+<stop offset="1" style="stop-color:#45698B"/>
 </linearGradient>
 <path d="M25.215,8.445l16.782,8.369l-16.782,8.367v-4.498v-0.773l-0.759,0.145  C17.9,21.313,13.058,24.437,11.5,28.412c-0.858,2.193-0.738,4.624,0.335,7.161c-1.892-2.025-3.943-5.077-3.523-8.507  c0.61-4.994,6.158-9.469,16.487-13.303l0.417-0.154v-0.445V8.445 M24.576,7.413v5.75C-6.247,24.602,14.364,38.659,14.364,38.659  c-7.105-9.643,0.429-16.1,10.212-17.976v5.531l18.854-9.4L24.576,7.413L24.576,7.413z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="34.4766" x2="34.4766" y1="29.8569" y2="51.3697">
-<stop offset="0" style="stop-color:#C5FE45"/>
-<stop offset="1" style="stop-color:#4B8B00"/>
+<stop offset="0" style="stop-color:#B3C77C"/>
+<stop offset="1" style="stop-color:#2A6138"/>
 </linearGradient>
 <path d="M45.635,20.146c7.105,9.644-0.428,16.101-10.212,17.977v-5.531l-18.854,9.401l18.854,9.401v-5.75  C66.247,34.204,45.635,20.146,45.635,20.146z M35.2,45.043l-0.416,0.156v0.444v4.717l-16.783-8.368l16.783-8.368v4.498v0.773  l0.76-0.146c6.556-1.256,11.399-4.38,12.956-8.356c0.856-2.191,0.736-4.618-0.332-7.152c1.892,2.029,3.94,5.081,3.521,8.503  C51.074,36.737,45.527,41.211,35.2,45.043z" fill="url(#SVGID_10_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_text.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_text.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_text.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,9 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20.6719" x2="23.6638" y1="61.0908" y2="51.1174">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="0.7455" style="stop-color:#ADB2B5"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+<stop offset="0" style="stop-color:#E7E8E7"/>
+<stop offset="0.7455" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="53" width="51.291" x="4.354" y="3.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="3.0728" y2="54.3628">
@@ -15,16 +15,16 @@
 </linearGradient>
 <path d="M55.645,54.79h-26.5c0,0-13.249-0.381-20.089-3.347c-4.56-1.975-4.702-4.181-4.702-4.181V3.5h51.291  V54.79z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.999" x2="29.999" y1="3.0728" y2="54.3628">
-<stop offset="0" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+<stop offset="0" style="stop-color:#E7EBE8"/>
+<stop offset="0.703" style="stop-color:#919595"/>
+<stop offset="1" style="stop-color:#B9BDBC"/>
 </linearGradient>
 <path d="M4.354,3.5v43.763c0,0,0.048,0.672,0.855,1.611V4.356h49.58v49.582H19.324  c5.195,0.719,9.82,0.852,9.82,0.852h26.5V3.5H4.354z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="18.7158" x2="16.7993" y1="47.938" y2="54.272">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.1939" style="stop-color:#E6E9E8"/>
-<stop offset="0.9333" style="stop-color:#84878A"/>
-<stop offset="1" style="stop-color:#84878A"/>
+<stop offset="0.1939" style="stop-color:#E7E8E7"/>
+<stop offset="0.9333" style="stop-color:#868788"/>
+<stop offset="1" style="stop-color:#868788"/>
 </linearGradient>
 <path d="M31.211,54.79c0,0-12.406,0.569-17.906-8.515  c0,0-7.511,5.564-8.951,0.987C4.967,50.406,10.504,54.903,31.211,54.79z" fill="url(#SVGID_4_)" fill-rule="evenodd"/>
 <rect fill="#F5F5F5" height="0.855" width="42.741" x="8.628" y="39.55"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tip.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tip.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tip.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,22 +3,22 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="29.7026" cy="11.6152" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="38.4093">
-<stop offset="0" style="stop-color:#FFE36A"/>
-<stop offset="0.0727" style="stop-color:#FFE36A"/>
-<stop offset="0.5152" style="stop-color:#FCB432"/>
-<stop offset="0.703" style="stop-color:#F98A00"/>
-<stop offset="1" style="stop-color:#FCBC3C"/>
+<stop offset="0" style="stop-color:#D2C997"/>
+<stop offset="0.0727" style="stop-color:#D2C997"/>
+<stop offset="0.5152" style="stop-color:#BFA56F"/>
+<stop offset="0.703" style="stop-color:#AE804B"/>
+<stop offset="1" style="stop-color:#C2AC76"/>
 </radialGradient>
 <path d="M30,1C13.868,1,6.945,12.993,8.949,25.372c2.001,12.363,9.413,24.197,21.011,24.367v0.004  c0.015,0,0.026-0.002,0.041-0.002c0.016,0,0.027,0.002,0.041,0.002v-0.004c11.598-0.17,19.01-12.004,21.012-24.367  C53.057,12.993,46.133,1,30,1z" fill="url(#SVGID_1_)"/>
 <path d="M29.794,43.146c-2.909,0-9.646-0.137-14.811-2.203c3,4.275,6.97,7.426,11.806,8.443  c0.037,0.008,0.074,0.014,0.11,0.021c0.284,0.057,0.57,0.107,0.859,0.15c0.239,0.035,0.481,0.061,0.725,0.086  c0.113,0.012,0.226,0.027,0.34,0.037c0.386,0.031,0.776,0.051,1.171,0.057v0.002c0.044,0,0.085-0.004,0.128-0.006  c0.051,0,0.1-0.006,0.15-0.006c0.342-0.01,0.68-0.031,1.014-0.059c0.23-0.021,0.457-0.047,0.684-0.076  c0.094-0.012,0.186-0.023,0.279-0.035c5.588-0.83,10.082-4.459,13.328-9.445C40.303,42.723,32.951,43.146,29.794,43.146z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="17.9624" x2="42.0391" y1="51.7617" y2="51.7617">
-<stop offset="0" style="stop-color:#A0A8AC"/>
-<stop offset="0.1212" style="stop-color:#BDC3C4"/>
-<stop offset="0.2848" style="stop-color:#E9EFF2"/>
-<stop offset="0.6727" style="stop-color:#949DA1"/>
-<stop offset="0.8182" style="stop-color:#D9DFE1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#A4A8A8"/>
+<stop offset="0.1212" style="stop-color:#BFC2C1"/>
+<stop offset="0.2848" style="stop-color:#ECEFED"/>
+<stop offset="0.6727" style="stop-color:#989D9D"/>
+<stop offset="0.8182" style="stop-color:#DBDFDD"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="17.962,44.523 17.962,56.377 21.099,59 38.9,59 42.039,56.377 42.039,44.523 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="42.0391" x2="17.9629" y1="57.54" y2="57.54">
@@ -30,7 +30,7 @@
 <polygon fill="url(#SVGID_3_)" points="17.962,56.377 21.099,59 38.9,59 42.039,56.377 42.039,56.08 17.962,56.08 "/>
 <radialGradient cx="29.5933" cy="3.4521" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="18.3714">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#FAD384"/>
+<stop offset="1" style="stop-color:#D7CBA7"/>
 </radialGradient>
 <path d="M48.678,14.315c-0.715-2.025-1.75-3.873-3.094-5.452  C42.072,4.738,36.684,2.557,30,2.557c-6.683,0-12.072,2.182-15.583,6.307c-1.344,1.58-2.38,3.427-3.094,5.451  C17.357,14.959,23.618,15.31,30,15.31C36.381,15.312,42.643,14.961,48.678,14.315z" fill="url(#SVGID_4_)" fill-opacity="0.75" stroke-opacity="0.75"/>
 <rect fill-opacity="0.25" height="2.207" stroke-opacity="0.25" width="24.077" x="17.962" y="46.975"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_todo_alarm.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_todo_alarm.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_todo_alarm.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,19 +5,19 @@
 <rect fill="none" height="60" width="60"/>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="286.999" x2="286.999" y1="1645.4639" y2="1591.9688">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="1" style="stop-color:#702200"/>
+<stop offset="0" style="stop-color:#AF987C"/>
+<stop offset="1" style="stop-color:#4E2224"/>
 </linearGradient>
 <path d="M8.526,58c-1.246,0-2.261-1.013-2.261-2.259V6.766c0-1.248,1.015-2.261,2.261-2.261h42.947  c1.247,0,2.262,1.013,2.262,2.261v48.976c0,1.246-1.015,2.259-2.262,2.259H8.526z" fill="url(#SVGID_1_)"/>
 <path d="M51.473,4.505H8.526c-1.246,0-2.261,1.013-2.261,2.261V7.52  c0-1.248,1.015-2.262,2.261-2.262h42.947c1.247,0,2.262,1.014,2.262,2.262V6.766C53.735,5.518,52.72,4.505,51.473,4.505z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M51.473,57.246H8.526c-1.246,0-2.261-1.013-2.261-2.259v0.754  C6.265,56.987,7.28,58,8.526,58h42.947c1.247,0,2.262-1.013,2.262-2.259v-0.754C53.735,56.233,52.72,57.246,51.473,57.246z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="287" x2="287" y1="1641.8242" y2="1594.8197">
-<stop offset="0" style="stop-color:#707173"/>
+<stop offset="0" style="stop-color:#717172"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" fill-opacity="0.3" height="46.716" stroke-opacity="0.3" width="41.441" x="9.279" y="8.271"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="287" x2="287" y1="1641.0664" y2="1595.578">
-<stop offset="0" style="stop-color:#707173"/>
+<stop offset="0" style="stop-color:#717172"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" fill-opacity="0.6" height="45.209" stroke-opacity="0.6" width="39.934" x="10.033" y="9.025"/>
@@ -27,7 +27,7 @@
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="42.948" width="38.427" x="10.787" y="9.778"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="306.2607" x2="267.8748" y1="1619.4707" y2="1619.4707">
-<stop offset="0" style="stop-color:#8A8C8E"/>
+<stop offset="0" style="stop-color:#8B8C8D"/>
 <stop offset="1" style="stop-color:#4A4A4A"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="42.947" width="38.427" x="10.787" y="9.025"/>
@@ -48,13 +48,13 @@
 </linearGradient>
 <path d="M10.787,36.15c0,0.829,0.478,1.986,1.064,2.572l9.925,9.926c0.586,0.585,1.743,1.064,2.573,1.064  h24.864V9.025H10.787V36.15z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="286.999" x2="286.999" y1="1640.6797" y2="1600.1635">
-<stop offset="0" style="stop-color:#F0F0F2"/>
-<stop offset="1" style="stop-color:#B3B5B8"/>
+<stop offset="0" style="stop-color:#F1F1F1"/>
+<stop offset="1" style="stop-color:#B4B6B6"/>
 </linearGradient>
 <path d="M48.46,9.778v39.181H24.349c-0.626,0-1.599-0.401-2.04-0.846l-9.925-9.924  c-0.443-0.441-0.845-1.413-0.845-2.039V9.778H48.46 M49.213,9.025H10.787V36.15c0,0.829,0.478,1.986,1.064,2.572l9.925,9.926  c0.586,0.585,1.743,1.064,2.573,1.064h24.864V9.025L49.213,9.025z" fill="url(#SVGID_9_)"/>
-<polygon fill="#929497" points="25.856,23.028 46.199,23.028 46.199,21.521 25.856,21.521 "/>
-<polygon fill="#929497" points="25.856,31.93 46.199,31.93 46.199,30.422 25.856,30.422 "/>
-<polygon fill="#929497" points="16.815,40.55 46.199,40.55 46.199,39.797 46.199,39.043 16.815,39.043 "/>
+<polygon fill="#939595" points="25.856,23.028 46.199,23.028 46.199,21.521 25.856,21.521 "/>
+<polygon fill="#939595" points="25.856,31.93 46.199,31.93 46.199,30.422 25.856,30.422 "/>
+<polygon fill="#939595" points="16.815,40.55 46.199,40.55 46.199,39.797 46.199,39.043 16.815,39.043 "/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="279.4805" x2="273.8942" y1="1611.5459" y2="1605.9596">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.297" style="stop-color:#FFFFFF"/>
@@ -64,83 +64,83 @@
 </linearGradient>
 <path d="M12.177,39.047c-0.314-0.348-0.896-0.695-1.297-2.184c0,0,0.66,3.054,9.701,0.04  c0,12.81,3.768,12.81,3.768,12.81c-0.831,0-1.987-0.479-2.573-1.064L12.177,39.047z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="287.001" x2="287.001" y1="1642.542" y2="1638.8584">
-<stop offset="0" style="stop-color:#707173"/>
+<stop offset="0" style="stop-color:#717172"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M43.265,7.045c-0.107-0.35-0.512-0.637-0.9-0.637  h-5.741c-0.388,0-0.779-0.291-0.866-0.645l-0.189-0.748H24.433l-0.191,0.748c-0.088,0.355-0.477,0.645-0.865,0.645h-5.741  c-0.388,0-0.793,0.287-0.9,0.637l-1.024,3.361c-0.108,0.35,0.123,0.637,0.512,0.637h27.554c0.388,0,0.619-0.287,0.513-0.637  L43.265,7.045z" fill="url(#SVGID_11_)" fill-opacity="0.15" stroke-opacity="0.15"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="287.001" x2="287.001" y1="1641.7881" y2="1638.1045">
-<stop offset="0" style="stop-color:#707173"/>
+<stop offset="0" style="stop-color:#717172"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M43.265,7.8c-0.107-0.351-0.512-0.638-0.9-0.638h-5.741  c-0.388,0-0.779-0.291-0.866-0.645L35.568,5.77H24.433l-0.191,0.748c-0.088,0.355-0.477,0.645-0.865,0.645h-5.741  c-0.388,0-0.793,0.287-0.9,0.638l-1.024,3.359c-0.108,0.351,0.123,0.638,0.512,0.638h27.554c0.388,0,0.619-0.287,0.513-0.638  L43.265,7.8z" fill="url(#SVGID_12_)" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M44.822,12.55H15.178l-0.218,0.781  c-0.114,0.399,0.128,0.727,0.538,0.727h29.005c0.409,0,0.651-0.327,0.539-0.727L44.822,12.55z" fill="#6D6E70" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M44.822,12.55H15.178l-0.218,0.781  c-0.114,0.399,0.128,0.727,0.538,0.727h29.005c0.409,0,0.651-0.327,0.539-0.727L44.822,12.55z" fill="#6E6E6F" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="286.999" x2="286.999" y1="1647.4658" y2="1637.1558">
-<stop offset="0" style="stop-color:#747577"/>
-<stop offset="1" style="stop-color:#D5D7D9"/>
+<stop offset="0" style="stop-color:#757576"/>
+<stop offset="1" style="stop-color:#D6D8D7"/>
 </linearGradient>
 <path d="M43.964,8.753c-0.113-0.398-0.541-0.724-0.949-0.724h-6.043c-0.409,0-0.819-0.331-0.913-0.735  l-2.131-4.56C33.835,2.33,33.423,2,33.013,2h-6.027c-0.409,0-0.82,0.33-0.911,0.734l-2.133,4.56  c-0.094,0.404-0.504,0.735-0.913,0.735h-6.043c-0.41,0-0.836,0.325-0.949,0.724l-1.078,3.825c-0.113,0.398,0.128,0.726,0.539,0.726  h29.006c0.409,0,0.651-0.327,0.539-0.726L43.964,8.753z" fill="url(#SVGID_13_)"/>
 <path d="M26.783,2.755h6.431c0.316,0,0.734,0.179,0.919,0.435c0,0-0.284-1.189-1.125-1.189h-6.022  c-0.835,0-1.118,1.189-1.118,1.189C26.053,2.934,26.467,2.755,26.783,2.755z" fill="#FFFFFF"/>
 <path d="M36.361,8.048c0.099,0.403,0.53,0.734,0.959,0.734h6.346c0.108,0,0.216,0.021,0.322,0.058l-0.024-0.087  c-0.113-0.398-0.541-0.724-0.949-0.724h-6.043c-0.266,0-0.521-0.147-0.702-0.354L36.361,8.048z" fill="#FFFFFF"/>
 <path d="M16.334,8.782h6.345c0.429,0,0.861-0.331,0.96-0.734l0.089-0.372c-0.179,0.206-0.435,0.354-0.702,0.354  h-6.043c-0.408,0-0.834,0.325-0.948,0.724L16.011,8.84C16.117,8.803,16.227,8.782,16.334,8.782z" fill="#FFFFFF"/>
-<path d="M21.805,17.096v5.834h-5.833v-5.834H21.805 M23.055,15.846h-8.333v8.334h8.333V15.846L23.055,15.846z" fill="#929497"/>
-<path d="M21.805,27.533v5.834h-5.833v-5.834H21.805 M23.055,26.283h-8.333v8.334h8.333V26.283L23.055,26.283z" fill="#929497"/>
+<path d="M21.805,17.096v5.834h-5.833v-5.834H21.805 M23.055,15.846h-8.333v8.334h8.333V15.846L23.055,15.846z" fill="#939595"/>
+<path d="M21.805,27.533v5.834h-5.833v-5.834H21.805 M23.055,26.283h-8.333v8.334h8.333V26.283L23.055,26.283z" fill="#939595"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
 <polygon fill="none" points="0.414,0 0.414,10.485 0,10.899 0.414,11.313 0.414,30 19.1,30 19.514,30.414 19.928,30 30.414,30   30.414,0 "/>
 <path d="M13.769,24.668c-0.003,0.001-0.44,0.125-0.44,0.125l-0.022-0.021L12.8,24.867l-0.025-0.025  c-0.205,0.02-0.411,0.03-0.618,0.03c-1.746,0-3.402-0.694-4.662-1.954c-1.416-1.414-2.113-3.354-1.924-5.279L5.55,17.618l0.09-0.501  L5.634,17.11l0.032-0.128c0.023-0.113,0.049-0.226,0.079-0.338L0,10.899l2.238-2.238c0.623-0.625,1.393-1.296,2.627-1.358  C4.924,7.3,4.988,7.298,5.054,7.298c0.11,0,0.226,0.005,0.346,0.015L5.58,7.334c0.188,0.025,0.352,0.054,0.521,0.092  c0,0,0.277,0.066,0.313,0.076l4.098-4.098C12.707,1.209,15.636,0,18.76,0c2.05,0,4.037,0.526,5.792,1.527  c0.53-0.355,1.14-0.541,1.763-0.541c0.834,0,1.616,0.323,2.203,0.91c1.08,1.08,1.205,2.759,0.375,3.979  c2.574,4.525,1.834,10.311-1.883,14.027l-4.096,4.096c0,0.002,0.068,0.29,0.068,0.29c0.044,0.201,0.072,0.357,0.092,0.505  c0.011,0.083,0.021,0.159,0.026,0.23c0.015,0.178,0.019,0.354,0.011,0.519c-0.062,1.237-0.732,2.009-1.357,2.634l-2.24,2.238  L13.769,24.668z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -924.0166 637.3657)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="218.7148" x2="229.6865" y1="-1096.7686" y2="-1096.7686">
-<stop offset="0" style="stop-color:#676B6D"/>
-<stop offset="0.297" style="stop-color:#A0A3A6"/>
-<stop offset="0.7091" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+<stop offset="0" style="stop-color:#696A6B"/>
+<stop offset="0.297" style="stop-color:#A2A4A4"/>
+<stop offset="0.7091" style="stop-color:#494A4B"/>
+<stop offset="1" style="stop-color:#727475"/>
 </linearGradient>
 <path d="M8,14.656L8,14.656c-2.029,2.029-1.943,5.411,0.201,7.555c2.143,2.143,5.527,2.232,7.557,0.203l0,0  L8,14.656z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 0 9.765625e-004)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="3.21" x2="21.4822" y1="8.9229" y2="27.1951">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.2" style="stop-color:#FFE692"/>
-<stop offset="0.3879" style="stop-color:#FBD072"/>
-<stop offset="0.4182" style="stop-color:#F7BC54"/>
-<stop offset="0.6667" style="stop-color:#ED8C0D"/>
-<stop offset="0.8545" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+<stop offset="0" style="stop-color:#C2A770"/>
+<stop offset="0.2" style="stop-color:#DED7B3"/>
+<stop offset="0.3879" style="stop-color:#D2C49B"/>
+<stop offset="0.4182" style="stop-color:#C6B285"/>
+<stop offset="0.6667" style="stop-color:#AA8250"/>
+<stop offset="0.8545" style="stop-color:#CDBE93"/>
+<stop offset="1" style="stop-color:#BCA162"/>
 </linearGradient>
 <path d="M21.777,23.721L6.693,8.637c-2.041-0.73-2.813-0.205-3.748,0.731l-1.531,1.531L19.514,29l1.533-1.531  C21.982,26.532,22.508,25.761,21.777,23.721z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -924.0166 637.3657)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="221.9707" x2="226.2741" y1="-1120.2998" y2="-1120.2998">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.1939" style="stop-color:#FFE692"/>
-<stop offset="0.703" style="stop-color:#ED8C0D"/>
-<stop offset="0.8848" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+<stop offset="0" style="stop-color:#C2A770"/>
+<stop offset="0.1939" style="stop-color:#DED7B3"/>
+<stop offset="0.703" style="stop-color:#AA8250"/>
+<stop offset="0.8848" style="stop-color:#CDBE93"/>
+<stop offset="1" style="stop-color:#BCA162"/>
 </linearGradient>
 <path d="M27.057,6.375l0.754-0.755c0.83-0.829,0.83-2.188,0-3.017c-0.83-0.83-2.188-0.83-3.018,0  l-0.754,0.754L27.057,6.375z" fill="url(#SVGID_3__)"/>
-<path d="M27.057,6.375l0.754-0.755c0.045-0.045,0.08-0.098,0.119-0.146  c-0.385-0.581-0.832-1.134-1.344-1.645c-0.512-0.512-1.064-0.96-1.646-1.346c-0.047,0.041-0.1,0.074-0.146,0.12l-0.754,0.754  L27.057,6.375z" fill="#873900" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M26.869,3.546c-0.492-0.492-1.023-0.924-1.58-1.299c-0.178,0.095-0.346,0.207-0.494,0.355  l-0.473,0.473l3.018,3.017l0.471-0.472c0.148-0.148,0.262-0.318,0.357-0.495C27.791,4.568,27.359,4.038,26.869,3.546z" fill="#873900" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M27.057,6.375l0.754-0.755c0.045-0.045,0.08-0.098,0.119-0.146  c-0.385-0.581-0.832-1.134-1.344-1.645c-0.512-0.512-1.064-0.96-1.646-1.346c-0.047,0.041-0.1,0.074-0.146,0.12l-0.754,0.754  L27.057,6.375z" fill="#5E2D29" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M26.869,3.546c-0.492-0.492-1.023-0.924-1.58-1.299c-0.178,0.095-0.346,0.207-0.494,0.355  l-0.473,0.473l3.018,3.017l0.471-0.472c0.148-0.148,0.262-0.318,0.357-0.495C27.791,4.568,27.359,4.038,26.869,3.546z" fill="#5E2D29" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="26.3223" x2="14.1095" y1="4.0923" y2="16.3051">
-<stop offset="0" style="stop-color:#FDE6B1"/>
-<stop offset="1" style="stop-color:#EF951A"/>
+<stop offset="0" style="stop-color:#E6E0C8"/>
+<stop offset="1" style="stop-color:#AF8C5A"/>
 </linearGradient>
 <path d="M21.777,23.721l4.525-4.525c4.148-4.147,4.148-10.936,0-15.084s-10.936-4.148-15.084,0L6.693,8.637  L21.777,23.721z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="13.1172" x2="27.4319" y1="2.9941" y2="17.3088">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.2545" style="stop-color:#FFE692"/>
-<stop offset="0.503" style="stop-color:#F8C15B"/>
-<stop offset="0.5152" style="stop-color:#F6B84E"/>
-<stop offset="0.6667" style="stop-color:#ED8C0D"/>
-<stop offset="0.8545" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+<stop offset="0" style="stop-color:#C2A770"/>
+<stop offset="0.2545" style="stop-color:#DED7B3"/>
+<stop offset="0.503" style="stop-color:#C9B78A"/>
+<stop offset="0.5152" style="stop-color:#C4AE80"/>
+<stop offset="0.6667" style="stop-color:#AA8250"/>
+<stop offset="0.8545" style="stop-color:#CDBE93"/>
+<stop offset="1" style="stop-color:#BCA162"/>
 </linearGradient>
 <path d="M7.258,8.637l4.244-4.242C13.432,2.464,16.01,1.4,18.76,1.4c2.752,0,5.33,1.063,7.26,2.994  c1.932,1.931,2.994,4.509,2.994,7.259c0,2.751-1.063,5.329-2.994,7.26l-4.242,4.242L7.258,8.637z" fill="url(#SVGID_5__)"/>
-<rect fill="#873900" fill-opacity="0.2" height="0.401" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.546 -5.4806)" width="21.332" x="3.723" y="15.825"/>
+<rect fill="#5E2D29" fill-opacity="0.2" height="0.401" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.546 -5.4806)" width="21.332" x="3.723" y="15.825"/>
 <path d="M13.619,23.671c0.143-0.041,0.285-0.087,0.426-0.141l-7.162-7.161c-0.053,0.14-0.1,0.281-0.141,0.425  L13.619,23.671z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<rect fill="#873900" fill-opacity="0.1" height="0.4" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.429 -5.7637)" width="21.332" x="4.006" y="15.543"/>
+<rect fill="#5E2D29" fill-opacity="0.1" height="0.4" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.429 -5.7637)" width="21.332" x="4.006" y="15.543"/>
 <path d="M13.133,23.786c0.156-0.029,0.309-0.063,0.461-0.106L6.734,16.82c-0.043,0.151-0.078,0.305-0.107,0.459  L13.133,23.786z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M4.85,8.302l17.262,17.263c0.037-0.485-0.059-1.074-0.334-1.844L6.693,8.637  C5.924,8.36,5.336,8.266,4.85,8.302z" fill="#FFF6C9" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M6.693,8.637c-0.195-0.07-0.379-0.128-0.553-0.176l15.813,15.813  c-0.047-0.173-0.105-0.357-0.176-0.553L6.693,8.637z" fill="#FFF6C9" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect fill="#753200" fill-opacity="0.2" height="0.401" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 17.1142 -1.697)" width="25.598" x="-2.194" y="19.608"/>
-<rect fill="#753200" fill-opacity="0.1" height="0.398" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 16.9952 -1.9808)" width="25.599" x="-1.911" y="19.326"/>
+<path d="M4.85,8.302l17.262,17.263c0.037-0.485-0.059-1.074-0.334-1.844L6.693,8.637  C5.924,8.36,5.336,8.266,4.85,8.302z" fill="#EFEDD9" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M6.693,8.637c-0.195-0.07-0.379-0.128-0.553-0.176l15.813,15.813  c-0.047-0.173-0.105-0.357-0.176-0.553L6.693,8.637z" fill="#EFEDD9" fill-opacity="0.5" stroke-opacity="0.5"/>
+<rect fill="#522523" fill-opacity="0.2" height="0.401" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 17.1142 -1.697)" width="25.598" x="-2.194" y="19.608"/>
+<rect fill="#522523" fill-opacity="0.1" height="0.398" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 16.9952 -1.9808)" width="25.599" x="-1.911" y="19.326"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="21.6523" x2="21.6523" y1="1.7822" y2="16.0367">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#F9C966"/>
+<stop offset="1" style="stop-color:#CDBD92"/>
 </linearGradient>
 <path d="M27.348,15.49c-2.314-1.359-4.715-3.255-6.941-5.482  c-2.229-2.228-4.123-4.628-5.482-6.942l-0.236-0.403l0.436-0.172c1.156-0.455,2.375-0.686,3.627-0.686  c2.615,0,5.162,1.047,6.986,2.873c2.775,2.774,3.635,6.941,2.188,10.614l-0.172,0.435L27.348,15.49z" fill="url(#SVGID_6__)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="30" width="30" x="0.414"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,29 +4,29 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="28.13" x2="28.13" y1="12.29" y2="51.26">
-<stop offset="0" stop-color="#8CFF24"/>
-<stop offset="1" stop-color="#15570B"/>
+<stop offset="0" stop-color="#93BD66"/>
+<stop offset="1" stop-color="#22403B"/>
 </linearGradient>
 <path d="M48.63,13.08l-3.08-7.497-17.7,7.877,0.028,23.92c-2.712-1.771-6.708-2.354-10.77-1.254-6.405,1.725-10.54,6.951-9.247,11.66,1.3,4.718,7.543,7.142,13.94,5.415,5.412-1.461,9.159-5.324,9.138-9.451-0.018-4.129,0.033-15.34,0-23.44l17.69-7.23z" fill="url(#SVGID_1)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="27.86" x2="27.86" y1="9.02" y2="18.75">
-<stop offset="0" stop-color="#36B5FF"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<stop offset="0" stop-color="#72B9C3"/>
+<stop offset="1" stop-color="#546F9F"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2)" points="27.88,33.26,27.86,13.46,27.85,13.46,27.87,33.26"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="39.79" x2="39.79" y1="9.02" y2="18.75">
-<stop offset="0" stop-color="#9EFF47"/>
-<stop offset="1" stop-color="#11470A"/>
+<stop offset="0" stop-color="#A6C87E"/>
+<stop offset="1" stop-color="#1C3533"/>
 </linearGradient>
 <path d="M30.94,19.08c0.007,1.306,0.01-0.201,0.012,1.223l17.67-7.225-0.436-1.108-17.24,7.11z" fill="url(#SVGID_3)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="36.64" x2="36.76" y1="12.18" y2="36.51">
-<stop offset="0" stop-color="#B3FF6E"/>
-<stop offset="1" stop-color="#11470A"/>
+<stop offset="0" stop-color="#BCD39A"/>
+<stop offset="1" stop-color="#1C3533"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4)" points="28.14,38.06,28.14,14.14,45.89,6.413,45.55,5.582,27.45,13.46,27.45,37.38"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="19.29" x2="19.29" y1="37.91" y2="52.09">
-<stop offset="0" stop-color="#B2F56E"/>
-<stop offset="0.47" stop-color="#40AD00"/>
-<stop offset="1" stop-color="#074D00"/>
+<stop offset="0" stop-color="#B7CC97"/>
+<stop offset="0.47" stop-color="#347940"/>
+<stop offset="1" stop-color="#173636"/>
 </linearGradient>
 <path d="M17.62,52.39c-4.258,0.021-7.653-1.941-8.447-4.885-0.484-1.785,0.028-3.761,1.444-5.555,1.55-1.964,3.944-3.454,6.747-4.191,1.187-0.317,2.386-0.477,3.573-0.484,4.258-0.021,7.651,1.943,8.45,4.885,1.058,3.9-2.618,8.272-8.196,9.748-1.18,0.31-2.38,0.47-3.57,0.48z" fill="url(#SVGID_5)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,29 +4,29 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="28.13" x2="28.13" y1="12.29" y2="51.26">
-<stop offset="0" stop-color="#8CFF24"/>
-<stop offset="1" stop-color="#15570B"/>
+<stop offset="0" stop-color="#93BD66"/>
+<stop offset="1" stop-color="#22403B"/>
 </linearGradient>
 <path d="M48.63,13.08l-3.08-7.497-17.7,7.877,0.028,23.92c-2.712-1.771-6.708-2.354-10.77-1.254-6.405,1.725-10.54,6.951-9.247,11.66,1.3,4.718,7.543,7.142,13.94,5.415,5.412-1.461,9.159-5.324,9.138-9.451-0.018-4.129,0.033-15.34,0-23.44l17.69-7.23z" fill="url(#SVGID_1)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="27.86" x2="27.86" y1="9.02" y2="18.75">
-<stop offset="0" stop-color="#36B5FF"/>
-<stop offset="1" stop-color="#1B66D8"/>
+<stop offset="0" stop-color="#72B9C3"/>
+<stop offset="1" stop-color="#546F9F"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2)" points="27.88,33.26,27.86,13.46,27.85,13.46,27.87,33.26"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="39.79" x2="39.79" y1="9.02" y2="18.75">
-<stop offset="0" stop-color="#9EFF47"/>
-<stop offset="1" stop-color="#11470A"/>
+<stop offset="0" stop-color="#A6C87E"/>
+<stop offset="1" stop-color="#1C3533"/>
 </linearGradient>
 <path d="M30.94,19.08c0.007,1.306,0.01-0.201,0.012,1.223l17.67-7.225-0.436-1.108-17.24,7.11z" fill="url(#SVGID_3)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="36.64" x2="36.76" y1="12.18" y2="36.51">
-<stop offset="0" stop-color="#B3FF6E"/>
-<stop offset="1" stop-color="#11470A"/>
+<stop offset="0" stop-color="#BCD39A"/>
+<stop offset="1" stop-color="#1C3533"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4)" points="28.14,38.06,28.14,14.14,45.89,6.413,45.55,5.582,27.45,13.46,27.45,37.38"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="19.29" x2="19.29" y1="37.91" y2="52.09">
-<stop offset="0" stop-color="#B2F56E"/>
-<stop offset="0.47" stop-color="#40AD00"/>
-<stop offset="1" stop-color="#074D00"/>
+<stop offset="0" stop-color="#B7CC97"/>
+<stop offset="0.47" stop-color="#347940"/>
+<stop offset="1" stop-color="#173636"/>
 </linearGradient>
 <path d="M17.62,52.39c-4.258,0.021-7.653-1.941-8.447-4.885-0.484-1.785,0.028-3.761,1.444-5.555,1.55-1.964,3.944-3.454,6.747-4.191,1.187-0.317,2.386-0.477,3.573-0.484,4.258-0.021,7.651,1.943,8.45,4.885,1.058,3.9-2.618,8.272-8.196,9.748-1.18,0.31-2.38,0.47-3.57,0.48z" fill="url(#SVGID_5)"/>
 <rect fill="none" height="60" width="60"/>
@@ -35,9 +35,9 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill-opacity="0.35" height="33.866" stroke-opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 670.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="260" x2="284" y1="655.9761" y2="655.9761">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="0.8424" style="stop-color:#CC1414"/>
-<stop offset="1" style="stop-color:#FF4D00"/>
+<stop offset="0" style="stop-color:#B36B4D"/>
+<stop offset="0.8424" style="stop-color:#954B50"/>
+<stop offset="1" style="stop-color:#B36B4D"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="25.809,26.431 3,4.177 4.191,2.956 27,25.21 "/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tv_out.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tv_out.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tv_out.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,25 +4,25 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07  c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.0667" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B2BEC2"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+<stop offset="0" style="stop-color:#E7EAE8"/>
+<stop offset="0.0667" style="stop-color:#E7EAE8"/>
+<stop offset="0.2606" style="stop-color:#D8DCDA"/>
+<stop offset="0.6606" style="stop-color:#B7BDBB"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11  c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304  v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001  z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" fill-opacity="0.6" height="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
@@ -31,80 +31,80 @@
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.3879" style="stop-color:#2D9BD2"/>
-<stop offset="0.8909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="0.3879" style="stop-color:#5F8BA1"/>
+<stop offset="0.8909" style="stop-color:#455188"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+<stop offset="0" style="stop-color:#AADAC6"/>
+<stop offset="1" style="stop-color:#6A99AA"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
-<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
+<rect fill="#BCE2D2" height="0.767" width="28.383" x="15.809" y="7.37"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+<stop offset="1" style="stop-color:#D3D7D5"/>
 </linearGradient>
 <path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785  c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+<stop offset="0" style="stop-color:#6F7172"/>
+<stop offset="1" style="stop-color:#BFC2C1"/>
 </linearGradient>
 <path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51  c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951  h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183  h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606  c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
 <path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534  h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0667" style="stop-color:#D3D7D5"/>
+<stop offset="0.2606" style="stop-color:#BFC2C1"/>
+<stop offset="0.6606" style="stop-color:#989D9D"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303  c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307  c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+<stop offset="0" style="stop-color:#B8BBBA"/>
+<stop offset="1" style="stop-color:#F4FBF6"/>
 </linearGradient>
 <path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307  c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+<stop offset="0" style="stop-color:#222021"/>
+<stop offset="1" style="stop-color:#6E6E6F"/>
 </linearGradient>
 <path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307  c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+<stop offset="0" style="stop-color:#C6B17B"/>
+<stop offset="0.7455" style="stop-color:#98604F"/>
+<stop offset="1" style="stop-color:#7F3736"/>
 </linearGradient>
 <path d="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307  c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -126,12 +126,12 @@
 <path d="M18.409,29c-5.74-2.107-6.669-7.99-6.358-10.807l5.544,0.615c-0.033,0.371,0.419,4.525,3.424,5.854  L18.409,29L18.409,29z" fill="url(#SVGID_2__)"/>
 <path d="M17.595,18.809l-5.544-0.615c-0.08,0.725-0.077,1.654,0.069,2.67h5.867  C17.657,19.828,17.581,18.969,17.595,18.809z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="9.0186" x2="20.9805" y1="3.9355" y2="3.9355">
-<stop offset="0" style="stop-color:#B57201"/>
-<stop offset="0.05" style="stop-color:#FFF173"/>
-<stop offset="0.35" style="stop-color:#F1BC35"/>
-<stop offset="0.65" style="stop-color:#E5B029"/>
-<stop offset="0.95" style="stop-color:#FCE666"/>
-<stop offset="1" style="stop-color:#B57201"/>
+<stop offset="0" style="stop-color:#7F5337"/>
+<stop offset="0.05" style="stop-color:#D5D19D"/>
+<stop offset="0.35" style="stop-color:#B9A56D"/>
+<stop offset="0.65" style="stop-color:#AD9861"/>
+<stop offset="0.95" style="stop-color:#CFC893"/>
+<stop offset="1" style="stop-color:#7F5337"/>
 </linearGradient>
 <rect fill="url(#SVGID_3__)" height="5.871" width="11.962" x="9.019" y="1"/>
 <path d="M17.595,18.809l-5.544-0.615c-0.072,0.654-0.075,1.477,0.03,2.377h5.818  C17.644,19.67,17.582,18.953,17.595,18.809z" fill-opacity="0.5" stroke-opacity="0.5"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_unknown.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_unknown.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_unknown.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,26 +4,26 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="2.0928" y2="37.9271">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.7636" style="stop-color:#144DA3"/>
-<stop offset="1" style="stop-color:#36B5FF"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.7636" style="stop-color:#3F4A78"/>
+<stop offset="1" style="stop-color:#72B9C3"/>
 </linearGradient>
 <path d="M14.814,10.715V3.508C19.178,2.505,23.314,2,27.238,2c5.785,0,10.221,1.121,13.311,3.364  s4.635,5.532,4.635,9.873c0,2.526-0.596,4.665-1.783,6.417c-1.191,1.752-9.396,9.994-10.205,11.121  c-0.809,1.128-1.213,2.465-1.213,4.01v1.544h-11.51v-2.06c0-2.502,0.547-4.612,1.639-6.342c1.09-1.729,2.994-3.868,5.715-6.419  c2.133-1.985,4.781-6.593,4.781-7.573c0-4.436-2.674-6.655-8.018-6.655C21.576,9.28,18.322,9.759,14.814,10.715z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="2.5591" y2="37.7967">
-<stop offset="0" style="stop-color:#6BCBF2"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#94CAC2"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M21.223,37.579v-1.31c0-2.343,0.512-4.342,1.521-5.941c1.051-1.666,2.934-3.776,5.596-6.272  c2.016-1.876,5.018-6.732,5.018-8.12c0-3.378-1.521-7.405-8.768-7.405c-2.695,0-5.629,0.383-8.717,1.137l-0.309,0.075V4.107  l0.197-0.043c4.018-0.872,7.879-1.314,11.477-1.314c5.596,0,9.928,1.084,12.869,3.222c2.912,2.112,4.326,5.144,4.326,9.266  c0,2.359-0.557,4.376-1.654,5.996c-0.646,0.95-3.703,4.159-6.158,6.737c-2.273,2.389-3.68,3.872-4.035,4.367  c-0.898,1.254-1.354,2.75-1.354,4.447v0.794H21.223z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="26.6924" x2="26.6924" y1="43.6758" y2="58.1758">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.7636" style="stop-color:#144DA3"/>
-<stop offset="1" style="stop-color:#36B5FF"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.7636" style="stop-color:#3F4A78"/>
+<stop offset="1" style="stop-color:#72B9C3"/>
 </linearGradient>
 <path d="M26.672,58c-1.938,0-3.602-0.686-5-2.059c-1.396-1.373-2.094-3.052-2.094-5.037  c0-1.962,0.693-3.641,2.076-5.038c1.385-1.397,3.059-2.095,5.018-2.095c1.961,0,3.641,0.697,5.037,2.095  c1.398,1.397,2.098,3.076,2.098,5.038c0,1.985-0.699,3.664-2.098,5.037C30.313,57.314,28.633,58,26.672,58z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="26.6924" x2="26.6924" y1="44.436" y2="57.4074">
-<stop offset="0" style="stop-color:#63C1EF"/>
-<stop offset="0.1152" style="stop-color:#63C1EF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#8DC5C2"/>
+<stop offset="0.1152" style="stop-color:#8DC5C2"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M26.672,57.25c-1.748,0-3.211-0.604-4.475-1.844c-1.258-1.237-1.869-2.71-1.869-4.502  c0-1.771,0.607-3.245,1.859-4.511c1.248-1.26,2.715-1.872,4.484-1.872c1.771,0,3.246,0.613,4.508,1.875  c1.264,1.263,1.877,2.737,1.877,4.508c0,1.792-0.613,3.265-1.873,4.503C29.92,56.647,28.445,57.25,26.672,57.25L26.672,57.25z" fill="url(#SVGID_4_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -16,63 +16,63 @@
 <path d="M30,46.05c-8.882,0-16.107-7.333-16.107-16.346c0-9.014,7.226-16.348,16.107-16.348  c8.881,0,16.107,7.334,16.107,16.348C46.107,38.717,38.881,46.05,30,46.05L30,46.05z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <ellipse cx="30" cy="29.703" fill-opacity="0.2" rx="15.107" ry="15.347" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30.0005" x2="30.0005" y1="43.7314" y2="13.2561">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#2A3662"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <ellipse cx="30" cy="28.561" fill="url(#SVGID_3_)" rx="15.107" ry="15.346"/>
 <radialGradient cx="-23.8765" cy="20.2261" gradientTransform="matrix(0.9797 0 0 0.9952 53.1776 3.1224)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="18.5636">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <ellipse cx="30" cy="28.561" fill="url(#SVGID_4_)" rx="14.721" ry="14.953"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="29.9995" x2="29.9995" y1="13.4756" y2="43.5901">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#A6CDC2"/>
 </linearGradient>
 <path d="M30,13.607c-8.129,0-14.721,6.696-14.721,14.954c0,8.259,6.592,14.953,14.721,14.953  c8.131,0,14.721-6.693,14.721-14.953C44.721,20.303,38.131,13.607,30,13.607z M30,42.205c-7.645,0-13.862-6.316-13.862-14.079  c0-7.766,6.218-14.082,13.862-14.082s13.861,6.316,13.861,14.082C43.861,35.889,37.645,42.205,30,42.205z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.5205" x2="17.8594" y1="30.5957" y2="30.5957">
-<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="0" style="stop-color:#59595A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M16.661,28.317c-0.156-0.211-0.51-0.211-0.666-0.211c-0.308,0-0.473,0.223-0.475,0.442  v0.015v0.022c0,0.384,0.021,0.816,0.065,1.34c0.01,0.098,0.02,0.197,0.033,0.296l0.018,0.144c0.04,0.313,0.086,0.618,0.139,0.913  l0.024,0.13c0.022,0.118,0.044,0.231,0.067,0.347c0.064,0.291,0.141,0.592,0.236,0.924c0.013,0.049,0.025,0.098,0.036,0.144  c0.021,0.078,0.039,0.155,0.063,0.231l0.005,0.01l0.007,0.023c0-0.006-0.005-0.018-0.005-0.025l0.844-0.059  c0.014-0.134,0.019-0.273,0.014-0.413c-0.007-0.216-0.016-0.483-0.077-0.71l0.785-1.069l0.084-0.115v-0.146v-0.833v-0.182  l-0.127-0.127L16.661,28.317z" fill="url(#SVGID_6_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="20.0322" x2="44.5176" y1="26.2412" y2="26.2412">
-<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="0" style="stop-color:#59595A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M44.512,25.63c-0.01-0.056-0.021-0.098-0.031-0.137  c-0.008-0.03-0.014-0.061-0.021-0.088c-0.072-0.355-0.166-0.72-0.273-1.094l-0.014-0.04c-0.021-0.083-0.047-0.168-0.072-0.251  c-0.133-0.42-0.277-0.823-0.43-1.193c-0.02-0.045-0.041-0.089-0.061-0.134l-0.029-0.071c-0.148-0.34-0.309-0.679-0.477-1.004  l-0.023-0.042c-0.033-0.065-0.066-0.13-0.1-0.194c-0.211-0.38-0.424-0.746-0.648-1.082c-0.021-0.036-0.047-0.073-0.072-0.111  c-0.02-0.022-0.031-0.042-0.047-0.066c-0.213-0.313-0.438-0.618-0.668-0.907l-0.047-0.059c-0.031-0.038-0.061-0.08-0.094-0.12  c-0.268-0.326-0.551-0.644-0.844-0.943c-0.041-0.039-0.084-0.081-0.125-0.124L40.4,17.936c-0.264-0.263-0.545-0.522-0.834-0.768  l-0.057-0.05c-0.027-0.027-0.059-0.051-0.088-0.075c-0.314-0.264-0.656-0.522-1.014-0.771c-0.041-0.03-0.086-0.06-0.131-0.088  l-0.055-0.037c-0.32-0.215-0.656-0.422-0.99-0.611l-0.051-0.029c-0.029-0.017-0.059-0.031-0.084-0.049  c-0.375-0.202-0.764-0.394-1.158-0.567l-0.1-0.041l-0.109-0.045c-0.105-0.044-0.209-0.081-0.313-0.119  c-0.055-0.019-0.107-0.038-0.158-0.057l-0.201-0.076l-0.182,0.116c-0.117,0.076-0.59,0.351-0.869,0.51  c-0.309-0.041-1.057-0.136-1.811-0.21c0.23-0.023,0.555-0.05,1.006-0.081l0.064-0.861l-0.033-0.009  c-0.027-0.006-0.055-0.013-0.082-0.02l-0.064-0.012l-0.053-0.011c-0.461-0.094-0.896-0.163-1.326-0.208h-0.004l-0.061-0.006  c-0.492-0.051-0.991-0.077-1.488-0.077c-0.438,0-0.891,0.024-1.384,0.072c-0.078,0.007-0.149,0.015-0.228,0.023  c-0.488,0.055-0.915,0.122-1.319,0.205l-0.016,0.002l-0.009,0.001c-0.426,0.091-0.853,0.202-1.311,0.343  c-0.039,0.014-0.08,0.027-0.12,0.04l-0.092,0.03c-0.387,0.125-0.766,0.266-1.125,0.417c-0.028,0.013-0.051,0.021-0.071,0.028  l-0.055,0.023c-0.397,0.172-0.796,0.366-1.19,0.582c-0.042,0.022-0.083,0.047-0.125,0.071l-0.052,0.029  c-0.109,0.064-0.221,0.134-0.33,0.202l-0.143,0.093l-0.791,0.49l0.875,0.297c0.132,0.045,0.272,0.067,0.42,0.067  c0.471,0,0.928-0.236,1.295-0.424c0.147-0.077,0.366-0.19,0.457-0.208c0.107,0.032,0.215,0.049,0.323,0.049  c0.399,0,0.729-0.221,1.019-0.415l0.077-0.05c0.097-0.03,0.258-0.091,0.578-0.213c0.329-0.126,0.928-0.354,1.088-0.392  c0.31-0.004,0.679-0.049,0.942-0.215c0.248,0.042,0.688,0.112,1.143,0.172c-0.033,0.021-0.065,0.042-0.095,0.07  c-0.146,0.137-0.94,0.382-1.185,0.414c-0.457,0.057-0.639,0.292-0.712,0.476c-0.094,0.242-0.04,0.483,0.056,0.679  c-0.174,0.115-0.385,0.244-0.566,0.342c0-0.004,0.002-0.009,0.002-0.014c0.064-0.371,0.114-0.638-0.064-0.852  c-0.09-0.111-0.224-0.172-0.364-0.172c-0.21,0-0.371,0.13-0.502,0.259c-0.366,0.359-0.588,0.808-0.672,0.977l-0.016,0.031  l-0.014,0.025c-0.157,0.31-0.223,0.527-0.136,1.21c-0.039,0.028-0.154,0.073-0.313,0.073c-0.02,0-0.039-0.001-0.055-0.002  c-0.104-0.114-0.246-0.179-0.406-0.179l0,0c-0.37,0-0.873,0.423-1.497,1.257l-0.199,0.268l0.203,0.266l0.188,0.246  c-2.972,2.334-2.994,2.467-3.023,2.661c-0.007,0.02-0.033,0.1-0.068,0.211c-0.442,1.398-0.688,2.445-0.449,3.004  c0.554,1.298,1.179,2.511,1.987,2.577c0.07,0.006,0.147,0.009,0.233,0.009c0.739,0,1.94-0.229,2.518-0.348  c0.105,0.204,0.237,0.442,0.307,0.57l0.129,0.231l0.261-0.009c0,0,0.141-0.005,0.315-0.005c0.203,0,0.338,0.007,0.425,0.014  c0.314,0.937,0.917,3.093,0.805,3.539l-0.003,0.002c-1.014,1.548,0.216,3.563,0.808,4.532c0.048,0.077,0.089,0.146,0.125,0.205  c0.228,0.661,0.505,1.098,1.089,1.098c0.043,0,0.09-0.004,0.132-0.004c0.033-0.003,0.069-0.005,0.104-0.005  c0.066,0,0.11,0.009,0.159,0.026l0.055,0.02l0.056,0.004c0.109,0.01,0.214,0.023,0.32,0.039c0.177,0.025,0.364,0.052,0.556,0.052  c0.508,0,0.909-0.195,1.258-0.614c0.014,0,0.025-0.001,0.037-0.003c0.367-0.052,0.504-0.239,0.549-0.404  c0.029-0.028,0.064-0.063,0.094-0.091c0.146-0.133,0.316-0.292,0.436-0.481c0.051-0.032,0.113-0.068,0.182-0.109  c0.117-0.073,0.25-0.154,0.354-0.21c0.092-0.027,0.174-0.084,0.234-0.16c0.148-0.184,0.119-0.394,0.094-0.563  c-0.025-0.172-0.051-0.35,0.043-0.541c0.52-0.256,1.445-0.881,1.594-0.984v0.012c-0.008,0.084-0.033,0.309-0.07,0.451  c-0.197,0.199-0.359,0.503-0.414,0.605l-0.031,0.066l-0.012,0.074c-0.012,0.098-0.066,0.608,0.215,0.938  c0.143,0.165,0.346,0.258,0.574,0.258c0.07,0,0.146-0.01,0.223-0.028c0.727-0.167,2.01-1.935,2.113-2.91  c0.053-0.473-0.129-0.842-0.494-1.017l-0.273-0.131l-0.217,0.216l-0.791,0.806c-0.268,0.025-0.479,0.106-0.619,0.234  c0.008-0.344-0.025-0.696-0.061-1.04c-0.109-1.036-0.129-1.695,0.496-2.146l0.031-0.023l0.029-0.028  c0.223-0.233,0.475-0.438,0.74-0.654c0.619-0.506,1.26-1.028,1.643-1.975l0.016-0.041c0.123-0.323,0.309-0.811,0.059-1.182  c-0.063-0.091-0.193-0.233-0.441-0.286c0.326-0.131,0.576-0.237,0.6-0.246l0.076-0.032l0.059-0.058l1.34-1.304l0.195-0.192  l-0.086-0.263c-0.012-0.034-0.086-0.239-0.291-0.535c0.391,0.053,0.729,0.148,0.834,0.234c0.043,0.088,0.121,0.283,0.209,0.488  c1.471,3.528,1.678,3.708,2.063,3.715c0.014,0,0.025,0.001,0.035,0.003c0.029,0.001,0.059,0.002,0.082,0.002  c0.221,0,0.344-0.114,0.398-0.181c0.16-0.196,0.117-0.437,0.1-0.526l-0.006-0.03c-0.018-0.212-0.006-1.162,0.023-1.94  c0.002,0.003,0.004,0.004,0.004,0.007l0.791-0.319L44.512,25.63z M32.908,21.317c-0.061,0.001-0.129,0.005-0.199,0.006  c-0.227,0.013-0.486,0.023-0.742,0.023c-0.672,0-0.826-0.083-0.842-0.095c-0.081-0.057-0.162-0.101-0.247-0.133  c0.153-0.035,0.327-0.155,0.507-0.508c0.176,0.348,0.416,0.657,0.785,0.657c0.1,0,0.195-0.024,0.287-0.071  C32.582,21.2,32.785,21.27,32.908,21.317z M32.645,19.408c-0.053,0-0.094-0.002-0.125-0.004c0.033-0.091,0.076-0.145,0.107-0.175  c0.043,0.067,0.104,0.125,0.166,0.175C32.74,19.407,32.691,19.408,32.645,19.408z M29.963,20.323  c0.231,0.46,0.402,0.658,0.539,0.745c-0.334,0.027-0.586,0.242-0.796,0.448c-0.146-0.052-0.397-0.206-0.473-0.314  c-0.043-0.064-0.097-0.119-0.156-0.167C29.444,20.928,29.766,20.583,29.963,20.323z M28.69,19.986l-0.48-0.025l-1.606-0.078  c0.198-0.164,0.385-0.318,0.493-0.409c0.03-0.012,0.145-0.043,0.427-0.043c0.17,0,0.332,0.012,0.438,0.021L28.69,19.986z" fill="url(#SVGID_7_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="-23.4248" cy="14.9639" gradientTransform="matrix(0.9797 0 0 0.9952 53.1776 3.1224)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="16.9456">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M15.949,28.552c0,0,0,0,0,0.002c0,0.003,0,0.006,0,0.01c0,0.446,0.029,0.886,0.065,1.32  c0.013,0.144,0.032,0.286,0.048,0.43c0.038,0.298,0.084,0.594,0.135,0.887c0.031,0.153,0.06,0.309,0.09,0.463  c0.066,0.301,0.146,0.6,0.229,0.893c0.035,0.121,0.062,0.246,0.097,0.363c0.007,0.013,0.011,0.025,0.013,0.039  c0.012-0.117,0.016-0.234,0.012-0.355c-0.027-0.86-0.163-0.75-0.163-0.75l0.955-1.305v-0.833l-1.12-1.138  C16.309,28.578,15.949,28.521,15.949,28.552z" fill="url(#SVGID_8_)"/>
 <radialGradient cx="-23.4033" cy="14.9658" gradientTransform="matrix(0.9797 0 0 0.9952 53.1776 3.1224)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="16.9596">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M24.947,15.643c0.412,0.139,0.751-0.143,1.136-0.394c0.136-0.027,1.647-0.641,1.813-0.641  c0.163,0,0.712-0.021,0.849-0.243c0,0,2.365,0.419,2.724,0.279c0.192-0.077,1.009-0.144,1.708-0.189  c-0.037-0.009-0.076-0.02-0.113-0.029c-0.039-0.008-0.074-0.013-0.113-0.021c-0.439-0.091-0.885-0.162-1.336-0.208  c0,0-0.006,0-0.01-0.002c-0.476-0.048-0.957-0.074-1.447-0.074c-0.453,0-0.901,0.027-1.345,0.07  c-0.077,0.007-0.153,0.016-0.233,0.026c-0.428,0.047-0.853,0.11-1.27,0.195c-0.007,0.003-0.016,0.003-0.021,0.004  c-0.433,0.09-0.855,0.203-1.272,0.331c-0.071,0.023-0.141,0.047-0.209,0.069c-0.37,0.123-0.734,0.257-1.091,0.405  c-0.041,0.019-0.084,0.035-0.125,0.051c-0.394,0.171-0.775,0.359-1.15,0.563c-0.056,0.03-0.11,0.064-0.165,0.095  c-0.161,0.09-0.311,0.19-0.467,0.288C23.581,16.479,24.538,15.503,24.947,15.643z" fill="url(#SVGID_9_)"/>
 <radialGradient cx="-23.4023" cy="14.9634" gradientTransform="matrix(0.9797 0 0 0.9952 53.1776 3.1224)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="16.9557">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.3152" style="stop-color:#B7CC97"/>
+<stop offset="0.7273" style="stop-color:#568E4C"/>
+<stop offset="1" style="stop-color:#255541"/>
 </radialGradient>
 <path d="M44.09,25.703c-0.016-0.073-0.037-0.142-0.053-0.213c-0.07-0.356-0.164-0.708-0.266-1.054  c-0.025-0.094-0.051-0.189-0.08-0.282c-0.125-0.394-0.264-0.781-0.416-1.159c-0.029-0.065-0.061-0.131-0.09-0.196  c-0.143-0.333-0.297-0.658-0.463-0.977c-0.037-0.077-0.078-0.155-0.117-0.23c-0.197-0.359-0.406-0.709-0.627-1.051  c-0.041-0.059-0.084-0.114-0.121-0.173c-0.205-0.303-0.42-0.596-0.648-0.881c-0.043-0.055-0.088-0.114-0.135-0.173  c-0.262-0.314-0.533-0.619-0.82-0.914c-0.047-0.05-0.098-0.098-0.15-0.148c-0.26-0.259-0.535-0.511-0.813-0.75  c-0.047-0.04-0.092-0.083-0.141-0.123c-0.316-0.261-0.645-0.511-0.982-0.746c-0.061-0.042-0.119-0.082-0.182-0.121  c-0.311-0.211-0.631-0.411-0.961-0.595c-0.047-0.025-0.088-0.053-0.133-0.077c-0.365-0.199-0.74-0.383-1.123-0.55  c-0.07-0.029-0.139-0.055-0.205-0.085c-0.15-0.063-0.303-0.112-0.455-0.17c-0.182,0.118-1.016,0.597-1.016,0.597  s-3.622-0.502-3.869-0.251c-0.249,0.251-1.213,0.508-1.434,0.537c-0.219,0.03-0.674,0.148-0.129,0.832  c-0.081,0.084-1.642,1.186-1.642,0.686c0-0.502,0.351-1.4-0.139-0.919c-0.351,0.346-0.563,0.813-0.605,0.902  c-0.115,0.223-0.187,0.328-0.104,0.97c0.085,0.642-1.005,0.64-1.08,0.473c-0.196-0.445-1.274,0.999-1.274,0.999l0.455,0.594  c0,0-3.181,2.486-3.206,2.654c-0.028,0.168-0.822,2.328-0.547,2.97c0.274,0.644,0.969,2.262,1.626,2.313  c0.861,0.072,2.951-0.398,2.951-0.398c0.055,0.142,0.45,0.854,0.45,0.854s1.021-0.036,1.081,0.077  c0.018,0.038,1.234,3.668,0.832,4.149c-0.957,1.456,0.547,3.589,0.965,4.312c0.419,1.238,0.688,0.684,1.239,0.889  c0.679,0.058,1.25,0.313,1.826-0.439c0.166-0.141,0.451-0.029,0.451-0.225c0-0.107,0.494-0.427,0.619-0.729  c0.133-0.063,0.475-0.297,0.707-0.41c0.211-0.014-0.201-0.586,0.217-1.191c0.451-0.182,1.666-1.014,1.666-1.014  c0.057-1.223-0.592-2.729,0.617-3.595c0.777-0.807,1.799-1.266,2.295-2.493c0.139-0.361,0.441-1.104-0.438-0.881  c-0.826,0.212-1.75,0.26-1.313-0.109c-0.051-0.456-0.6-0.667-1.092-1.111c-0.254-0.614-0.654-1.704-0.654-1.704l-0.875-1.349  l0.107-0.279l1.041,1.555l1.037,1.276c0.383,1.277,0.711,1.388,0.711,1.388c0.574-0.205,1.939-0.775,1.939-0.775l1.342-1.306  c0,0-0.139-0.417-0.684-0.943l-0.41-0.25c-0.09,0.257-0.566,0.352-0.566,0.352l-1.156-1.406l0.43-0.088l0.332,0.641l0.795,0.279  c0,0,0.219-0.163,0.629,0.267c0.334-0.028,1.635,0.065,1.938,0.457c0.061,0.077,1.611,4.015,1.918,4.02  c0.137,0.001,0.232,0.055,0.189-0.184c-0.055-0.11,0-2.585,0.08-3.115c0.209-0.448,0.242-0.001,0.734,0.853  C44.094,25.745,44.094,25.724,44.09,25.703z M30.432,16.162c0.106-0.329,0.738-0.441,0.738-0.441s-0.183,0.339-0.141,0.514  c0.041,0.177-0.288,0.287-0.323,0.702c-0.038,0.416-0.789,0.171-0.851,0.026S30.319,16.489,30.432,16.162z M33.125,21.748  c-0.467,0-1.863,0.141-2.247-0.138c-0.386-0.278-0.686,0.029-0.962,0.309c-0.182,0.18-0.841-0.187-1.034-0.467  c-0.191-0.279-0.839-0.259-0.839-0.259l0.147-0.796l-1.859-0.09l-1.058,0.315l-0.992,0.028l0.557-0.269l0.693-0.167  c0,0,1.008-0.841,1.31-1.092c0.258-0.212,1.276-0.094,1.276-0.094l1.121,0.821c0,0-0.249,0.643-0.358,0.78  c0.411-0.027,0.896-0.786,0.896-0.786c-0.873-0.816-0.839-1.094-0.839-1.094l1.152,0.822l0.01,0.007c0,0,0.467,1.116,0.661,1.116  c0.189,0,0.436-0.768,0.436-0.768l0.326-0.083c0.146,0.352,0.42,1.147,0.748,0.961c0.189-0.105,0.5-0.01,0.855,0.129  c0.359,0.138,0.602-0.075,0.895,0.185C33.982,22.268,33.318,21.805,33.125,21.748z M33.855,19.828  c-0.479-0.187-2.102,0.418-1.74-0.569c0.193-0.536,0.691-0.646,0.863-0.292c0.043,0.147,0.586,0.374,0.582,0.065  c-0.004-0.308,0.543-0.47,0.621-0.241C33.889,19.003,35.322,20.112,33.855,19.828z M36.918,20.767  c-0.268-0.219,0.117-0.404-0.275-0.746c-0.563-0.491-1.002-0.702-0.234-1.097c0.945-0.122,0.152,0.307,0.309,0.563  c0.084,0.136,0.563,0.593,0.938,1.153C37.963,21.104,37.182,20.984,36.918,20.767z" fill="url(#SVGID_10_)"/>
 <radialGradient cx="-23.4043" cy="14.9697" gradientTransform="matrix(0.9797 0 0 0.9952 53.1776 3.1224)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="16.9518">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M37.297,33.482l-0.91,0.925c0,0-0.549,0-0.576,0.224c-0.012,0.094-0.045,0.508-0.135,0.719  c-0.182,0.13-0.402,0.557-0.402,0.557s-0.113,0.823,0.492,0.683C36.373,36.451,38.232,33.93,37.297,33.482z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 -286)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="287" x2="287" y1="-288.5059" y2="-343.9819">
-<stop offset="0" style="stop-color:#F0F0F2"/>
-<stop offset="1" style="stop-color:#B3B5B8"/>
+<stop offset="0" style="stop-color:#F1F1F1"/>
+<stop offset="1" style="stop-color:#B4B6B6"/>
 </linearGradient>
 <path d="M52.459,2.898v54.203h-32.11c-0.626,0-1.599-0.401-2.04-0.846l-9.925-9.924  c-0.443-0.441-0.845-1.413-0.845-2.039V2.898H52.459 M53.213,2.145H6.787v42.148c0,0.829,0.478,1.986,1.064,2.572l9.925,9.926  c0.586,0.585,1.743,1.064,2.573,1.064h32.864V2.145L53.213,2.145z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 -286)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="275.5117" x2="269.9254" y1="-332.5654" y2="-338.1517">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_home.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -16,63 +16,63 @@
 <path d="M30,46.05c-8.882,0-16.107-7.333-16.107-16.346c0-9.014,7.226-16.348,16.107-16.348  c8.881,0,16.107,7.334,16.107,16.348C46.107,38.717,38.881,46.05,30,46.05L30,46.05z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <ellipse cx="30" cy="29.703" fill-opacity="0.2" rx="15.107" ry="15.347" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30.0005" x2="30.0005" y1="43.7314" y2="13.2561">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#2A3662"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <ellipse cx="30" cy="28.561" fill="url(#SVGID_3_)" rx="15.107" ry="15.346"/>
 <radialGradient cx="-23.8765" cy="20.2261" gradientTransform="matrix(0.9797 0 0 0.9952 53.1776 3.1224)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="18.5636">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <ellipse cx="30" cy="28.561" fill="url(#SVGID_4_)" rx="14.721" ry="14.953"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="29.9995" x2="29.9995" y1="13.4756" y2="43.5901">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#A6CDC2"/>
 </linearGradient>
 <path d="M30,13.607c-8.129,0-14.721,6.696-14.721,14.954c0,8.259,6.592,14.953,14.721,14.953  c8.131,0,14.721-6.693,14.721-14.953C44.721,20.303,38.131,13.607,30,13.607z M30,42.205c-7.645,0-13.862-6.316-13.862-14.079  c0-7.766,6.218-14.082,13.862-14.082s13.861,6.316,13.861,14.082C43.861,35.889,37.645,42.205,30,42.205z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.5205" x2="17.8594" y1="30.5957" y2="30.5957">
-<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="0" style="stop-color:#59595A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M16.661,28.317c-0.156-0.211-0.51-0.211-0.666-0.211c-0.308,0-0.473,0.223-0.475,0.442  v0.015v0.022c0,0.384,0.021,0.816,0.065,1.34c0.01,0.098,0.02,0.197,0.033,0.296l0.018,0.144c0.04,0.313,0.086,0.618,0.139,0.913  l0.024,0.13c0.022,0.118,0.044,0.231,0.067,0.347c0.064,0.291,0.141,0.592,0.236,0.924c0.013,0.049,0.025,0.098,0.036,0.144  c0.021,0.078,0.039,0.155,0.063,0.231l0.005,0.01l0.007,0.023c0-0.006-0.005-0.018-0.005-0.025l0.844-0.059  c0.014-0.134,0.019-0.273,0.014-0.413c-0.007-0.216-0.016-0.483-0.077-0.71l0.785-1.069l0.084-0.115v-0.146v-0.833v-0.182  l-0.127-0.127L16.661,28.317z" fill="url(#SVGID_6_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="20.0322" x2="44.5176" y1="26.2412" y2="26.2412">
-<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="0" style="stop-color:#59595A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M44.512,25.63c-0.01-0.056-0.021-0.098-0.031-0.137  c-0.008-0.03-0.014-0.061-0.021-0.088c-0.072-0.355-0.166-0.72-0.273-1.094l-0.014-0.04c-0.021-0.083-0.047-0.168-0.072-0.251  c-0.133-0.42-0.277-0.823-0.43-1.193c-0.02-0.045-0.041-0.089-0.061-0.134l-0.029-0.071c-0.148-0.34-0.309-0.679-0.477-1.004  l-0.023-0.042c-0.033-0.065-0.066-0.13-0.1-0.194c-0.211-0.38-0.424-0.746-0.648-1.082c-0.021-0.036-0.047-0.073-0.072-0.111  c-0.02-0.022-0.031-0.042-0.047-0.066c-0.213-0.313-0.438-0.618-0.668-0.907l-0.047-0.059c-0.031-0.038-0.061-0.08-0.094-0.12  c-0.268-0.326-0.551-0.644-0.844-0.943c-0.041-0.039-0.084-0.081-0.125-0.124L40.4,17.936c-0.264-0.263-0.545-0.522-0.834-0.768  l-0.057-0.05c-0.027-0.027-0.059-0.051-0.088-0.075c-0.314-0.264-0.656-0.522-1.014-0.771c-0.041-0.03-0.086-0.06-0.131-0.088  l-0.055-0.037c-0.32-0.215-0.656-0.422-0.99-0.611l-0.051-0.029c-0.029-0.017-0.059-0.031-0.084-0.049  c-0.375-0.202-0.764-0.394-1.158-0.567l-0.1-0.041l-0.109-0.045c-0.105-0.044-0.209-0.081-0.313-0.119  c-0.055-0.019-0.107-0.038-0.158-0.057l-0.201-0.076l-0.182,0.116c-0.117,0.076-0.59,0.351-0.869,0.51  c-0.309-0.041-1.057-0.136-1.811-0.21c0.23-0.023,0.555-0.05,1.006-0.081l0.064-0.861l-0.033-0.009  c-0.027-0.006-0.055-0.013-0.082-0.02l-0.064-0.012l-0.053-0.011c-0.461-0.094-0.896-0.163-1.326-0.208h-0.004l-0.061-0.006  c-0.492-0.051-0.991-0.077-1.488-0.077c-0.438,0-0.891,0.024-1.384,0.072c-0.078,0.007-0.149,0.015-0.228,0.023  c-0.488,0.055-0.915,0.122-1.319,0.205l-0.016,0.002l-0.009,0.001c-0.426,0.091-0.853,0.202-1.311,0.343  c-0.039,0.014-0.08,0.027-0.12,0.04l-0.092,0.03c-0.387,0.125-0.766,0.266-1.125,0.417c-0.028,0.013-0.051,0.021-0.071,0.028  l-0.055,0.023c-0.397,0.172-0.796,0.366-1.19,0.582c-0.042,0.022-0.083,0.047-0.125,0.071l-0.052,0.029  c-0.109,0.064-0.221,0.134-0.33,0.202l-0.143,0.093l-0.791,0.49l0.875,0.297c0.132,0.045,0.272,0.067,0.42,0.067  c0.471,0,0.928-0.236,1.295-0.424c0.147-0.077,0.366-0.19,0.457-0.208c0.107,0.032,0.215,0.049,0.323,0.049  c0.399,0,0.729-0.221,1.019-0.415l0.077-0.05c0.097-0.03,0.258-0.091,0.578-0.213c0.329-0.126,0.928-0.354,1.088-0.392  c0.31-0.004,0.679-0.049,0.942-0.215c0.248,0.042,0.688,0.112,1.143,0.172c-0.033,0.021-0.065,0.042-0.095,0.07  c-0.146,0.137-0.94,0.382-1.185,0.414c-0.457,0.057-0.639,0.292-0.712,0.476c-0.094,0.242-0.04,0.483,0.056,0.679  c-0.174,0.115-0.385,0.244-0.566,0.342c0-0.004,0.002-0.009,0.002-0.014c0.064-0.371,0.114-0.638-0.064-0.852  c-0.09-0.111-0.224-0.172-0.364-0.172c-0.21,0-0.371,0.13-0.502,0.259c-0.366,0.359-0.588,0.808-0.672,0.977l-0.016,0.031  l-0.014,0.025c-0.157,0.31-0.223,0.527-0.136,1.21c-0.039,0.028-0.154,0.073-0.313,0.073c-0.02,0-0.039-0.001-0.055-0.002  c-0.104-0.114-0.246-0.179-0.406-0.179l0,0c-0.37,0-0.873,0.423-1.497,1.257l-0.199,0.268l0.203,0.266l0.188,0.246  c-2.972,2.334-2.994,2.467-3.023,2.661c-0.007,0.02-0.033,0.1-0.068,0.211c-0.442,1.398-0.688,2.445-0.449,3.004  c0.554,1.298,1.179,2.511,1.987,2.577c0.07,0.006,0.147,0.009,0.233,0.009c0.739,0,1.94-0.229,2.518-0.348  c0.105,0.204,0.237,0.442,0.307,0.57l0.129,0.231l0.261-0.009c0,0,0.141-0.005,0.315-0.005c0.203,0,0.338,0.007,0.425,0.014  c0.314,0.937,0.917,3.093,0.805,3.539l-0.003,0.002c-1.014,1.548,0.216,3.563,0.808,4.532c0.048,0.077,0.089,0.146,0.125,0.205  c0.228,0.661,0.505,1.098,1.089,1.098c0.043,0,0.09-0.004,0.132-0.004c0.033-0.003,0.069-0.005,0.104-0.005  c0.066,0,0.11,0.009,0.159,0.026l0.055,0.02l0.056,0.004c0.109,0.01,0.214,0.023,0.32,0.039c0.177,0.025,0.364,0.052,0.556,0.052  c0.508,0,0.909-0.195,1.258-0.614c0.014,0,0.025-0.001,0.037-0.003c0.367-0.052,0.504-0.239,0.549-0.404  c0.029-0.028,0.064-0.063,0.094-0.091c0.146-0.133,0.316-0.292,0.436-0.481c0.051-0.032,0.113-0.068,0.182-0.109  c0.117-0.073,0.25-0.154,0.354-0.21c0.092-0.027,0.174-0.084,0.234-0.16c0.148-0.184,0.119-0.394,0.094-0.563  c-0.025-0.172-0.051-0.35,0.043-0.541c0.52-0.256,1.445-0.881,1.594-0.984v0.012c-0.008,0.084-0.033,0.309-0.07,0.451  c-0.197,0.199-0.359,0.503-0.414,0.605l-0.031,0.066l-0.012,0.074c-0.012,0.098-0.066,0.608,0.215,0.938  c0.143,0.165,0.346,0.258,0.574,0.258c0.07,0,0.146-0.01,0.223-0.028c0.727-0.167,2.01-1.935,2.113-2.91  c0.053-0.473-0.129-0.842-0.494-1.017l-0.273-0.131l-0.217,0.216l-0.791,0.806c-0.268,0.025-0.479,0.106-0.619,0.234  c0.008-0.344-0.025-0.696-0.061-1.04c-0.109-1.036-0.129-1.695,0.496-2.146l0.031-0.023l0.029-0.028  c0.223-0.233,0.475-0.438,0.74-0.654c0.619-0.506,1.26-1.028,1.643-1.975l0.016-0.041c0.123-0.323,0.309-0.811,0.059-1.182  c-0.063-0.091-0.193-0.233-0.441-0.286c0.326-0.131,0.576-0.237,0.6-0.246l0.076-0.032l0.059-0.058l1.34-1.304l0.195-0.192  l-0.086-0.263c-0.012-0.034-0.086-0.239-0.291-0.535c0.391,0.053,0.729,0.148,0.834,0.234c0.043,0.088,0.121,0.283,0.209,0.488  c1.471,3.528,1.678,3.708,2.063,3.715c0.014,0,0.025,0.001,0.035,0.003c0.029,0.001,0.059,0.002,0.082,0.002  c0.221,0,0.344-0.114,0.398-0.181c0.16-0.196,0.117-0.437,0.1-0.526l-0.006-0.03c-0.018-0.212-0.006-1.162,0.023-1.94  c0.002,0.003,0.004,0.004,0.004,0.007l0.791-0.319L44.512,25.63z M32.908,21.317c-0.061,0.001-0.129,0.005-0.199,0.006  c-0.227,0.013-0.486,0.023-0.742,0.023c-0.672,0-0.826-0.083-0.842-0.095c-0.081-0.057-0.162-0.101-0.247-0.133  c0.153-0.035,0.327-0.155,0.507-0.508c0.176,0.348,0.416,0.657,0.785,0.657c0.1,0,0.195-0.024,0.287-0.071  C32.582,21.2,32.785,21.27,32.908,21.317z M32.645,19.408c-0.053,0-0.094-0.002-0.125-0.004c0.033-0.091,0.076-0.145,0.107-0.175  c0.043,0.067,0.104,0.125,0.166,0.175C32.74,19.407,32.691,19.408,32.645,19.408z M29.963,20.323  c0.231,0.46,0.402,0.658,0.539,0.745c-0.334,0.027-0.586,0.242-0.796,0.448c-0.146-0.052-0.397-0.206-0.473-0.314  c-0.043-0.064-0.097-0.119-0.156-0.167C29.444,20.928,29.766,20.583,29.963,20.323z M28.69,19.986l-0.48-0.025l-1.606-0.078  c0.198-0.164,0.385-0.318,0.493-0.409c0.03-0.012,0.145-0.043,0.427-0.043c0.17,0,0.332,0.012,0.438,0.021L28.69,19.986z" fill="url(#SVGID_7_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="-23.4248" cy="14.9639" gradientTransform="matrix(0.9797 0 0 0.9952 53.1776 3.1224)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="16.9456">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M15.949,28.552c0,0,0,0,0,0.002c0,0.003,0,0.006,0,0.01c0,0.446,0.029,0.886,0.065,1.32  c0.013,0.144,0.032,0.286,0.048,0.43c0.038,0.298,0.084,0.594,0.135,0.887c0.031,0.153,0.06,0.309,0.09,0.463  c0.066,0.301,0.146,0.6,0.229,0.893c0.035,0.121,0.062,0.246,0.097,0.363c0.007,0.013,0.011,0.025,0.013,0.039  c0.012-0.117,0.016-0.234,0.012-0.355c-0.027-0.86-0.163-0.75-0.163-0.75l0.955-1.305v-0.833l-1.12-1.138  C16.309,28.578,15.949,28.521,15.949,28.552z" fill="url(#SVGID_8_)"/>
 <radialGradient cx="-23.4033" cy="14.9658" gradientTransform="matrix(0.9797 0 0 0.9952 53.1776 3.1224)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="16.9596">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M24.947,15.643c0.412,0.139,0.751-0.143,1.136-0.394c0.136-0.027,1.647-0.641,1.813-0.641  c0.163,0,0.712-0.021,0.849-0.243c0,0,2.365,0.419,2.724,0.279c0.192-0.077,1.009-0.144,1.708-0.189  c-0.037-0.009-0.076-0.02-0.113-0.029c-0.039-0.008-0.074-0.013-0.113-0.021c-0.439-0.091-0.885-0.162-1.336-0.208  c0,0-0.006,0-0.01-0.002c-0.476-0.048-0.957-0.074-1.447-0.074c-0.453,0-0.901,0.027-1.345,0.07  c-0.077,0.007-0.153,0.016-0.233,0.026c-0.428,0.047-0.853,0.11-1.27,0.195c-0.007,0.003-0.016,0.003-0.021,0.004  c-0.433,0.09-0.855,0.203-1.272,0.331c-0.071,0.023-0.141,0.047-0.209,0.069c-0.37,0.123-0.734,0.257-1.091,0.405  c-0.041,0.019-0.084,0.035-0.125,0.051c-0.394,0.171-0.775,0.359-1.15,0.563c-0.056,0.03-0.11,0.064-0.165,0.095  c-0.161,0.09-0.311,0.19-0.467,0.288C23.581,16.479,24.538,15.503,24.947,15.643z" fill="url(#SVGID_9_)"/>
 <radialGradient cx="-23.4023" cy="14.9634" gradientTransform="matrix(0.9797 0 0 0.9952 53.1776 3.1224)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="16.9557">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.3152" style="stop-color:#B7CC97"/>
+<stop offset="0.7273" style="stop-color:#568E4C"/>
+<stop offset="1" style="stop-color:#255541"/>
 </radialGradient>
 <path d="M44.09,25.703c-0.016-0.073-0.037-0.142-0.053-0.213c-0.07-0.356-0.164-0.708-0.266-1.054  c-0.025-0.094-0.051-0.189-0.08-0.282c-0.125-0.394-0.264-0.781-0.416-1.159c-0.029-0.065-0.061-0.131-0.09-0.196  c-0.143-0.333-0.297-0.658-0.463-0.977c-0.037-0.077-0.078-0.155-0.117-0.23c-0.197-0.359-0.406-0.709-0.627-1.051  c-0.041-0.059-0.084-0.114-0.121-0.173c-0.205-0.303-0.42-0.596-0.648-0.881c-0.043-0.055-0.088-0.114-0.135-0.173  c-0.262-0.314-0.533-0.619-0.82-0.914c-0.047-0.05-0.098-0.098-0.15-0.148c-0.26-0.259-0.535-0.511-0.813-0.75  c-0.047-0.04-0.092-0.083-0.141-0.123c-0.316-0.261-0.645-0.511-0.982-0.746c-0.061-0.042-0.119-0.082-0.182-0.121  c-0.311-0.211-0.631-0.411-0.961-0.595c-0.047-0.025-0.088-0.053-0.133-0.077c-0.365-0.199-0.74-0.383-1.123-0.55  c-0.07-0.029-0.139-0.055-0.205-0.085c-0.15-0.063-0.303-0.112-0.455-0.17c-0.182,0.118-1.016,0.597-1.016,0.597  s-3.622-0.502-3.869-0.251c-0.249,0.251-1.213,0.508-1.434,0.537c-0.219,0.03-0.674,0.148-0.129,0.832  c-0.081,0.084-1.642,1.186-1.642,0.686c0-0.502,0.351-1.4-0.139-0.919c-0.351,0.346-0.563,0.813-0.605,0.902  c-0.115,0.223-0.187,0.328-0.104,0.97c0.085,0.642-1.005,0.64-1.08,0.473c-0.196-0.445-1.274,0.999-1.274,0.999l0.455,0.594  c0,0-3.181,2.486-3.206,2.654c-0.028,0.168-0.822,2.328-0.547,2.97c0.274,0.644,0.969,2.262,1.626,2.313  c0.861,0.072,2.951-0.398,2.951-0.398c0.055,0.142,0.45,0.854,0.45,0.854s1.021-0.036,1.081,0.077  c0.018,0.038,1.234,3.668,0.832,4.149c-0.957,1.456,0.547,3.589,0.965,4.312c0.419,1.238,0.688,0.684,1.239,0.889  c0.679,0.058,1.25,0.313,1.826-0.439c0.166-0.141,0.451-0.029,0.451-0.225c0-0.107,0.494-0.427,0.619-0.729  c0.133-0.063,0.475-0.297,0.707-0.41c0.211-0.014-0.201-0.586,0.217-1.191c0.451-0.182,1.666-1.014,1.666-1.014  c0.057-1.223-0.592-2.729,0.617-3.595c0.777-0.807,1.799-1.266,2.295-2.493c0.139-0.361,0.441-1.104-0.438-0.881  c-0.826,0.212-1.75,0.26-1.313-0.109c-0.051-0.456-0.6-0.667-1.092-1.111c-0.254-0.614-0.654-1.704-0.654-1.704l-0.875-1.349  l0.107-0.279l1.041,1.555l1.037,1.276c0.383,1.277,0.711,1.388,0.711,1.388c0.574-0.205,1.939-0.775,1.939-0.775l1.342-1.306  c0,0-0.139-0.417-0.684-0.943l-0.41-0.25c-0.09,0.257-0.566,0.352-0.566,0.352l-1.156-1.406l0.43-0.088l0.332,0.641l0.795,0.279  c0,0,0.219-0.163,0.629,0.267c0.334-0.028,1.635,0.065,1.938,0.457c0.061,0.077,1.611,4.015,1.918,4.02  c0.137,0.001,0.232,0.055,0.189-0.184c-0.055-0.11,0-2.585,0.08-3.115c0.209-0.448,0.242-0.001,0.734,0.853  C44.094,25.745,44.094,25.724,44.09,25.703z M30.432,16.162c0.106-0.329,0.738-0.441,0.738-0.441s-0.183,0.339-0.141,0.514  c0.041,0.177-0.288,0.287-0.323,0.702c-0.038,0.416-0.789,0.171-0.851,0.026S30.319,16.489,30.432,16.162z M33.125,21.748  c-0.467,0-1.863,0.141-2.247-0.138c-0.386-0.278-0.686,0.029-0.962,0.309c-0.182,0.18-0.841-0.187-1.034-0.467  c-0.191-0.279-0.839-0.259-0.839-0.259l0.147-0.796l-1.859-0.09l-1.058,0.315l-0.992,0.028l0.557-0.269l0.693-0.167  c0,0,1.008-0.841,1.31-1.092c0.258-0.212,1.276-0.094,1.276-0.094l1.121,0.821c0,0-0.249,0.643-0.358,0.78  c0.411-0.027,0.896-0.786,0.896-0.786c-0.873-0.816-0.839-1.094-0.839-1.094l1.152,0.822l0.01,0.007c0,0,0.467,1.116,0.661,1.116  c0.189,0,0.436-0.768,0.436-0.768l0.326-0.083c0.146,0.352,0.42,1.147,0.748,0.961c0.189-0.105,0.5-0.01,0.855,0.129  c0.359,0.138,0.602-0.075,0.895,0.185C33.982,22.268,33.318,21.805,33.125,21.748z M33.855,19.828  c-0.479-0.187-2.102,0.418-1.74-0.569c0.193-0.536,0.691-0.646,0.863-0.292c0.043,0.147,0.586,0.374,0.582,0.065  c-0.004-0.308,0.543-0.47,0.621-0.241C33.889,19.003,35.322,20.112,33.855,19.828z M36.918,20.767  c-0.268-0.219,0.117-0.404-0.275-0.746c-0.563-0.491-1.002-0.702-0.234-1.097c0.945-0.122,0.152,0.307,0.309,0.563  c0.084,0.136,0.563,0.593,0.938,1.153C37.963,21.104,37.182,20.984,36.918,20.767z" fill="url(#SVGID_10_)"/>
 <radialGradient cx="-23.4043" cy="14.9697" gradientTransform="matrix(0.9797 0 0 0.9952 53.1776 3.1224)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="16.9518">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M37.297,33.482l-0.91,0.925c0,0-0.549,0-0.576,0.224c-0.012,0.094-0.045,0.508-0.135,0.719  c-0.182,0.13-0.402,0.557-0.402,0.557s-0.113,0.823,0.492,0.683C36.373,36.451,38.232,33.93,37.297,33.482z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 -286)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="287" x2="287" y1="-288.5059" y2="-343.9819">
-<stop offset="0" style="stop-color:#F0F0F2"/>
-<stop offset="1" style="stop-color:#B3B5B8"/>
+<stop offset="0" style="stop-color:#F1F1F1"/>
+<stop offset="1" style="stop-color:#B4B6B6"/>
 </linearGradient>
 <path d="M52.459,2.898v54.203h-32.11c-0.626,0-1.599-0.401-2.04-0.846l-9.925-9.924  c-0.443-0.441-0.845-1.413-0.845-2.039V2.898H52.459 M53.213,2.145H6.787v42.148c0,0.829,0.478,1.986,1.064,2.572l9.925,9.926  c0.586,0.585,1.743,1.064,2.573,1.064h32.864V2.145L53.213,2.145z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 -286)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="275.5117" x2="269.9254" y1="-332.5654" y2="-338.1517">
@@ -88,37 +88,37 @@
 <path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962  c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706  l-2.747,2.749v12.253H2.749z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.415" x2="15.415" y1="28.6694" y2="12.5688">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+<stop offset="0.6606" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#BABCBB"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="27.081,28.823 3.749,28.823 3.749,14.473 15.414,5.489 27.081,14.473 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.415" x2="15.415" y1="17.313" y2="28.6013">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+<stop offset="0.6606" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#BABCBB"/>
 </linearGradient>
 <path d="M15.414,6.668l10.736,8.264V27.89H4.682V14.932L15.414,6.668 M15.414,5.489L3.749,14.473v14.351  h23.333V14.473L15.414,5.489L15.414,5.489z" fill="url(#SVGID_2__)"/>
 <polygon fill-opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 " stroke-opacity="0.2"/>
 <polygon fill="#727272" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,6.655 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15.416" x2="15.416" y1="17.9946" y2="29.1519">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <rect fill="url(#SVGID_3__)" height="10.501" width="7.001" x="11.916" y="18.322"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15.416" x2="15.416" y1="28.7466" y2="18.3602">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <path d="M17.98,19.257v8.633h-5.133v-8.633H17.98 M18.917,18.322h-7.001v10.501h7.001V18.322L18.917,18.322z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15.4136" x2="15.4136" y1="0.0352" y2="17.7271">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<stop offset="0" style="stop-color:#A8835F"/>
+<stop offset="0.2606" style="stop-color:#A86F5F"/>
+<stop offset="1" style="stop-color:#9A5047"/>
 </linearGradient>
 <path d="M15.414,5.489l11.667,11.667l2.333-2.333c0,0-12.586-12.554-13.171-13.175  c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14l2.335,2.333L15.414,5.489z" fill="url(#SVGID_5__)"/>
 <radialGradient cx="15.2969" cy="1.7559" gradientUnits="userSpaceOnUse" id="SVGID_6__" r="18.6679">
-<stop offset="0" style="stop-color:#F7D481"/>
-<stop offset="1" style="stop-color:#F5340A"/>
+<stop offset="0" style="stop-color:#D4C9A4"/>
+<stop offset="1" style="stop-color:#AF6151"/>
 </radialGradient>
 <path d="M14.553,2.616c0.724-0.688,1.102-0.653,1.689-0.034c0.516,0.549,10.433,10.442,12.705,12.709  l0.467-0.468c0,0-12.586-12.554-13.171-13.175c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14  l0.467,0.465C4.134,13.029,13.917,3.225,14.553,2.616z" fill="url(#SVGID_6__)"/>
 <rect fill-opacity="0.2" height="1.168" stroke-opacity="0.2" width="7.001" x="11.916" y="18.322"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_work.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_work.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_work.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -16,63 +16,63 @@
 <path d="M30,46.05c-8.882,0-16.107-7.333-16.107-16.346c0-9.014,7.226-16.348,16.107-16.348  c8.881,0,16.107,7.334,16.107,16.348C46.107,38.717,38.881,46.05,30,46.05L30,46.05z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <ellipse cx="30" cy="29.703" fill-opacity="0.2" rx="15.107" ry="15.347" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30.0005" x2="30.0005" y1="43.7314" y2="13.2561">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#2A3662"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <ellipse cx="30" cy="28.561" fill="url(#SVGID_3_)" rx="15.107" ry="15.346"/>
 <radialGradient cx="-23.8765" cy="20.2261" gradientTransform="matrix(0.9797 0 0 0.9952 53.1776 3.1224)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="18.5636">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <ellipse cx="30" cy="28.561" fill="url(#SVGID_4_)" rx="14.721" ry="14.953"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="29.9995" x2="29.9995" y1="13.4756" y2="43.5901">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#A6CDC2"/>
 </linearGradient>
 <path d="M30,13.607c-8.129,0-14.721,6.696-14.721,14.954c0,8.259,6.592,14.953,14.721,14.953  c8.131,0,14.721-6.693,14.721-14.953C44.721,20.303,38.131,13.607,30,13.607z M30,42.205c-7.645,0-13.862-6.316-13.862-14.079  c0-7.766,6.218-14.082,13.862-14.082s13.861,6.316,13.861,14.082C43.861,35.889,37.645,42.205,30,42.205z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.5205" x2="17.8594" y1="30.5957" y2="30.5957">
-<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="0" style="stop-color:#59595A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M16.661,28.317c-0.156-0.211-0.51-0.211-0.666-0.211c-0.308,0-0.473,0.223-0.475,0.442  v0.015v0.022c0,0.384,0.021,0.816,0.065,1.34c0.01,0.098,0.02,0.197,0.033,0.296l0.018,0.144c0.04,0.313,0.086,0.618,0.139,0.913  l0.024,0.13c0.022,0.118,0.044,0.231,0.067,0.347c0.064,0.291,0.141,0.592,0.236,0.924c0.013,0.049,0.025,0.098,0.036,0.144  c0.021,0.078,0.039,0.155,0.063,0.231l0.005,0.01l0.007,0.023c0-0.006-0.005-0.018-0.005-0.025l0.844-0.059  c0.014-0.134,0.019-0.273,0.014-0.413c-0.007-0.216-0.016-0.483-0.077-0.71l0.785-1.069l0.084-0.115v-0.146v-0.833v-0.182  l-0.127-0.127L16.661,28.317z" fill="url(#SVGID_6_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="20.0322" x2="44.5176" y1="26.2412" y2="26.2412">
-<stop offset="0" style="stop-color:#58595B"/>
+<stop offset="0" style="stop-color:#59595A"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M44.512,25.63c-0.01-0.056-0.021-0.098-0.031-0.137  c-0.008-0.03-0.014-0.061-0.021-0.088c-0.072-0.355-0.166-0.72-0.273-1.094l-0.014-0.04c-0.021-0.083-0.047-0.168-0.072-0.251  c-0.133-0.42-0.277-0.823-0.43-1.193c-0.02-0.045-0.041-0.089-0.061-0.134l-0.029-0.071c-0.148-0.34-0.309-0.679-0.477-1.004  l-0.023-0.042c-0.033-0.065-0.066-0.13-0.1-0.194c-0.211-0.38-0.424-0.746-0.648-1.082c-0.021-0.036-0.047-0.073-0.072-0.111  c-0.02-0.022-0.031-0.042-0.047-0.066c-0.213-0.313-0.438-0.618-0.668-0.907l-0.047-0.059c-0.031-0.038-0.061-0.08-0.094-0.12  c-0.268-0.326-0.551-0.644-0.844-0.943c-0.041-0.039-0.084-0.081-0.125-0.124L40.4,17.936c-0.264-0.263-0.545-0.522-0.834-0.768  l-0.057-0.05c-0.027-0.027-0.059-0.051-0.088-0.075c-0.314-0.264-0.656-0.522-1.014-0.771c-0.041-0.03-0.086-0.06-0.131-0.088  l-0.055-0.037c-0.32-0.215-0.656-0.422-0.99-0.611l-0.051-0.029c-0.029-0.017-0.059-0.031-0.084-0.049  c-0.375-0.202-0.764-0.394-1.158-0.567l-0.1-0.041l-0.109-0.045c-0.105-0.044-0.209-0.081-0.313-0.119  c-0.055-0.019-0.107-0.038-0.158-0.057l-0.201-0.076l-0.182,0.116c-0.117,0.076-0.59,0.351-0.869,0.51  c-0.309-0.041-1.057-0.136-1.811-0.21c0.23-0.023,0.555-0.05,1.006-0.081l0.064-0.861l-0.033-0.009  c-0.027-0.006-0.055-0.013-0.082-0.02l-0.064-0.012l-0.053-0.011c-0.461-0.094-0.896-0.163-1.326-0.208h-0.004l-0.061-0.006  c-0.492-0.051-0.991-0.077-1.488-0.077c-0.438,0-0.891,0.024-1.384,0.072c-0.078,0.007-0.149,0.015-0.228,0.023  c-0.488,0.055-0.915,0.122-1.319,0.205l-0.016,0.002l-0.009,0.001c-0.426,0.091-0.853,0.202-1.311,0.343  c-0.039,0.014-0.08,0.027-0.12,0.04l-0.092,0.03c-0.387,0.125-0.766,0.266-1.125,0.417c-0.028,0.013-0.051,0.021-0.071,0.028  l-0.055,0.023c-0.397,0.172-0.796,0.366-1.19,0.582c-0.042,0.022-0.083,0.047-0.125,0.071l-0.052,0.029  c-0.109,0.064-0.221,0.134-0.33,0.202l-0.143,0.093l-0.791,0.49l0.875,0.297c0.132,0.045,0.272,0.067,0.42,0.067  c0.471,0,0.928-0.236,1.295-0.424c0.147-0.077,0.366-0.19,0.457-0.208c0.107,0.032,0.215,0.049,0.323,0.049  c0.399,0,0.729-0.221,1.019-0.415l0.077-0.05c0.097-0.03,0.258-0.091,0.578-0.213c0.329-0.126,0.928-0.354,1.088-0.392  c0.31-0.004,0.679-0.049,0.942-0.215c0.248,0.042,0.688,0.112,1.143,0.172c-0.033,0.021-0.065,0.042-0.095,0.07  c-0.146,0.137-0.94,0.382-1.185,0.414c-0.457,0.057-0.639,0.292-0.712,0.476c-0.094,0.242-0.04,0.483,0.056,0.679  c-0.174,0.115-0.385,0.244-0.566,0.342c0-0.004,0.002-0.009,0.002-0.014c0.064-0.371,0.114-0.638-0.064-0.852  c-0.09-0.111-0.224-0.172-0.364-0.172c-0.21,0-0.371,0.13-0.502,0.259c-0.366,0.359-0.588,0.808-0.672,0.977l-0.016,0.031  l-0.014,0.025c-0.157,0.31-0.223,0.527-0.136,1.21c-0.039,0.028-0.154,0.073-0.313,0.073c-0.02,0-0.039-0.001-0.055-0.002  c-0.104-0.114-0.246-0.179-0.406-0.179l0,0c-0.37,0-0.873,0.423-1.497,1.257l-0.199,0.268l0.203,0.266l0.188,0.246  c-2.972,2.334-2.994,2.467-3.023,2.661c-0.007,0.02-0.033,0.1-0.068,0.211c-0.442,1.398-0.688,2.445-0.449,3.004  c0.554,1.298,1.179,2.511,1.987,2.577c0.07,0.006,0.147,0.009,0.233,0.009c0.739,0,1.94-0.229,2.518-0.348  c0.105,0.204,0.237,0.442,0.307,0.57l0.129,0.231l0.261-0.009c0,0,0.141-0.005,0.315-0.005c0.203,0,0.338,0.007,0.425,0.014  c0.314,0.937,0.917,3.093,0.805,3.539l-0.003,0.002c-1.014,1.548,0.216,3.563,0.808,4.532c0.048,0.077,0.089,0.146,0.125,0.205  c0.228,0.661,0.505,1.098,1.089,1.098c0.043,0,0.09-0.004,0.132-0.004c0.033-0.003,0.069-0.005,0.104-0.005  c0.066,0,0.11,0.009,0.159,0.026l0.055,0.02l0.056,0.004c0.109,0.01,0.214,0.023,0.32,0.039c0.177,0.025,0.364,0.052,0.556,0.052  c0.508,0,0.909-0.195,1.258-0.614c0.014,0,0.025-0.001,0.037-0.003c0.367-0.052,0.504-0.239,0.549-0.404  c0.029-0.028,0.064-0.063,0.094-0.091c0.146-0.133,0.316-0.292,0.436-0.481c0.051-0.032,0.113-0.068,0.182-0.109  c0.117-0.073,0.25-0.154,0.354-0.21c0.092-0.027,0.174-0.084,0.234-0.16c0.148-0.184,0.119-0.394,0.094-0.563  c-0.025-0.172-0.051-0.35,0.043-0.541c0.52-0.256,1.445-0.881,1.594-0.984v0.012c-0.008,0.084-0.033,0.309-0.07,0.451  c-0.197,0.199-0.359,0.503-0.414,0.605l-0.031,0.066l-0.012,0.074c-0.012,0.098-0.066,0.608,0.215,0.938  c0.143,0.165,0.346,0.258,0.574,0.258c0.07,0,0.146-0.01,0.223-0.028c0.727-0.167,2.01-1.935,2.113-2.91  c0.053-0.473-0.129-0.842-0.494-1.017l-0.273-0.131l-0.217,0.216l-0.791,0.806c-0.268,0.025-0.479,0.106-0.619,0.234  c0.008-0.344-0.025-0.696-0.061-1.04c-0.109-1.036-0.129-1.695,0.496-2.146l0.031-0.023l0.029-0.028  c0.223-0.233,0.475-0.438,0.74-0.654c0.619-0.506,1.26-1.028,1.643-1.975l0.016-0.041c0.123-0.323,0.309-0.811,0.059-1.182  c-0.063-0.091-0.193-0.233-0.441-0.286c0.326-0.131,0.576-0.237,0.6-0.246l0.076-0.032l0.059-0.058l1.34-1.304l0.195-0.192  l-0.086-0.263c-0.012-0.034-0.086-0.239-0.291-0.535c0.391,0.053,0.729,0.148,0.834,0.234c0.043,0.088,0.121,0.283,0.209,0.488  c1.471,3.528,1.678,3.708,2.063,3.715c0.014,0,0.025,0.001,0.035,0.003c0.029,0.001,0.059,0.002,0.082,0.002  c0.221,0,0.344-0.114,0.398-0.181c0.16-0.196,0.117-0.437,0.1-0.526l-0.006-0.03c-0.018-0.212-0.006-1.162,0.023-1.94  c0.002,0.003,0.004,0.004,0.004,0.007l0.791-0.319L44.512,25.63z M32.908,21.317c-0.061,0.001-0.129,0.005-0.199,0.006  c-0.227,0.013-0.486,0.023-0.742,0.023c-0.672,0-0.826-0.083-0.842-0.095c-0.081-0.057-0.162-0.101-0.247-0.133  c0.153-0.035,0.327-0.155,0.507-0.508c0.176,0.348,0.416,0.657,0.785,0.657c0.1,0,0.195-0.024,0.287-0.071  C32.582,21.2,32.785,21.27,32.908,21.317z M32.645,19.408c-0.053,0-0.094-0.002-0.125-0.004c0.033-0.091,0.076-0.145,0.107-0.175  c0.043,0.067,0.104,0.125,0.166,0.175C32.74,19.407,32.691,19.408,32.645,19.408z M29.963,20.323  c0.231,0.46,0.402,0.658,0.539,0.745c-0.334,0.027-0.586,0.242-0.796,0.448c-0.146-0.052-0.397-0.206-0.473-0.314  c-0.043-0.064-0.097-0.119-0.156-0.167C29.444,20.928,29.766,20.583,29.963,20.323z M28.69,19.986l-0.48-0.025l-1.606-0.078  c0.198-0.164,0.385-0.318,0.493-0.409c0.03-0.012,0.145-0.043,0.427-0.043c0.17,0,0.332,0.012,0.438,0.021L28.69,19.986z" fill="url(#SVGID_7_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="-23.4248" cy="14.9639" gradientTransform="matrix(0.9797 0 0 0.9952 53.1776 3.1224)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="16.9456">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M15.949,28.552c0,0,0,0,0,0.002c0,0.003,0,0.006,0,0.01c0,0.446,0.029,0.886,0.065,1.32  c0.013,0.144,0.032,0.286,0.048,0.43c0.038,0.298,0.084,0.594,0.135,0.887c0.031,0.153,0.06,0.309,0.09,0.463  c0.066,0.301,0.146,0.6,0.229,0.893c0.035,0.121,0.062,0.246,0.097,0.363c0.007,0.013,0.011,0.025,0.013,0.039  c0.012-0.117,0.016-0.234,0.012-0.355c-0.027-0.86-0.163-0.75-0.163-0.75l0.955-1.305v-0.833l-1.12-1.138  C16.309,28.578,15.949,28.521,15.949,28.552z" fill="url(#SVGID_8_)"/>
 <radialGradient cx="-23.4033" cy="14.9658" gradientTransform="matrix(0.9797 0 0 0.9952 53.1776 3.1224)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="16.9596">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M24.947,15.643c0.412,0.139,0.751-0.143,1.136-0.394c0.136-0.027,1.647-0.641,1.813-0.641  c0.163,0,0.712-0.021,0.849-0.243c0,0,2.365,0.419,2.724,0.279c0.192-0.077,1.009-0.144,1.708-0.189  c-0.037-0.009-0.076-0.02-0.113-0.029c-0.039-0.008-0.074-0.013-0.113-0.021c-0.439-0.091-0.885-0.162-1.336-0.208  c0,0-0.006,0-0.01-0.002c-0.476-0.048-0.957-0.074-1.447-0.074c-0.453,0-0.901,0.027-1.345,0.07  c-0.077,0.007-0.153,0.016-0.233,0.026c-0.428,0.047-0.853,0.11-1.27,0.195c-0.007,0.003-0.016,0.003-0.021,0.004  c-0.433,0.09-0.855,0.203-1.272,0.331c-0.071,0.023-0.141,0.047-0.209,0.069c-0.37,0.123-0.734,0.257-1.091,0.405  c-0.041,0.019-0.084,0.035-0.125,0.051c-0.394,0.171-0.775,0.359-1.15,0.563c-0.056,0.03-0.11,0.064-0.165,0.095  c-0.161,0.09-0.311,0.19-0.467,0.288C23.581,16.479,24.538,15.503,24.947,15.643z" fill="url(#SVGID_9_)"/>
 <radialGradient cx="-23.4023" cy="14.9634" gradientTransform="matrix(0.9797 0 0 0.9952 53.1776 3.1224)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="16.9557">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.3152" style="stop-color:#B7CC97"/>
+<stop offset="0.7273" style="stop-color:#568E4C"/>
+<stop offset="1" style="stop-color:#255541"/>
 </radialGradient>
 <path d="M44.09,25.703c-0.016-0.073-0.037-0.142-0.053-0.213c-0.07-0.356-0.164-0.708-0.266-1.054  c-0.025-0.094-0.051-0.189-0.08-0.282c-0.125-0.394-0.264-0.781-0.416-1.159c-0.029-0.065-0.061-0.131-0.09-0.196  c-0.143-0.333-0.297-0.658-0.463-0.977c-0.037-0.077-0.078-0.155-0.117-0.23c-0.197-0.359-0.406-0.709-0.627-1.051  c-0.041-0.059-0.084-0.114-0.121-0.173c-0.205-0.303-0.42-0.596-0.648-0.881c-0.043-0.055-0.088-0.114-0.135-0.173  c-0.262-0.314-0.533-0.619-0.82-0.914c-0.047-0.05-0.098-0.098-0.15-0.148c-0.26-0.259-0.535-0.511-0.813-0.75  c-0.047-0.04-0.092-0.083-0.141-0.123c-0.316-0.261-0.645-0.511-0.982-0.746c-0.061-0.042-0.119-0.082-0.182-0.121  c-0.311-0.211-0.631-0.411-0.961-0.595c-0.047-0.025-0.088-0.053-0.133-0.077c-0.365-0.199-0.74-0.383-1.123-0.55  c-0.07-0.029-0.139-0.055-0.205-0.085c-0.15-0.063-0.303-0.112-0.455-0.17c-0.182,0.118-1.016,0.597-1.016,0.597  s-3.622-0.502-3.869-0.251c-0.249,0.251-1.213,0.508-1.434,0.537c-0.219,0.03-0.674,0.148-0.129,0.832  c-0.081,0.084-1.642,1.186-1.642,0.686c0-0.502,0.351-1.4-0.139-0.919c-0.351,0.346-0.563,0.813-0.605,0.902  c-0.115,0.223-0.187,0.328-0.104,0.97c0.085,0.642-1.005,0.64-1.08,0.473c-0.196-0.445-1.274,0.999-1.274,0.999l0.455,0.594  c0,0-3.181,2.486-3.206,2.654c-0.028,0.168-0.822,2.328-0.547,2.97c0.274,0.644,0.969,2.262,1.626,2.313  c0.861,0.072,2.951-0.398,2.951-0.398c0.055,0.142,0.45,0.854,0.45,0.854s1.021-0.036,1.081,0.077  c0.018,0.038,1.234,3.668,0.832,4.149c-0.957,1.456,0.547,3.589,0.965,4.312c0.419,1.238,0.688,0.684,1.239,0.889  c0.679,0.058,1.25,0.313,1.826-0.439c0.166-0.141,0.451-0.029,0.451-0.225c0-0.107,0.494-0.427,0.619-0.729  c0.133-0.063,0.475-0.297,0.707-0.41c0.211-0.014-0.201-0.586,0.217-1.191c0.451-0.182,1.666-1.014,1.666-1.014  c0.057-1.223-0.592-2.729,0.617-3.595c0.777-0.807,1.799-1.266,2.295-2.493c0.139-0.361,0.441-1.104-0.438-0.881  c-0.826,0.212-1.75,0.26-1.313-0.109c-0.051-0.456-0.6-0.667-1.092-1.111c-0.254-0.614-0.654-1.704-0.654-1.704l-0.875-1.349  l0.107-0.279l1.041,1.555l1.037,1.276c0.383,1.277,0.711,1.388,0.711,1.388c0.574-0.205,1.939-0.775,1.939-0.775l1.342-1.306  c0,0-0.139-0.417-0.684-0.943l-0.41-0.25c-0.09,0.257-0.566,0.352-0.566,0.352l-1.156-1.406l0.43-0.088l0.332,0.641l0.795,0.279  c0,0,0.219-0.163,0.629,0.267c0.334-0.028,1.635,0.065,1.938,0.457c0.061,0.077,1.611,4.015,1.918,4.02  c0.137,0.001,0.232,0.055,0.189-0.184c-0.055-0.11,0-2.585,0.08-3.115c0.209-0.448,0.242-0.001,0.734,0.853  C44.094,25.745,44.094,25.724,44.09,25.703z M30.432,16.162c0.106-0.329,0.738-0.441,0.738-0.441s-0.183,0.339-0.141,0.514  c0.041,0.177-0.288,0.287-0.323,0.702c-0.038,0.416-0.789,0.171-0.851,0.026S30.319,16.489,30.432,16.162z M33.125,21.748  c-0.467,0-1.863,0.141-2.247-0.138c-0.386-0.278-0.686,0.029-0.962,0.309c-0.182,0.18-0.841-0.187-1.034-0.467  c-0.191-0.279-0.839-0.259-0.839-0.259l0.147-0.796l-1.859-0.09l-1.058,0.315l-0.992,0.028l0.557-0.269l0.693-0.167  c0,0,1.008-0.841,1.31-1.092c0.258-0.212,1.276-0.094,1.276-0.094l1.121,0.821c0,0-0.249,0.643-0.358,0.78  c0.411-0.027,0.896-0.786,0.896-0.786c-0.873-0.816-0.839-1.094-0.839-1.094l1.152,0.822l0.01,0.007c0,0,0.467,1.116,0.661,1.116  c0.189,0,0.436-0.768,0.436-0.768l0.326-0.083c0.146,0.352,0.42,1.147,0.748,0.961c0.189-0.105,0.5-0.01,0.855,0.129  c0.359,0.138,0.602-0.075,0.895,0.185C33.982,22.268,33.318,21.805,33.125,21.748z M33.855,19.828  c-0.479-0.187-2.102,0.418-1.74-0.569c0.193-0.536,0.691-0.646,0.863-0.292c0.043,0.147,0.586,0.374,0.582,0.065  c-0.004-0.308,0.543-0.47,0.621-0.241C33.889,19.003,35.322,20.112,33.855,19.828z M36.918,20.767  c-0.268-0.219,0.117-0.404-0.275-0.746c-0.563-0.491-1.002-0.702-0.234-1.097c0.945-0.122,0.152,0.307,0.309,0.563  c0.084,0.136,0.563,0.593,0.938,1.153C37.963,21.104,37.182,20.984,36.918,20.767z" fill="url(#SVGID_10_)"/>
 <radialGradient cx="-23.4043" cy="14.9697" gradientTransform="matrix(0.9797 0 0 0.9952 53.1776 3.1224)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="16.9518">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+<stop offset="0" style="stop-color:#71A949"/>
+<stop offset="0.3152" style="stop-color:#71A949"/>
+<stop offset="0.7273" style="stop-color:#3E7E53"/>
+<stop offset="1" style="stop-color:#254F55"/>
 </radialGradient>
 <path d="M37.297,33.482l-0.91,0.925c0,0-0.549,0-0.576,0.224c-0.012,0.094-0.045,0.508-0.135,0.719  c-0.182,0.13-0.402,0.557-0.402,0.557s-0.113,0.823,0.492,0.683C36.373,36.451,38.232,33.93,37.297,33.482z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 -286)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="287" x2="287" y1="-288.5059" y2="-343.9819">
-<stop offset="0" style="stop-color:#F0F0F2"/>
-<stop offset="1" style="stop-color:#B3B5B8"/>
+<stop offset="0" style="stop-color:#F1F1F1"/>
+<stop offset="1" style="stop-color:#B4B6B6"/>
 </linearGradient>
 <path d="M52.459,2.898v54.203h-32.11c-0.626,0-1.599-0.401-2.04-0.846l-9.925-9.924  c-0.443-0.441-0.845-1.413-0.845-2.039V2.898H52.459 M53.213,2.145H6.787v42.148c0,0.829,0.478,1.986,1.064,2.572l9.925,9.926  c0.586,0.585,1.743,1.064,2.573,1.064h32.864V2.145L53.213,2.145z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 -286)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="275.5117" x2="269.9254" y1="-332.5654" y2="-338.1517">
@@ -87,93 +87,93 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill="none" height="30" width="30"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="654.6" x2="654.6" y1="-558.3" y2="-601.7">
-<stop offset="0" stop-color="#DFE1E6"/>
-<stop offset="1" stop-color="#BDBEC3"/>
+<stop offset="0" stop-color="#E1E4E3"/>
+<stop offset="1" stop-color="#BFC1C1"/>
 </linearGradient>
 <rect fill="url(#SVGID_1__)" height="21.5" width="17.33" x="5.158" y="3.499"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="654.6" x2="654.6" y1="-558.9" y2="-602.2">
-<stop offset="0" stop-color="#E7E9EF"/>
-<stop offset="1" stop-color="#C8C9CE"/>
+<stop offset="0" stop-color="#E9EDEB"/>
+<stop offset="1" stop-color="#CACCCC"/>
 </linearGradient>
 <path d="M21.99,3.999v20.5h-16.33v-20.5h16.33m0.5-0.501h-17.33v21.5h17.33v-21.5z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="642.6" x2="642.6" y1="-567.9" y2="-562.2">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_3__)" height="3" width="3" x="6.324" y="5.146"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="650.6" x2="650.6" y1="-567.9" y2="-562.2">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_4__)" height="3" width="3" x="10.32" y="5.146"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="666.6" x2="666.6" y1="-567.9" y2="-562.2">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_5__)" height="3" width="3" x="18.32" y="5.146"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="658.6" x2="658.6" y1="-567.9" y2="-562.2">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_6__)" height="3" width="3" x="14.32" y="5.146"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_7__" x1="642.6" x2="642.6" y1="-576.5" y2="-570.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_7__)" height="3" width="3" x="6.324" y="9.458"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_8__" x1="650.6" x2="650.6" y1="-576.5" y2="-570.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_8__)" height="3" width="3" x="10.32" y="9.458"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_9__" x1="666.6" x2="666.6" y1="-576.5" y2="-570.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_9__)" height="3" width="3" x="18.32" y="9.458"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_10__" x1="658.6" x2="658.6" y1="-576.5" y2="-570.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_10__)" height="3" width="3" x="14.32" y="9.458"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_11__" x1="642.6" x2="642.6" y1="-594.5" y2="-588.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_11__)" height="3" width="3" x="6.324" y="18.46"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_12__" x1="650.6" x2="650.6" y1="-594.5" y2="-588.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_12__)" height="3" width="3" x="10.32" y="18.46"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_13__" x1="666.6" x2="666.6" y1="-594.5" y2="-588.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_13__)" height="3" width="3" x="18.32" y="18.46"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="658.6" x2="658.6" y1="-594.5" y2="-588.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_14_)" height="3" width="3" x="14.32" y="18.46"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="642.6" x2="642.6" y1="-585.5" y2="-579.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_15_)" height="3" width="3" x="6.324" y="13.96"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="650.6" x2="650.6" y1="-585.5" y2="-579.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_16_)" height="3" width="3" x="10.32" y="13.96"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="666.6" x2="666.6" y1="-585.5" y2="-579.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_17_)" height="3" width="3" x="18.32" y="13.96"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="658.6" x2="658.6" y1="-585.5" y2="-579.8">
-<stop offset="0" stop-color="#75BCFF"/>
-<stop offset="1" stop-color="#0070A1"/>
+<stop offset="0" stop-color="#9ED6D1"/>
+<stop offset="1" stop-color="#304971"/>
 </linearGradient>
 <rect fill="url(#SVGID_18_)" height="3" width="3" x="14.32" y="13.96"/>
 <polygon fill-opacity="0.3" points="22.49,25,22.49,14.85,12.51,11.92,12.51,25" stroke-opacity="0.3" style="enable-background:new;"/>
@@ -183,8 +183,8 @@
 </linearGradient>
 <polygon fill="url(#SVGID_19_)" points="24.84,16.25,13.51,12.92,13.51,26.5,24.84,26.5"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="665.4" x2="665.4" y1="-582" y2="-605.1">
-<stop offset="0" stop-color="#DBDDE2"/>
-<stop offset="1" stop-color="#B5B6BA"/>
+<stop offset="0" stop-color="#DDE0DF"/>
+<stop offset="1" stop-color="#B7B8B9"/>
 </linearGradient>
 <path d="M14.01,13.58l10.33,3.039v9.38h-10.33v-12.42m-0.5-0.665v13.58h11.33v-10.25l-11.33-3.33z" fill="url(#SVGID_20_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,23 +6,23 @@
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="4.2583" y2="55.2583">
 <stop offset="0" style="stop-color:#E8E8E8"/>
-<stop offset="0.3576" style="stop-color:#B2BDC2"/>
-<stop offset="0.7576" style="stop-color:#595C5E"/>
-<stop offset="1" style="stop-color:#A1ABB0"/>
+<stop offset="0.3576" style="stop-color:#B7BDBC"/>
+<stop offset="0.7576" style="stop-color:#5B5B5D"/>
+<stop offset="1" style="stop-color:#A6ABAB"/>
 </linearGradient>
 <path d="M7.9,55.5c-1.875,0-3.4-1.525-3.4-3.4V7.9c0-1.876,1.525-3.4,3.4-3.4H52.1c1.874,0,3.4,1.524,3.4,3.4  V52.1c0,1.875-1.526,3.4-3.4,3.4H7.9z" fill="url(#SVGID_1_)"/>
 <path d="M7.9,54.771c-1.473,0-2.672-1.198-2.672-2.672V7.9c0-1.474,1.199-2.672,2.672-2.672H52.1  c1.473,0,2.672,1.198,2.672,2.672V52.1c0,1.474-1.199,2.672-2.672,2.672H7.9z" fill="#FFFFFF" fill-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="6.2002" y2="53.7998">
-<stop offset="0" style="stop-color:#D7DDDE"/>
+<stop offset="0" style="stop-color:#D9DCDA"/>
 <stop offset="0.3697" style="stop-color:#FFFFFF"/>
-<stop offset="0.8061" style="stop-color:#AFB5B7"/>
-<stop offset="1" style="stop-color:#E0E4E5"/>
+<stop offset="0.8061" style="stop-color:#B1B5B4"/>
+<stop offset="1" style="stop-color:#E1E4E2"/>
 </linearGradient>
 <path d="M7.9,53.8c-0.938,0-1.7-0.764-1.7-1.7V7.9c0-0.938,0.763-1.7,1.7-1.7H52.1  c0.938,0,1.699,0.762,1.699,1.7V52.1c0,0.937-0.762,1.7-1.699,1.7H7.9z" fill="url(#SVGID_2_)"/>
 <path d="M42.355,34.462v-2.344H28.438l5.785,8.718h2.457v-1.702h5.697v5.438H36.68v-1.194h-3.084l-8.278-11.259  H19.01c-0.463,1.753-1.877,3.036-3.543,3.036c-2.047,0-3.698-1.896-3.698-4.239c0-2.334,1.651-4.236,3.69-4.236  c1.644,0,3.025,1.217,3.519,2.892h2.839l7.508-10.796l4.557-0.072c0.463-1.075,1.432-1.816,2.535-1.816  c2.379,0,3.333,1.468,3.333,3.271c0,1.807-0.897,3.261-3.333,3.265c-1.232,0-2.279-0.919-2.678-2.183h-2.855L24.95,29.57h17.405  v-2.913l5.875,3.909L42.355,34.462z" fill="#FFFFFF"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -275.8623 -411.166)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="305.8613" x2="305.8613" y1="427.3232" y2="455.0088">
-<stop offset="0" style="stop-color:#797C80"/>
-<stop offset="1" style="stop-color:#3F4243"/>
+<stop offset="0" style="stop-color:#7B7C7E"/>
+<stop offset="1" style="stop-color:#404142"/>
 </linearGradient>
 <path d="M42.355,33.734v-2.343H28.438l5.785,8.715h2.457v-1.701h5.697v5.438H36.68v-1.193h-3.084  l-8.278-11.258H19.01c-0.463,1.752-1.877,3.034-3.543,3.034c-2.047,0-3.698-1.896-3.698-4.238c0-2.335,1.651-4.237,3.69-4.237  c1.644,0,3.025,1.217,3.519,2.892h2.839l7.508-10.796l4.557-0.072c0.463-1.075,1.432-1.816,2.535-1.816  c2.379,0,3.333,1.468,3.333,3.271c0,1.807-0.897,3.262-3.333,3.264c-1.232,0-2.279-0.918-2.678-2.183h-2.855l-5.933,8.333h17.405  v-2.913l5.875,3.91L42.355,33.734z" fill="url(#SVGID_3_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb_memory.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb_memory.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb_memory.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -20,8 +20,8 @@
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <path d="M17.227,22.083V2.378h25.547v19.705H17.227 M16.57,22.739H43.43V1.724H16.57V22.739L16.57,22.739z" fill="url(#SVGID_3_)"/>
-<rect fill="#231F20" fill-opacity="0.4" height="0.638" stroke-opacity="0.4" width="26.859" x="16.57" y="21.034"/>
-<rect fill="#231F20" fill-opacity="0.15" height="0.639" stroke-opacity="0.15" width="26.859" x="16.57" y="20.378"/>
+<rect fill="#222021" fill-opacity="0.4" height="0.638" stroke-opacity="0.4" width="26.859" x="16.57" y="21.034"/>
+<rect fill="#222021" fill-opacity="0.15" height="0.639" stroke-opacity="0.15" width="26.859" x="16.57" y="20.378"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="59" y2="22.2708">
 <stop offset="0" style="stop-color:#EBEBEB"/>
 <stop offset="0.7455" style="stop-color:#000000"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -19,8 +19,8 @@
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559  c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
 <path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0  c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,47 +4,47 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="12.38" x2="17.62" y1="23.65" y2="23.65">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <rect fill="url(#SVGID_1__)" height="7.853" width="5.105" x="12.45" y="19.72"/>
 <path d="M12.45,24.66c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.285z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -56,16 +56,16 @@
 </linearGradient>
 <path d="M15,23.7c-5.98,0-10.85-4.867-10.85-10.85s4.87-10.85,10.85-10.85c5.982,0,10.85,4.866,10.85,10.85s-4.87,10.85-10.85,10.85z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="2.614" y2="23.03">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.0667" stop-color="#D1D7D9"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#7C8487"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<stop offset="0" stop-color="#D3D7D5"/>
+<stop offset="0.0667" stop-color="#D3D7D5"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#7F8384"/>
+<stop offset="1" stop-color="#AFB3B2"/>
 </linearGradient>
 <circle cx="15" cy="12.85" fill="url(#SVGID_3__)" r="10.21"/>
 <path d="M15,21.99c-5.315,0-9.657-4.23-9.843-9.5-0.004,0.116-0.009,0.231-0.009,0.349,0,5.431,4.419,9.851,9.852,9.851s9.852-4.42,9.852-9.851c0-0.117-0.005-0.232-0.009-0.349-0.18,5.27-4.52,9.5-9.84,9.5z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#222021" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="3.721" y2="20.35">
 <stop offset="0" stop-color="#CFCFCF"/>
 <stop offset="0.1091" stop-color="#CFCFCF"/>
@@ -75,7 +75,7 @@
 <path d="M15,20.43c-2.216-0.002-4.298-0.864-5.864-2.432-1.567-1.566-2.428-3.65-2.427-5.866,0-4.573,3.723-8.293,8.296-8.293,2.218,0.001,4.3,0.864,5.866,2.432s2.43,3.651,2.428,5.867c-0.001,4.573-3.723,8.292-8.295,8.292h-0.004z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15" x2="15" y1="4.368" y2="19.72">
 <stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="1" stop-color="#606769"/>
+<stop offset="1" stop-color="#636566"/>
 </linearGradient>
 <circle cx="15" cy="12.13" fill="url(#SVGID_5__)" r="7.657"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="15" x2="15" y1="5.772" y2="18.45">
@@ -102,29 +102,29 @@
 </radialGradient>
 <circle cx="15" cy="12.13" fill="url(#SVGID_8_)" r="4.712"/>
 <radialGradient cx="23.96" cy="3.55" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.36">
-<stop offset="0" stop-color="#A700F5"/>
-<stop offset="0.3091" stop-color="#A700F5"/>
-<stop offset="0.4364" stop-color="#5E008A"/>
-<stop offset="0.8061" stop-color="#0E1402"/>
-<stop offset="1" stop-color="#0E1402"/>
+<stop offset="0" stop-color="#8D4AAB"/>
+<stop offset="0.3091" stop-color="#8D4AAB"/>
+<stop offset="0.4364" stop-color="#532961"/>
+<stop offset="0.8061" stop-color="#070F0F"/>
+<stop offset="1" stop-color="#070F0F"/>
 </radialGradient>
 <path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0.004-2.327,1.89-4.21,4.213-4.21,2.33,0.003,4.21,1.888,4.21,4.21z" fill="url(#SVGID_9_)"/>
 <radialGradient cx="25.17" cy="13.25" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.611">
-<stop offset="0" stop-color="#48630C"/>
+<stop offset="0" stop-color="#264932"/>
 <stop offset="0.7879" stop-color="#000000"/>
 <stop offset="1" stop-color="#000000"/>
 </radialGradient>
 <path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0,0,1.444,2.569,4.213,2.569,2.77,0,4.21-2.57,4.21-2.57z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.98" x2="14.98" y1="7.065" y2="12.09">
-<stop offset="0" stop-color="#F8FBFF"/>
+<stop offset="0" stop-color="#FAFDFB"/>
 <stop offset="1" stop-color="#808080"/>
 </linearGradient>
 <path d="M14.98,12.07c1.828,0,3.549-0.277,5.067-0.765-0.431-2.41-2.532-4.239-5.067-4.239-2.532,0-4.632,1.83-5.065,4.239,1.515,0.49,3.235,0.77,5.065,0.77z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.762" x2="24.29" y1="26.72" y2="26.72">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <path d="M24.24,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879h-14.72c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639h18.44z" fill="url(#SVGID_12_)"/>
 <path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626h-17.53c-0.164,0.19-0.293,0.4-0.377,0.63z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_active.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_active.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_active.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,39 +3,39 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+<stop offset="0" style="stop-color:#93AC5D"/>
+<stop offset="0.297" style="stop-color:#93AC5D"/>
+<stop offset="0.6667" style="stop-color:#356742"/>
+<stop offset="0.7939" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#447B42"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399  c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514  c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737  c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12  c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B1BE95" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B1BE95" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+<stop offset="0" style="stop-color:#315D3E"/>
+<stop offset="0.5" style="stop-color:#1E3A31"/>
+<stop offset="1" style="stop-color:#2E593D"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31  c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535  c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="12.38" x2="17.62" y1="23.65" y2="23.65">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <rect fill="url(#SVGID_1__)" height="7.853" width="5.105" x="12.45" y="19.72"/>
 <path d="M12.45,24.66c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.285z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -47,16 +47,16 @@
 </linearGradient>
 <path d="M15,23.7c-5.98,0-10.85-4.867-10.85-10.85s4.87-10.85,10.85-10.85c5.982,0,10.85,4.866,10.85,10.85s-4.87,10.85-10.85,10.85z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="2.614" y2="23.03">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.0667" stop-color="#D1D7D9"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#7C8487"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<stop offset="0" stop-color="#D3D7D5"/>
+<stop offset="0.0667" stop-color="#D3D7D5"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#7F8384"/>
+<stop offset="1" stop-color="#AFB3B2"/>
 </linearGradient>
 <circle cx="15" cy="12.85" fill="url(#SVGID_3__)" r="10.21"/>
 <path d="M15,21.99c-5.315,0-9.657-4.23-9.843-9.5-0.004,0.116-0.009,0.231-0.009,0.349,0,5.431,4.419,9.851,9.852,9.851s9.852-4.42,9.852-9.851c0-0.117-0.005-0.232-0.009-0.349-0.18,5.27-4.52,9.5-9.84,9.5z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#222021" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="3.721" y2="20.35">
 <stop offset="0" stop-color="#CFCFCF"/>
 <stop offset="0.1091" stop-color="#CFCFCF"/>
@@ -66,7 +66,7 @@
 <path d="M15,20.43c-2.216-0.002-4.298-0.864-5.864-2.432-1.567-1.566-2.428-3.65-2.427-5.866,0-4.573,3.723-8.293,8.296-8.293,2.218,0.001,4.3,0.864,5.866,2.432s2.43,3.651,2.428,5.867c-0.001,4.573-3.723,8.292-8.295,8.292h-0.004z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="4.368" y2="19.72">
 <stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="1" stop-color="#606769"/>
+<stop offset="1" stop-color="#636566"/>
 </linearGradient>
 <circle cx="15" cy="12.13" fill="url(#SVGID_5_)" r="7.657"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15" x2="15" y1="5.772" y2="18.45">
@@ -93,29 +93,29 @@
 </radialGradient>
 <circle cx="15" cy="12.13" fill="url(#SVGID_8_)" r="4.712"/>
 <radialGradient cx="23.96" cy="3.55" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.36">
-<stop offset="0" stop-color="#A700F5"/>
-<stop offset="0.3091" stop-color="#A700F5"/>
-<stop offset="0.4364" stop-color="#5E008A"/>
-<stop offset="0.8061" stop-color="#0E1402"/>
-<stop offset="1" stop-color="#0E1402"/>
+<stop offset="0" stop-color="#8D4AAB"/>
+<stop offset="0.3091" stop-color="#8D4AAB"/>
+<stop offset="0.4364" stop-color="#532961"/>
+<stop offset="0.8061" stop-color="#070F0F"/>
+<stop offset="1" stop-color="#070F0F"/>
 </radialGradient>
 <path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0.004-2.327,1.89-4.21,4.213-4.21,2.33,0.003,4.21,1.888,4.21,4.21z" fill="url(#SVGID_9_)"/>
 <radialGradient cx="25.17" cy="13.25" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.611">
-<stop offset="0" stop-color="#48630C"/>
+<stop offset="0" stop-color="#264932"/>
 <stop offset="0.7879" stop-color="#000000"/>
 <stop offset="1" stop-color="#000000"/>
 </radialGradient>
 <path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0,0,1.444,2.569,4.213,2.569,2.77,0,4.21-2.57,4.21-2.57z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.98" x2="14.98" y1="7.065" y2="12.09">
-<stop offset="0" stop-color="#F8FBFF"/>
+<stop offset="0" stop-color="#FAFDFB"/>
 <stop offset="1" stop-color="#808080"/>
 </linearGradient>
 <path d="M14.98,12.07c1.828,0,3.549-0.277,5.067-0.765-0.431-2.41-2.532-4.239-5.067-4.239-2.532,0-4.632,1.83-5.065,4.239,1.515,0.49,3.235,0.77,5.065,0.77z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.762" x2="24.29" y1="26.72" y2="26.72">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <path d="M24.24,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879h-14.72c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639h18.44z" fill="url(#SVGID_12_)"/>
 <path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626h-17.53c-0.164,0.19-0.293,0.4-0.377,0.63z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_end.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_end.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_end.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,47 +5,47 @@
 <rect fill="none" height="60" width="60"/>
 <g>
 <radialGradient cx="-1374.2305" cy="2708.6123" gradientTransform="matrix(0 1 1 0 -2678.1238 1416.3748)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="36.2612">
-<stop offset="0" style="stop-color:#FDA932"/>
-<stop offset="0.297" style="stop-color:#FDA932"/>
-<stop offset="0.6667" style="stop-color:#CF170D"/>
-<stop offset="0.7939" style="stop-color:#FD6E2C"/>
-<stop offset="1" style="stop-color:#FD6E2C"/>
+<stop offset="0" style="stop-color:#C0A26F"/>
+<stop offset="0.297" style="stop-color:#C0A26F"/>
+<stop offset="0.6667" style="stop-color:#954749"/>
+<stop offset="0.7939" style="stop-color:#BE8A6B"/>
+<stop offset="1" style="stop-color:#BE8A6B"/>
 </radialGradient>
 <path d="M17.884,35.418c0.413-0.078,0.579-0.318,0.603-0.895c0.027-0.721,0.29-3.172,0.431-3.764   c0.124-0.521,0.342-0.805,0.941-0.98c0.75-0.22,3.188-1.037,10.143-1.038c6.954,0,9.393,0.807,10.141,1.038   c0.651,0.201,0.777,0.389,0.941,0.98c0.162,0.586,0.402,3.043,0.431,3.764c0.024,0.576,0.16,0.82,0.577,0.883   c0.731,0.113,13.291,2.238,14.601,2.502c0.794,0.16,1.237,0.045,1.292-0.705c0.231-3.012-2.009-7.641-3.005-9.067   c-0.887-1.274-1.687-2.667-3.82-3.557c-2.028-0.845-12.133-2.548-21.158-2.548c-9.026-0.001-19.132,1.704-21.159,2.548   c-2.133,0.889-2.935,2.282-3.82,3.555c-0.995,1.429-3.237,6.055-3.006,9.069c0.058,0.748,0.5,0.863,1.292,0.703   C4.62,37.645,17.169,35.549,17.884,35.418z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0 1 1 0 -2678.1238 1416.3748)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1383.7373" x2="-1383.3947" y1="2721.2969" y2="2718.4587">
-<stop offset="0" style="stop-color:#C8540E"/>
-<stop offset="1" style="stop-color:#990C00"/>
+<stop offset="0" style="stop-color:#905A46"/>
+<stop offset="1" style="stop-color:#6B2E36"/>
 </linearGradient>
 <path d="M40.145,29.779c0.65,0.202,0.775,0.39,0.94,0.981c0.162,0.584,0.401,3.043,0.431,3.762   c0.024,0.578,0.16,0.82,0.576,0.885c0.046,0.008,0.062,0.01,0.063,0.01c0.244,0.039,0.993,0.164,2.039,0.342   c-0.026-0.258-0.37-3.525-1.036-4.357C41.938,29.877,40.145,29.779,40.145,29.779z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0 1 -1 0 -3579.3215 1416.3782)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1383.7422" x2="-1383.3992" y1="-3596.1938" y2="-3599.0347">
-<stop offset="0" style="stop-color:#C8540E"/>
-<stop offset="1" style="stop-color:#990C00"/>
+<stop offset="0" style="stop-color:#905A46"/>
+<stop offset="1" style="stop-color:#6B2E36"/>
 </linearGradient>
 <path d="M19.841,29.779c-0.654,0.203-0.778,0.39-0.942,0.981c-0.163,0.586-0.404,3.045-0.433,3.766   c-0.021,0.574-0.158,0.818-0.574,0.883c-0.047,0.008-0.061,0.01-0.061,0.01c-0.245,0.039-0.994,0.164-2.041,0.338   c0.028-0.254,0.371-3.523,1.036-4.355C18.043,29.876,19.841,29.779,19.841,29.779z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 51.2805 -77.5527)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="78.5283" x2="43.332" y1="-72.9224" y2="-108.1187">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+<stop offset="0" style="stop-color:#D3C59A"/>
+<stop offset="1" style="stop-color:#D0BA98"/>
 </linearGradient>
 <path d="M5.021,28.75c0.887-1.275,1.688-2.668,3.819-3.555   c2.029-0.846,12.134-2.55,21.16-2.549c9.027-0.001,19.13,1.703,21.161,2.549c2.131,0.888,2.933,2.28,3.819,3.554   c0.912,1.311,2.875,5.32,3.009,8.3c0.146-3.016-2.031-7.511-3.009-8.915c-0.888-1.274-1.688-2.666-3.82-3.556   c-2.028-0.845-12.134-2.548-21.158-2.549c-9.027,0.001-19.133,1.706-21.16,2.55c-2.133,0.889-2.935,2.282-3.82,3.555   c-0.979,1.404-3.158,5.899-3.009,8.915C2.146,34.068,4.108,30.06,5.021,28.75z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 51.2805 -77.5527)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="82.8936" x2="42.849" y1="-73.0874" y2="-113.132">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+<stop offset="0" style="stop-color:#D3C59A"/>
+<stop offset="1" style="stop-color:#D0BA98"/>
 </linearGradient>
 <path d="M17.884,35.418c0.413-0.078,0.579-0.318,0.603-0.895   c0.027-0.721,0.29-3.172,0.431-3.764c0.124-0.521,0.342-0.805,0.941-0.98c0.75-0.22,3.188-1.037,10.143-1.038   c6.954,0,9.393,0.807,10.141,1.038c0.651,0.201,0.777,0.389,0.941,0.98c0.162,0.586,0.402,3.043,0.431,3.764   c0.024,0.576,0.16,0.82,0.577,0.883c0.731,0.113,13.291,2.238,14.601,2.502c0.794,0.16,1.237,0.045,1.292-0.705   c0.027-0.354,0.018-0.73-0.017-1.119c-0.094,0.643-0.526,0.748-1.276,0.594c-1.311-0.262-13.869-2.385-14.6-2.5   c-0.418-0.064-0.553-0.307-0.576-0.883c-0.029-0.719-0.27-3.177-0.433-3.765c-0.163-0.59-0.287-0.777-0.941-0.979   c-0.746-0.229-3.188-1.039-10.14-1.037c-6.954,0-9.393,0.817-10.143,1.037c-0.599,0.176-0.816,0.459-0.94,0.981   c-0.141,0.59-0.403,3.042-0.433,3.763c-0.022,0.576-0.189,0.816-0.603,0.893C17.168,34.32,4.62,36.414,3.309,36.68   c-0.751,0.15-1.183,0.049-1.275-0.596c-0.036,0.389-0.044,0.766-0.018,1.119c0.058,0.748,0.5,0.861,1.292,0.703   C4.62,37.645,17.169,35.549,17.884,35.418z" fill="url(#SVGID_5_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(0 1 1 0 -2702.5007 1379.2039)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-1353.1973" x2="-1353.1973" y1="2756.7813" y2="2707.613">
-<stop offset="0" style="stop-color:#B6661B"/>
-<stop offset="0.5" style="stop-color:#700303"/>
-<stop offset="1" style="stop-color:#B6661B"/>
+<stop offset="0" style="stop-color:#885F4A"/>
+<stop offset="0.5" style="stop-color:#4F2430"/>
+<stop offset="1" style="stop-color:#885F4A"/>
 </linearGradient>
 <path d="M6.355,27.326c2.275-0.843,14.095-2.529,23.646-2.53   c9.552,0,21.371,1.687,23.646,2.53c0.431,0.161,0.804,0.343,1.144,0.531c-0.233-0.341-0.472-0.685-0.733-1.024   c-0.069-0.028-0.127-0.056-0.196-0.082c-2.309-0.856-14.245-2.568-23.858-2.568c-9.616,0-21.553,1.71-23.862,2.566   c-0.07,0.028-0.128,0.058-0.198,0.085c-0.26,0.339-0.5,0.685-0.733,1.023C5.554,27.667,5.924,27.487,6.355,27.326z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 </g>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="12.38" x2="17.62" y1="23.65" y2="23.65">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <rect fill="url(#SVGID_1__)" height="7.853" width="5.105" x="12.45" y="19.72"/>
 <path d="M12.45,24.66c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.285z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -57,16 +57,16 @@
 </linearGradient>
 <path d="M15,23.7c-5.98,0-10.85-4.867-10.85-10.85s4.87-10.85,10.85-10.85c5.982,0,10.85,4.866,10.85,10.85s-4.87,10.85-10.85,10.85z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="2.614" y2="23.03">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.0667" stop-color="#D1D7D9"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#7C8487"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<stop offset="0" stop-color="#D3D7D5"/>
+<stop offset="0.0667" stop-color="#D3D7D5"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#7F8384"/>
+<stop offset="1" stop-color="#AFB3B2"/>
 </linearGradient>
 <circle cx="15" cy="12.85" fill="url(#SVGID_3__)" r="10.21"/>
 <path d="M15,21.99c-5.315,0-9.657-4.23-9.843-9.5-0.004,0.116-0.009,0.231-0.009,0.349,0,5.431,4.419,9.851,9.852,9.851s9.852-4.42,9.852-9.851c0-0.117-0.005-0.232-0.009-0.349-0.18,5.27-4.52,9.5-9.84,9.5z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#222021" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="3.721" y2="20.35">
 <stop offset="0" stop-color="#CFCFCF"/>
 <stop offset="0.1091" stop-color="#CFCFCF"/>
@@ -76,7 +76,7 @@
 <path d="M15,20.43c-2.216-0.002-4.298-0.864-5.864-2.432-1.567-1.566-2.428-3.65-2.427-5.866,0-4.573,3.723-8.293,8.296-8.293,2.218,0.001,4.3,0.864,5.866,2.432s2.43,3.651,2.428,5.867c-0.001,4.573-3.723,8.292-8.295,8.292h-0.004z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15" x2="15" y1="4.368" y2="19.72">
 <stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="1" stop-color="#606769"/>
+<stop offset="1" stop-color="#636566"/>
 </linearGradient>
 <circle cx="15" cy="12.13" fill="url(#SVGID_5__)" r="7.657"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="15" x2="15" y1="5.772" y2="18.45">
@@ -103,29 +103,29 @@
 </radialGradient>
 <circle cx="15" cy="12.13" fill="url(#SVGID_8_)" r="4.712"/>
 <radialGradient cx="23.96" cy="3.55" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.36">
-<stop offset="0" stop-color="#A700F5"/>
-<stop offset="0.3091" stop-color="#A700F5"/>
-<stop offset="0.4364" stop-color="#5E008A"/>
-<stop offset="0.8061" stop-color="#0E1402"/>
-<stop offset="1" stop-color="#0E1402"/>
+<stop offset="0" stop-color="#8D4AAB"/>
+<stop offset="0.3091" stop-color="#8D4AAB"/>
+<stop offset="0.4364" stop-color="#532961"/>
+<stop offset="0.8061" stop-color="#070F0F"/>
+<stop offset="1" stop-color="#070F0F"/>
 </radialGradient>
 <path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0.004-2.327,1.89-4.21,4.213-4.21,2.33,0.003,4.21,1.888,4.21,4.21z" fill="url(#SVGID_9_)"/>
 <radialGradient cx="25.17" cy="13.25" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.611">
-<stop offset="0" stop-color="#48630C"/>
+<stop offset="0" stop-color="#264932"/>
 <stop offset="0.7879" stop-color="#000000"/>
 <stop offset="1" stop-color="#000000"/>
 </radialGradient>
 <path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0,0,1.444,2.569,4.213,2.569,2.77,0,4.21-2.57,4.21-2.57z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.98" x2="14.98" y1="7.065" y2="12.09">
-<stop offset="0" stop-color="#F8FBFF"/>
+<stop offset="0" stop-color="#FAFDFB"/>
 <stop offset="1" stop-color="#808080"/>
 </linearGradient>
 <path d="M14.98,12.07c1.828,0,3.549-0.277,5.067-0.765-0.431-2.41-2.532-4.239-5.067-4.239-2.532,0-4.632,1.83-5.065,4.239,1.515,0.49,3.235,0.77,5.065,0.77z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.762" x2="24.29" y1="26.72" y2="26.72">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <path d="M24.24,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879h-14.72c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639h18.44z" fill="url(#SVGID_12_)"/>
 <path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626h-17.53c-0.164,0.19-0.293,0.4-0.377,0.63z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_waiting.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_waiting.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_waiting.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,47 +3,47 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3691" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="0.297" style="stop-color:#FFC144"/>
-<stop offset="0.6667" style="stop-color:#EF6902"/>
-<stop offset="0.7939" style="stop-color:#FEB037"/>
-<stop offset="1" style="stop-color:#FEB037"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="0.297" style="stop-color:#C7B17C"/>
+<stop offset="0.6667" style="stop-color:#A86F49"/>
+<stop offset="0.7939" style="stop-color:#C2A673"/>
+<stop offset="1" style="stop-color:#C2A673"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.259-1.333c-0.616-0.665-2.566-3.083-2.968-3.735  c-0.353-0.575-0.411-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.084-7.646,9.955-8.107  c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.523-1.778c-2.477-2.889-8.594-5.015-10.75-5.399  c-1.924-0.345-3.877-0.872-6.568,0.235c-2.559,1.054-13.074,8.536-21.11,16.572C11.203,27.277,3.723,37.795,2.668,40.352  c-1.107,2.691-0.58,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.853,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3418" x2="-1638.9102" y1="-2494.9819" y2="-2491.4063">
-<stop offset="0" style="stop-color:#E17B15"/>
-<stop offset="1" style="stop-color:#B05004"/>
+<stop offset="0" style="stop-color:#A47952"/>
+<stop offset="1" style="stop-color:#7C4738"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.035,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.738,2.119-1.514  c-0.252-0.204-3.469-2.809-4.801-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3462" x2="-1638.9143" y1="4063.0557" y2="4066.6326">
-<stop offset="0" style="stop-color:#E17B15"/>
-<stop offset="1" style="stop-color:#B05004"/>
+<stop offset="0" style="stop-color:#A47952"/>
+<stop offset="1" style="stop-color:#7C4738"/>
 </linearGradient>
 <path d="M17.093,35.188c-0.401,0.763-0.347,1.039,0.034,1.713c0.376,0.666,2.352,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.297c-0.034,0.048-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.203-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.093,35.188,17.093,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="48.4072" x2="4.0833" y1="3.4473" y2="47.7712">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+<stop offset="0" style="stop-color:#D3C59A"/>
+<stop offset="1" style="stop-color:#D0BA98"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.345-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.34,4.269,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236  c1.98,0.354,7.297,2.178,10.07,4.711c-2.553-2.815-8.496-4.879-10.617-5.258c-1.924-0.345-3.877-0.872-6.568,0.235  c-2.559,1.054-13.074,8.536-21.11,16.572C11.203,27.277,3.723,37.795,2.668,40.352c-1.107,2.691-0.58,4.645-0.236,6.567  c0.379,2.122,2.441,8.065,5.259,10.617C5.155,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="53.9023" x2="3.4732" y1="3.6543" y2="54.0835">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+<stop offset="0" style="stop-color:#D3C59A"/>
+<stop offset="1" style="stop-color:#D0BA98"/>
 </linearGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.259-1.333  c-0.616-0.665-2.566-3.083-2.968-3.735c-0.353-0.575-0.411-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.084-7.646,9.955-8.107c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.523-1.778  c-0.291-0.339-0.635-0.665-1.012-0.982c0.488,0.657,0.197,1.134-0.607,1.666c-1.4,0.933-14.475,10.225-15.227,10.775  c-0.43,0.314-0.768,0.219-1.299-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.949-0.436-1.711-0.034  c-0.869,0.46-3.763,1.914-9.954,8.106c-6.193,6.192-7.636,9.092-8.108,9.956c-0.378,0.69-0.319,1.135,0.036,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.492,0.533,0.559,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195  c-0.534,0.803-1.009,1.098-1.665,0.606c0.314,0.378,0.643,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.853,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-1610.521" x2="-1610.521" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#CF8122"/>
-<stop offset="0.5" style="stop-color:#8C4105"/>
-<stop offset="1" style="stop-color:#CF8122"/>
+<stop offset="0" style="stop-color:#9B7956"/>
+<stop offset="0.5" style="stop-color:#64352E"/>
+<stop offset="1" style="stop-color:#9B7956"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31  c8.506-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.533,18.959S3.489,41.869,2.195,44.688  c-0.038,0.087-0.063,0.166-0.101,0.251c0.07,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="12.38" x2="17.62" y1="23.65" y2="23.65">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <rect fill="url(#SVGID_1__)" height="7.853" width="5.105" x="12.45" y="19.72"/>
 <path d="M12.45,24.66c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.285z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -55,16 +55,16 @@
 </linearGradient>
 <path d="M15,23.7c-5.98,0-10.85-4.867-10.85-10.85s4.87-10.85,10.85-10.85c5.982,0,10.85,4.866,10.85,10.85s-4.87,10.85-10.85,10.85z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="2.614" y2="23.03">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.0667" stop-color="#D1D7D9"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#7C8487"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<stop offset="0" stop-color="#D3D7D5"/>
+<stop offset="0.0667" stop-color="#D3D7D5"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#7F8384"/>
+<stop offset="1" stop-color="#AFB3B2"/>
 </linearGradient>
 <circle cx="15" cy="12.85" fill="url(#SVGID_3__)" r="10.21"/>
 <path d="M15,21.99c-5.315,0-9.657-4.23-9.843-9.5-0.004,0.116-0.009,0.231-0.009,0.349,0,5.431,4.419,9.851,9.852,9.851s9.852-4.42,9.852-9.851c0-0.117-0.005-0.232-0.009-0.349-0.18,5.27-4.52,9.5-9.84,9.5z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#222021" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="3.721" y2="20.35">
 <stop offset="0" stop-color="#CFCFCF"/>
 <stop offset="0.1091" stop-color="#CFCFCF"/>
@@ -74,7 +74,7 @@
 <path d="M15,20.43c-2.216-0.002-4.298-0.864-5.864-2.432-1.567-1.566-2.428-3.65-2.427-5.866,0-4.573,3.723-8.293,8.296-8.293,2.218,0.001,4.3,0.864,5.866,2.432s2.43,3.651,2.428,5.867c-0.001,4.573-3.723,8.292-8.295,8.292h-0.004z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15" x2="15" y1="4.368" y2="19.72">
 <stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="1" stop-color="#606769"/>
+<stop offset="1" stop-color="#636566"/>
 </linearGradient>
 <circle cx="15" cy="12.13" fill="url(#SVGID_5__)" r="7.657"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="15" x2="15" y1="5.772" y2="18.45">
@@ -101,29 +101,29 @@
 </radialGradient>
 <circle cx="15" cy="12.13" fill="url(#SVGID_8_)" r="4.712"/>
 <radialGradient cx="23.96" cy="3.55" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.36">
-<stop offset="0" stop-color="#A700F5"/>
-<stop offset="0.3091" stop-color="#A700F5"/>
-<stop offset="0.4364" stop-color="#5E008A"/>
-<stop offset="0.8061" stop-color="#0E1402"/>
-<stop offset="1" stop-color="#0E1402"/>
+<stop offset="0" stop-color="#8D4AAB"/>
+<stop offset="0.3091" stop-color="#8D4AAB"/>
+<stop offset="0.4364" stop-color="#532961"/>
+<stop offset="0.8061" stop-color="#070F0F"/>
+<stop offset="1" stop-color="#070F0F"/>
 </radialGradient>
 <path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0.004-2.327,1.89-4.21,4.213-4.21,2.33,0.003,4.21,1.888,4.21,4.21z" fill="url(#SVGID_9_)"/>
 <radialGradient cx="25.17" cy="13.25" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.611">
-<stop offset="0" stop-color="#48630C"/>
+<stop offset="0" stop-color="#264932"/>
 <stop offset="0.7879" stop-color="#000000"/>
 <stop offset="1" stop-color="#000000"/>
 </radialGradient>
 <path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0,0,1.444,2.569,4.213,2.569,2.77,0,4.21-2.57,4.21-2.57z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.98" x2="14.98" y1="7.065" y2="12.09">
-<stop offset="0" stop-color="#F8FBFF"/>
+<stop offset="0" stop-color="#FAFDFB"/>
 <stop offset="1" stop-color="#808080"/>
 </linearGradient>
 <path d="M14.98,12.07c1.828,0,3.549-0.277,5.067-0.765-0.431-2.41-2.532-4.239-5.067-4.239-2.532,0-4.632,1.83-5.065,4.239,1.515,0.49,3.235,0.77,5.065,0.77z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.762" x2="24.29" y1="26.72" y2="26.72">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <path d="M24.24,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879h-14.72c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639h18.44z" fill="url(#SVGID_12_)"/>
 <path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626h-17.53c-0.164,0.19-0.293,0.4-0.377,0.63z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_capture.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_capture.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_capture.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -19,8 +19,8 @@
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559  c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
 <path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0  c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
@@ -42,18 +42,18 @@
 </linearGradient>
 <path d="M14.902,10.438c0.002-3.84-3.109-6.953-6.949-6.955C4.113,3.481,1,6.594,1,10.432  c0,0.088,0.006,14.48,0.006,14.48c0,0.936,0.588,1.604,1.604,1.604h10.684c0.842,0,1.604-0.788,1.604-1.604  C14.896,24.912,14.902,10.524,14.902,10.438z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="7.9512" x2="7.9512" y1="3.646" y2="26.0921">
-<stop offset="0" style="stop-color:#D0D4D5"/>
-<stop offset="0.1212" style="stop-color:#D0D4D5"/>
-<stop offset="0.5091" style="stop-color:#B0B6B8"/>
-<stop offset="0.5091" style="stop-color:#9FA6A8"/>
-<stop offset="0.6606" style="stop-color:#7D8588"/>
-<stop offset="0.9758" style="stop-color:#ADB3B5"/>
-<stop offset="0.9758" style="stop-color:#595C5E"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D2D3D2"/>
+<stop offset="0.1212" style="stop-color:#D2D3D2"/>
+<stop offset="0.5091" style="stop-color:#B2B6B5"/>
+<stop offset="0.5091" style="stop-color:#A2A5A5"/>
+<stop offset="0.6606" style="stop-color:#808485"/>
+<stop offset="0.9758" style="stop-color:#AFB3B2"/>
+<stop offset="0.9758" style="stop-color:#5B5B5D"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M2.609,26.195c-0.803,0-1.283-0.479-1.283-1.283c0,0-0.006-14.393-0.006-14.48  c0-3.654,2.975-6.629,6.631-6.629c3.658,0.002,6.633,2.979,6.631,6.635c0,0.087-0.006,14.475-0.006,14.475  c0,0.648-0.637,1.283-1.283,1.283H2.609z" fill="url(#SVGID_2__)"/>
-<path d="M13.986,10.71c-0.002,3.333-2.703,6.621-6.037,6.619c-3.332-0.001-6.033-3.291-6.033-6.622  c0.002-3.334,2.705-6.032,6.037-6.032C11.287,4.676,13.986,7.378,13.986,10.71z" fill="#231F20" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M13.986,10.71c-0.002,3.333-2.703,6.621-6.037,6.619c-3.332-0.001-6.033-3.291-6.033-6.622  c0.002-3.334,2.705-6.032,6.037-6.032C11.287,4.676,13.986,7.378,13.986,10.71z" fill="#222021" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="7.9512" x2="7.9512" y1="4.4121" y2="16.5024">
 <stop offset="0" style="stop-color:#CFCFCF"/>
 <stop offset="0.1091" style="stop-color:#CFCFCF"/>
@@ -63,7 +63,7 @@
 <circle cx="7.951" cy="10.464" fill="url(#SVGID_3__)" r="6.012"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="7.9512" x2="7.9512" y1="4.6738" y2="16.122">
 <stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#606769"/>
+<stop offset="1" style="stop-color:#636566"/>
 </linearGradient>
 <circle cx="7.951" cy="10.465" fill="url(#SVGID_4__)" r="5.711"/>
 <linearGradient gradientTransform="matrix(1 3.000000e-004 -3.000000e-004 1 -0.7997 -0.83)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="5.46" x2="12.0483" y1="7.9976" y2="14.5859">
@@ -90,21 +90,21 @@
 </radialGradient>
 <circle cx="7.951" cy="10.464" fill="url(#SVGID_7_)" r="3.607"/>
 <radialGradient cx="146.1094" cy="-80.7524" gradientTransform="matrix(0.9448 3.000000e-004 -3.000000e-004 0.9449 -131.0246 81.9801)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="9.1349">
-<stop offset="0" style="stop-color:#A700F5"/>
-<stop offset="0.3091" style="stop-color:#A700F5"/>
-<stop offset="0.4364" style="stop-color:#5E008A"/>
-<stop offset="0.8061" style="stop-color:#0E1402"/>
-<stop offset="1" style="stop-color:#0E1402"/>
+<stop offset="0" style="stop-color:#8D4AAB"/>
+<stop offset="0.3091" style="stop-color:#8D4AAB"/>
+<stop offset="0.4364" style="stop-color:#532961"/>
+<stop offset="0.8061" style="stop-color:#070F0F"/>
+<stop offset="1" style="stop-color:#070F0F"/>
 </radialGradient>
 <circle cx="7.951" cy="10.464" fill="url(#SVGID_8_)" r="3.156"/>
 <radialGradient cx="147.0527" cy="-162.396" gradientTransform="matrix(0.9448 3.000000e-004 -3.000000e-004 0.8996 -131.0251 159.1253)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="3.709">
-<stop offset="0" style="stop-color:#48630C"/>
+<stop offset="0" style="stop-color:#264932"/>
 <stop offset="0.7879" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </radialGradient>
 <path d="M11.107,10.575c-0.001,1.659-1.414,3.005-3.156,3.004s-3.156-1.348-3.156-3.006  c0,0,1.082,1.833,3.156,1.833C10.025,12.407,11.107,10.575,11.107,10.575z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="7.9346" x2="7.9346" y1="6.584" y2="10.4348">
-<stop offset="0" style="stop-color:#F8FBFF"/>
+<stop offset="0" style="stop-color:#FAFDFB"/>
 <stop offset="1" style="stop-color:#808080"/>
 </linearGradient>
 <path d="M7.936,10.416c1.398,0,2.717-0.213,3.879-0.586c-0.33-1.846-1.939-3.246-3.879-3.246  s-3.549,1.4-3.881,3.245C5.219,10.203,6.537,10.416,7.936,10.416z" fill="url(#SVGID_10_)" fill-opacity="0.35" stroke-opacity="0.35"/>
@@ -115,19 +115,19 @@
 </linearGradient>
 <path d="M29,22.402c0,0.354-0.287,0.642-0.641,0.642H16.098c-0.354,0-0.641-0.288-0.641-0.642v-9.936  c0-0.354,0.287-0.642,0.641-0.642h12.262c0.354,0,0.641,0.288,0.641,0.642V22.402z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="22.2285" x2="22.2285" y1="12.0703" y2="22.6757">
-<stop offset="0" style="stop-color:#D0D4D5"/>
-<stop offset="0.1212" style="stop-color:#D0D4D5"/>
-<stop offset="0.5091" style="stop-color:#B0B6B8"/>
-<stop offset="0.5091" style="stop-color:#9FA6A8"/>
-<stop offset="0.6606" style="stop-color:#7D8588"/>
-<stop offset="0.9758" style="stop-color:#ADB3B5"/>
-<stop offset="0.9758" style="stop-color:#595C5E"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#D2D3D2"/>
+<stop offset="0.1212" style="stop-color:#D2D3D2"/>
+<stop offset="0.5091" style="stop-color:#B2B6B5"/>
+<stop offset="0.5091" style="stop-color:#A2A5A5"/>
+<stop offset="0.6606" style="stop-color:#808485"/>
+<stop offset="0.9758" style="stop-color:#AFB3B2"/>
+<stop offset="0.9758" style="stop-color:#5B5B5D"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <path d="M16.098,22.725c-0.178,0-0.32-0.145-0.32-0.322v-9.936c0-0.178,0.143-0.322,0.32-0.322h12.262  c0.176,0,0.32,0.145,0.32,0.322v9.936c0,0.178-0.145,0.322-0.32,0.322H16.098z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="14.9092" x2="13.6655" y1="17.4346" y2="17.4346">
-<stop offset="0" style="stop-color:#D3D3D4"/>
+<stop offset="0" style="stop-color:#D3D4D4"/>
 <stop offset="1" style="stop-color:#EDEDED"/>
 </linearGradient>
 <path d="M14.9,13.788h-1.279v7.293h1.275C14.898,18.812,14.9,15.968,14.9,13.788z" fill="url(#SVGID_13_)"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_collection.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_collection.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_collection.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
-<path d="M56.662,4.616H9.241c-0.738,0-1.336,0.598-1.336,1.337v9.357H50.76c0.734,0,1.334,0.598,1.334,1.336v28.043  h4.568c0.738,0,1.336-0.598,1.336-1.336v-37.4C57.998,5.214,57.4,4.616,56.662,4.616z" fill="#F1F1F2"/>
+<path d="M56.662,4.616H9.241c-0.738,0-1.336,0.598-1.336,1.337v9.357H50.76c0.734,0,1.334,0.598,1.334,1.336v28.043  h4.568c0.738,0,1.336-0.598,1.336-1.336v-37.4C57.998,5.214,57.4,4.616,56.662,4.616z" fill="#F1F2F2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="32.9512" x2="32.9512" y1="44.6895" y2="4.6167">
 <stop offset="0" style="stop-color:#757575"/>
 <stop offset="0.2424" style="stop-color:#000000"/>
@@ -19,8 +19,8 @@
 <path d="M7.906,11.296v4.015H50.76c0.734,0,1.334,0.598,1.334,1.336v21.365H58V11.296H7.906z" fill="url(#SVGID_2_)"/>
 <path d="M56.662,4.616H9.241c-0.738,0-1.336,0.598-1.336,1.337V6.62  c0-0.737,0.598-1.336,1.336-1.336h47.421c0.738,0,1.336,0.599,1.336,1.336V5.953C57.998,5.214,57.4,4.616,56.662,4.616z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="32.9521" x2="32.9521" y1="11.2959" y2="38.0122">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M54.658,11.296H11.246c-0.736,0-1.335,0.601-1.335,1.335v2.68h40.85c0.734,0,1.334,0.598,1.334,1.336  v21.365h2.564c0.736,0,1.336-0.602,1.336-1.337V12.631C55.994,11.896,55.395,11.296,54.658,11.296z" fill="url(#SVGID_3_)"/>
 <path d="M55.928,36.335c0.039-0.087,0.066-0.189,0.066-0.327  C55.994,36.124,55.957,36.228,55.928,36.335z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
@@ -33,7 +33,7 @@
 <path d="M53.322,12.631H12.582c-0.74,0-1.336,0.598-1.336,1.336v1.344  H50.76c0.734,0,1.334,0.598,1.334,1.336v2.861l2.564-0.197v-5.344C54.658,13.229,54.059,12.631,53.322,12.631z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <path d="M50.76,13.975H7.906v1.336H50.76c0.734,0,1.334,0.598,1.334,1.336V44.69h1.336  V16.646C53.43,15.172,52.232,13.975,50.76,13.975z" fill-opacity="0.15" stroke-opacity="0.15"/>
 <path d="M50.76,14.643H7.906v0.668H50.76c0.734,0,1.334,0.598,1.334,1.336v28.043h0.668  V16.646C52.762,15.541,51.863,14.643,50.76,14.643z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M50.76,15.311H3.337C2.597,15.311,2,15.908,2,16.646V54.05c0,0.737,0.597,1.334,1.337,1.334h47.419  c0.738,0,1.338-0.597,1.338-1.334V16.646C52.094,15.908,51.494,15.311,50.76,15.311z" fill="#F1F1F2"/>
+<path d="M50.76,15.311H3.337C2.597,15.311,2,15.908,2,16.646V54.05c0,0.737,0.597,1.334,1.337,1.334h47.419  c0.738,0,1.338-0.597,1.338-1.334V16.646C52.094,15.908,51.494,15.311,50.76,15.311z" fill="#F1F2F2"/>
 <path d="M50.98,54.16H2.892v-4.675H50.98V54.16z M50.98,20.765H2.892  V16.09H50.98V20.765z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2165)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2166.9531" x2="-2166.9531" y1="2149.6895" y2="2109.6162">
 <stop offset="0" style="stop-color:#757575"/>
@@ -51,9 +51,9 @@
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="26.716" width="50.093" x="2.001" y="21.988"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2165)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-2166.9531" x2="-2166.9531" y1="2117.3115" y2="2142.6904">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
 </linearGradient>
 <path d="M50.09,47.369c0,0.734-0.602,1.335-1.336,1.335H5.341c-0.735,0-1.337-0.601-1.337-1.335V23.325  c0-0.735,0.602-1.337,1.337-1.337h43.413c0.734,0,1.336,0.602,1.336,1.337V47.369z" fill="url(#SVGID_7_)"/>
 <path d="M48.754,47.369H5.341c-0.735,0-1.337,0.066-1.337-0.669l0,0  c0,0.735,0.602,1.337,1.337,1.337h43.413c0.734,0,1.336-0.602,1.336-1.337l0,0C50.09,47.436,49.488,47.369,48.754,47.369z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_dialled_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_dialled_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_dialled_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -43,28 +43,28 @@
 <polygon fill="none" points="30.152,0.436 15.607,0.436 15.186,0 14.762,0.436 0.152,0.436 0.152,15.436 0,15.592 0.152,15.592   0.152,30.436 30.152,30.436 30.152,15.594 30.295,15.594 30.152,15.447 "/>
 <polygon fill-opacity="0.35" points="8.484,30.434 8.48,15.594 0.4,15.594 0,15.592 15.186,0 30.295,15.594 21.907,15.594 21.915,30.436   " stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8438)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2176.5103" x2="-2176.5103" y1="2985.5796" y2="2956.2766">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#30A4D5"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#6292A3"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="27.438,14.594 15.184,1.861 2.814,14.594 9.48,14.594 9.484,29.142 20.91,29.145   20.907,14.594 "/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8438)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2176.4844" x2="-2176.4844" y1="2984.1128" y2="2970.6938">
-<stop offset="0" style="stop-color:#B3FCFF"/>
-<stop offset="0.4182" style="stop-color:#B3FCFF"/>
-<stop offset="1" style="stop-color:#5FBAD8"/>
+<stop offset="0" style="stop-color:#CAE8D4"/>
+<stop offset="0.4182" style="stop-color:#CAE8D4"/>
+<stop offset="1" style="stop-color:#83B4B4"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="3.195,14.592 15.182,2.286 27.108,14.594 27.934,14.594 15.184,1.436 2.37,14.592 "/>
 <line fill="none" x1="9.484" x2="20.91" y1="29.138" y2="29.14"/>
-<polygon fill="#33AEDB" points="20.912,29.436 9.484,29.434 9.484,28.842 20.912,28.844 "/>
+<polygon fill="#659BA9" points="20.912,29.436 9.484,29.434 9.484,28.842 20.912,28.844 "/>
 <rect fill="none" height="30" width="30" x="0.152" y="0.436"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="12.38" x2="17.62" y1="23.65" y2="23.65">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <rect fill="url(#SVGID_1___)" height="7.853" width="5.105" x="12.45" y="19.72"/>
 <path d="M12.45,24.66c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.285z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -76,16 +76,16 @@
 </linearGradient>
 <path d="M15,23.7c-5.98,0-10.85-4.867-10.85-10.85s4.87-10.85,10.85-10.85c5.982,0,10.85,4.866,10.85,10.85s-4.87,10.85-10.85,10.85z" fill="url(#SVGID_2___)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="2.614" y2="23.03">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.0667" stop-color="#D1D7D9"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#7C8487"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<stop offset="0" stop-color="#D3D7D5"/>
+<stop offset="0.0667" stop-color="#D3D7D5"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#7F8384"/>
+<stop offset="1" stop-color="#AFB3B2"/>
 </linearGradient>
 <circle cx="15" cy="12.85" fill="url(#SVGID_3__)" r="10.21"/>
 <path d="M15,21.99c-5.315,0-9.657-4.23-9.843-9.5-0.004,0.116-0.009,0.231-0.009,0.349,0,5.431,4.419,9.851,9.852,9.851s9.852-4.42,9.852-9.851c0-0.117-0.005-0.232-0.009-0.349-0.18,5.27-4.52,9.5-9.84,9.5z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#222021" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="3.721" y2="20.35">
 <stop offset="0" stop-color="#CFCFCF"/>
 <stop offset="0.1091" stop-color="#CFCFCF"/>
@@ -95,7 +95,7 @@
 <path d="M15,20.43c-2.216-0.002-4.298-0.864-5.864-2.432-1.567-1.566-2.428-3.65-2.427-5.866,0-4.573,3.723-8.293,8.296-8.293,2.218,0.001,4.3,0.864,5.866,2.432s2.43,3.651,2.428,5.867c-0.001,4.573-3.723,8.292-8.295,8.292h-0.004z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15" x2="15" y1="4.368" y2="19.72">
 <stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="1" stop-color="#606769"/>
+<stop offset="1" stop-color="#636566"/>
 </linearGradient>
 <circle cx="15" cy="12.13" fill="url(#SVGID_5__)" r="7.657"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="15" x2="15" y1="5.772" y2="18.45">
@@ -122,29 +122,29 @@
 </radialGradient>
 <circle cx="15" cy="12.13" fill="url(#SVGID_8_)" r="4.712"/>
 <radialGradient cx="23.96" cy="3.55" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.36">
-<stop offset="0" stop-color="#A700F5"/>
-<stop offset="0.3091" stop-color="#A700F5"/>
-<stop offset="0.4364" stop-color="#5E008A"/>
-<stop offset="0.8061" stop-color="#0E1402"/>
-<stop offset="1" stop-color="#0E1402"/>
+<stop offset="0" stop-color="#8D4AAB"/>
+<stop offset="0.3091" stop-color="#8D4AAB"/>
+<stop offset="0.4364" stop-color="#532961"/>
+<stop offset="0.8061" stop-color="#070F0F"/>
+<stop offset="1" stop-color="#070F0F"/>
 </radialGradient>
 <path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0.004-2.327,1.89-4.21,4.213-4.21,2.33,0.003,4.21,1.888,4.21,4.21z" fill="url(#SVGID_9_)"/>
 <radialGradient cx="25.17" cy="13.25" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.611">
-<stop offset="0" stop-color="#48630C"/>
+<stop offset="0" stop-color="#264932"/>
 <stop offset="0.7879" stop-color="#000000"/>
 <stop offset="1" stop-color="#000000"/>
 </radialGradient>
 <path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0,0,1.444,2.569,4.213,2.569,2.77,0,4.21-2.57,4.21-2.57z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.98" x2="14.98" y1="7.065" y2="12.09">
-<stop offset="0" stop-color="#F8FBFF"/>
+<stop offset="0" stop-color="#FAFDFB"/>
 <stop offset="1" stop-color="#808080"/>
 </linearGradient>
 <path d="M14.98,12.07c1.828,0,3.549-0.277,5.067-0.765-0.431-2.41-2.532-4.239-5.067-4.239-2.532,0-4.632,1.83-5.065,4.239,1.515,0.49,3.235,0.77,5.065,0.77z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.762" x2="24.29" y1="26.72" y2="26.72">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <path d="M24.24,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879h-14.72c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639h18.44z" fill="url(#SVGID_12_)"/>
 <path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626h-17.53c-0.164,0.19-0.293,0.4-0.377,0.63z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_download.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_download.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_download.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -19,8 +19,8 @@
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559  c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
 <path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0  c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
@@ -36,18 +36,18 @@
 <polygon fill="none" points="30.096,0 0.096,0 0.096,14.833 0,14.833 0.096,14.933 0.096,30 14.601,30 15.021,30.438 15.447,30   30.096,30 30.096,14.963 30.215,14.841 30.096,14.841 "/>
 <polygon fill-opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841   15.021,30.438 " stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2176.5142" x2="-2176.5142" y1="2984.646" y2="2957.3247">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="2.846,15.859 15.025,28.575 27.398,15.845 20.732,15.843 20.727,1.292 9.375,1.291   9.375,15.859 "/>
 <line fill="none" x1="20.727" x2="9.375" y1="1.297" y2="1.296"/>
-<polygon fill="#E7FFB9" points="9.375,1 20.729,1.001 20.727,1.593 9.375,1.592 "/>
-<polygon fill="#E7FFB9" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
-<polygon fill="#E7FFB9" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
+<polygon fill="#E4EACE" points="9.375,1 20.729,1.001 20.727,1.593 9.375,1.592 "/>
+<polygon fill="#E4EACE" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
+<polygon fill="#E4EACE" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2165.6621" x2="-2187.9482" y1="2963.2173" y2="2963.2173">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="27.016,15.844 15.025,28.15 3.172,15.829 2.348,15.83 15.025,29 27.842,15.844 "/>
 <rect fill="none" height="30" width="30" x="0.096"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_missed_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_missed_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_missed_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -43,28 +43,28 @@
 <polygon fill="none" points="15.053,0 14.626,0.439 0,0.439 0,30.439 30,30.439 30,0.439 15.476,0.439 "/>
 <path d="M24.884,30.438c-10.001,0-15.735-4.635-15.735-12.715v-4.339H2.053L15.053,0l12.88,13.385h-6.962v4.339  c0,2.189,2.56,2.768,3.913,2.768h1v9.947H24.884z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3014.6338)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179" x2="-2179" y1="3012.1528" y2="2984.2842">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C6957B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <path d="M19.971,17.724v-5.339h5.611L15.049,1.438L4.418,12.385h5.73v5.339  c0,9.024,7.509,11.715,14.735,11.715v-7.947C22.658,21.491,19.971,20.392,19.971,17.724z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.7129" y2="22.5894">
-<stop offset="0" style="stop-color:#FFB259"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#CDB48B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="15.049,2.438 24.62,12.385 25.582,12.385 15.049,1.438 4.418,12.385 5.389,12.385 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="22.4268" x2="22.4268" y1="1.7129" y2="22.5894">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C6957B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <path d="M19.971,17.724v1c0,2.668,2.688,3.768,4.913,3.768v-1C22.658,21.491,19.971,20.392,19.971,17.724z" fill="url(#SVGID_3__)"/>
 <rect fill="none" height="30" width="30" y="0.439"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="12.38" x2="17.62" y1="23.65" y2="23.65">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <rect fill="url(#SVGID_1___)" height="7.853" width="5.105" x="12.45" y="19.72"/>
 <path d="M12.45,24.66c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.285z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -76,16 +76,16 @@
 </linearGradient>
 <path d="M15,23.7c-5.98,0-10.85-4.867-10.85-10.85s4.87-10.85,10.85-10.85c5.982,0,10.85,4.866,10.85,10.85s-4.87,10.85-10.85,10.85z" fill="url(#SVGID_2___)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3___" x1="15" x2="15" y1="2.614" y2="23.03">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.0667" stop-color="#D1D7D9"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#7C8487"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<stop offset="0" stop-color="#D3D7D5"/>
+<stop offset="0.0667" stop-color="#D3D7D5"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#7F8384"/>
+<stop offset="1" stop-color="#AFB3B2"/>
 </linearGradient>
 <circle cx="15" cy="12.85" fill="url(#SVGID_3___)" r="10.21"/>
 <path d="M15,21.99c-5.315,0-9.657-4.23-9.843-9.5-0.004,0.116-0.009,0.231-0.009,0.349,0,5.431,4.419,9.851,9.852,9.851s9.852-4.42,9.852-9.851c0-0.117-0.005-0.232-0.009-0.349-0.18,5.27-4.52,9.5-9.84,9.5z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#222021" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="3.721" y2="20.35">
 <stop offset="0" stop-color="#CFCFCF"/>
 <stop offset="0.1091" stop-color="#CFCFCF"/>
@@ -95,7 +95,7 @@
 <path d="M15,20.43c-2.216-0.002-4.298-0.864-5.864-2.432-1.567-1.566-2.428-3.65-2.427-5.866,0-4.573,3.723-8.293,8.296-8.293,2.218,0.001,4.3,0.864,5.866,2.432s2.43,3.651,2.428,5.867c-0.001,4.573-3.723,8.292-8.295,8.292h-0.004z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15" x2="15" y1="4.368" y2="19.72">
 <stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="1" stop-color="#606769"/>
+<stop offset="1" stop-color="#636566"/>
 </linearGradient>
 <circle cx="15" cy="12.13" fill="url(#SVGID_5__)" r="7.657"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="15" x2="15" y1="5.772" y2="18.45">
@@ -122,29 +122,29 @@
 </radialGradient>
 <circle cx="15" cy="12.13" fill="url(#SVGID_8_)" r="4.712"/>
 <radialGradient cx="23.96" cy="3.55" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.36">
-<stop offset="0" stop-color="#A700F5"/>
-<stop offset="0.3091" stop-color="#A700F5"/>
-<stop offset="0.4364" stop-color="#5E008A"/>
-<stop offset="0.8061" stop-color="#0E1402"/>
-<stop offset="1" stop-color="#0E1402"/>
+<stop offset="0" stop-color="#8D4AAB"/>
+<stop offset="0.3091" stop-color="#8D4AAB"/>
+<stop offset="0.4364" stop-color="#532961"/>
+<stop offset="0.8061" stop-color="#070F0F"/>
+<stop offset="1" stop-color="#070F0F"/>
 </radialGradient>
 <path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0.004-2.327,1.89-4.21,4.213-4.21,2.33,0.003,4.21,1.888,4.21,4.21z" fill="url(#SVGID_9_)"/>
 <radialGradient cx="25.17" cy="13.25" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.611">
-<stop offset="0" stop-color="#48630C"/>
+<stop offset="0" stop-color="#264932"/>
 <stop offset="0.7879" stop-color="#000000"/>
 <stop offset="1" stop-color="#000000"/>
 </radialGradient>
 <path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0,0,1.444,2.569,4.213,2.569,2.77,0,4.21-2.57,4.21-2.57z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.98" x2="14.98" y1="7.065" y2="12.09">
-<stop offset="0" stop-color="#F8FBFF"/>
+<stop offset="0" stop-color="#FAFDFB"/>
 <stop offset="1" stop-color="#808080"/>
 </linearGradient>
 <path d="M14.98,12.07c1.828,0,3.549-0.277,5.067-0.765-0.431-2.41-2.532-4.239-5.067-4.239-2.532,0-4.632,1.83-5.065,4.239,1.515,0.49,3.235,0.77,5.065,0.77z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.762" x2="24.29" y1="26.72" y2="26.72">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <path d="M24.24,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879h-14.72c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639h18.44z" fill="url(#SVGID_12_)"/>
 <path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626h-17.53c-0.164,0.19-0.293,0.4-0.377,0.63z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_player.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_player.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_player.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -19,8 +19,8 @@
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559  c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
 <path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0  c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
@@ -37,18 +37,18 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29.999C6.729,29.999,0,23.271,0,15S6.729,0.001,15,0.001c8.271,0,15,6.729,15,14.999  S23.271,29.999,15,29.999L15,29.999z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(0.5 0 0 0.5 579.9604 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-1129.9209" x2="-1129.9209" y1="3388.3521" y2="3444.3481">
-<stop offset="0" style="stop-color:#D5F5B5"/>
-<stop offset="1" style="stop-color:#40AD00"/>
+<stop offset="0" style="stop-color:#D9E2C8"/>
+<stop offset="1" style="stop-color:#347940"/>
 </linearGradient>
 <path d="M15,28.999C7.279,28.999,1,22.72,1,15C1,7.281,7.279,1.001,15,1.001c7.718,0,14,6.28,14,13.999  C29,22.72,22.718,28.999,15,28.999L15,28.999z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2179.0005" x2="-2179.0005" y1="2906.6362" y2="2878.8359">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+<stop offset="0" style="stop-color:#93BD66"/>
+<stop offset="1" style="stop-color:#22403B"/>
 </linearGradient>
 <path d="M28.599,15c0,7.512-6.09,13.6-13.599,13.6C7.486,28.6,1.4,22.512,1.4,15C1.4,7.491,7.486,1.4,15,1.4  C22.509,1.4,28.599,7.491,28.599,15z" fill="url(#SVGID_2__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="16.5117" x2="16.5117" y1="21.3633" y2="7.2163">
-<stop offset="0" style="stop-color:#82DA3B"/>
-<stop offset="1" style="stop-color:#11470A"/>
+<stop offset="0" style="stop-color:#89AA6B"/>
+<stop offset="1" style="stop-color:#1C3533"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3__)" points="10.353,7.134 22.671,14.21 10.353,21.429 "/>
 <polygon fill="#FFFFFF" points="11.11,8.444 22.008,14.734 11.11,21.026 "/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_podcast.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_podcast.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_podcast.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -19,8 +19,8 @@
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559  c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
 <path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0  c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
@@ -36,17 +36,17 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill="none" height="30" width="30"/>
 <path d="M4.452,29.001c-1.903,0-3.451-1.549-3.451-3.453V4.453c0-1.903,1.548-3.452,3.451-3.452h21.095  c1.905,0,3.454,1.548,3.454,3.452v21.095c0,1.904-1.549,3.453-3.454,3.453H4.452z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<path d="M27.932,25.493c0,1.346-1.092,2.438-2.44,2.438H4.508c-1.347,0-2.438-1.093-2.438-2.438V4.509  c0-1.348,1.091-2.44,2.438-2.44h20.983c1.348,0,2.44,1.093,2.44,2.44V25.493z" fill="#F7B388"/>
+<path d="M27.932,25.493c0,1.346-1.092,2.438-2.44,2.438H4.508c-1.347,0-2.438-1.093-2.438-2.438V4.509  c0-1.348,1.091-2.44,2.438-2.44h20.983c1.348,0,2.44,1.093,2.44,2.44V25.493z" fill="#D6C1A9"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2190.8022" x2="-2167.4888" y1="3344.4668" y2="3321.1533">
-<stop offset="0" style="stop-color:#DF4F20"/>
-<stop offset="0.5" style="stop-color:#F48228"/>
-<stop offset="1" style="stop-color:#CF3A21"/>
+<stop offset="0" style="stop-color:#A66C59"/>
+<stop offset="0.5" style="stop-color:#B78C65"/>
+<stop offset="1" style="stop-color:#9B5D55"/>
 </linearGradient>
 <path d="M4.508,27.188c-0.935,0-1.697-0.761-1.697-1.695V4.509c0-0.937,0.763-1.696,1.697-1.696h20.983  c0.937,0,1.697,0.762,1.697,1.696v20.984c0,0.935-0.76,1.695-1.697,1.695H4.508z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2178.999" x2="-2178.999" y1="3345.792" y2="3319.6384">
-<stop offset="0" style="stop-color:#C5422B"/>
-<stop offset="0.5" style="stop-color:#F48228"/>
-<stop offset="1" style="stop-color:#AD1B00"/>
+<stop offset="0" style="stop-color:#976059"/>
+<stop offset="0.5" style="stop-color:#B78C65"/>
+<stop offset="1" style="stop-color:#793436"/>
 </linearGradient>
 <path d="M25.547,2.413c1.125,0,2.041,0.916,2.041,2.04v21.095c0,1.124-0.917,2.04-2.041,2.04H4.452  c-1.124,0-2.038-0.916-2.038-2.04V4.453c0-1.124,0.915-2.04,2.038-2.04H25.547 M25.547,2.001H4.452  c-1.353,0-2.451,1.098-2.451,2.452v21.095c0,1.354,1.098,2.453,2.451,2.453h21.095c1.354,0,2.454-1.1,2.454-2.453V4.453  C28.001,3.099,26.901,2.001,25.547,2.001L25.547,2.001z" fill="url(#SVGID_2__)"/>
 <circle cx="8.615" cy="21.385" fill="#FFFFFF" r="2.508"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_received_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_received_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_received_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -43,28 +43,28 @@
 <polygon fill="none" points="30.096,0 0.096,0 0.096,14.833 0,14.833 0.096,14.933 0.096,30 14.601,30 15.021,30.438 15.447,30   30.096,30 30.096,14.963 30.215,14.841 30.096,14.841 "/>
 <polygon fill-opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841   15.021,30.438 " stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2176.5142" x2="-2176.5142" y1="2984.646" y2="2957.3247">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="2.846,15.859 15.025,28.575 27.398,15.845 20.732,15.843 20.727,1.292 9.375,1.291   9.375,15.859 "/>
 <line fill="none" x1="20.727" x2="9.375" y1="1.297" y2="1.296"/>
-<polygon fill="#E7FFB9" points="9.375,1 20.729,1.001 20.727,1.593 9.375,1.592 "/>
-<polygon fill="#E7FFB9" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
-<polygon fill="#E7FFB9" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
+<polygon fill="#E4EACE" points="9.375,1 20.729,1.001 20.727,1.593 9.375,1.592 "/>
+<polygon fill="#E4EACE" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
+<polygon fill="#E4EACE" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2165.6621" x2="-2187.9482" y1="2963.2173" y2="2963.2173">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="27.016,15.844 15.025,28.15 3.172,15.829 2.348,15.83 15.025,29 27.842,15.844 "/>
 <rect fill="none" height="30" width="30" x="0.096"/>
 </g>
 <g transform="matrix(1 0 0 1 30 30)">
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="12.38" x2="17.62" y1="23.65" y2="23.65">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <rect fill="url(#SVGID_1___)" height="7.853" width="5.105" x="12.45" y="19.72"/>
 <path d="M12.45,24.66c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.285z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -76,16 +76,16 @@
 </linearGradient>
 <path d="M15,23.7c-5.98,0-10.85-4.867-10.85-10.85s4.87-10.85,10.85-10.85c5.982,0,10.85,4.866,10.85,10.85s-4.87,10.85-10.85,10.85z" fill="url(#SVGID_2___)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="2.614" y2="23.03">
-<stop offset="0" stop-color="#D1D7D9"/>
-<stop offset="0.0667" stop-color="#D1D7D9"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#7C8487"/>
-<stop offset="1" stop-color="#ADB3B5"/>
+<stop offset="0" stop-color="#D3D7D5"/>
+<stop offset="0.0667" stop-color="#D3D7D5"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#7F8384"/>
+<stop offset="1" stop-color="#AFB3B2"/>
 </linearGradient>
 <circle cx="15" cy="12.85" fill="url(#SVGID_3__)" r="10.21"/>
 <path d="M15,21.99c-5.315,0-9.657-4.23-9.843-9.5-0.004,0.116-0.009,0.231-0.009,0.349,0,5.431,4.419,9.851,9.852,9.851s9.852-4.42,9.852-9.851c0-0.117-0.005-0.232-0.009-0.349-0.18,5.27-4.52,9.5-9.84,9.5z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#222021" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="3.721" y2="20.35">
 <stop offset="0" stop-color="#CFCFCF"/>
 <stop offset="0.1091" stop-color="#CFCFCF"/>
@@ -95,7 +95,7 @@
 <path d="M15,20.43c-2.216-0.002-4.298-0.864-5.864-2.432-1.567-1.566-2.428-3.65-2.427-5.866,0-4.573,3.723-8.293,8.296-8.293,2.218,0.001,4.3,0.864,5.866,2.432s2.43,3.651,2.428,5.867c-0.001,4.573-3.723,8.292-8.295,8.292h-0.004z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15" x2="15" y1="4.368" y2="19.72">
 <stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="1" stop-color="#606769"/>
+<stop offset="1" stop-color="#636566"/>
 </linearGradient>
 <circle cx="15" cy="12.13" fill="url(#SVGID_5__)" r="7.657"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="15" x2="15" y1="5.772" y2="18.45">
@@ -122,29 +122,29 @@
 </radialGradient>
 <circle cx="15" cy="12.13" fill="url(#SVGID_8_)" r="4.712"/>
 <radialGradient cx="23.96" cy="3.55" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.36">
-<stop offset="0" stop-color="#A700F5"/>
-<stop offset="0.3091" stop-color="#A700F5"/>
-<stop offset="0.4364" stop-color="#5E008A"/>
-<stop offset="0.8061" stop-color="#0E1402"/>
-<stop offset="1" stop-color="#0E1402"/>
+<stop offset="0" stop-color="#8D4AAB"/>
+<stop offset="0.3091" stop-color="#8D4AAB"/>
+<stop offset="0.4364" stop-color="#532961"/>
+<stop offset="0.8061" stop-color="#070F0F"/>
+<stop offset="1" stop-color="#070F0F"/>
 </radialGradient>
 <path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0.004-2.327,1.89-4.21,4.213-4.21,2.33,0.003,4.21,1.888,4.21,4.21z" fill="url(#SVGID_9_)"/>
 <radialGradient cx="25.17" cy="13.25" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.611">
-<stop offset="0" stop-color="#48630C"/>
+<stop offset="0" stop-color="#264932"/>
 <stop offset="0.7879" stop-color="#000000"/>
 <stop offset="1" stop-color="#000000"/>
 </radialGradient>
 <path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0,0,1.444,2.569,4.213,2.569,2.77,0,4.21-2.57,4.21-2.57z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.98" x2="14.98" y1="7.065" y2="12.09">
-<stop offset="0" stop-color="#F8FBFF"/>
+<stop offset="0" stop-color="#FAFDFB"/>
 <stop offset="1" stop-color="#808080"/>
 </linearGradient>
 <path d="M14.98,12.07c1.828,0,3.549-0.277,5.067-0.765-0.431-2.41-2.532-4.239-5.067-4.239-2.532,0-4.632,1.83-5.065,4.239,1.515,0.49,3.235,0.77,5.065,0.77z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.762" x2="24.29" y1="26.72" y2="26.72">
-<stop offset="0" stop-color="#878A8C"/>
-<stop offset="0.2606" stop-color="#BDC2C4"/>
-<stop offset="0.6606" stop-color="#5B6163"/>
-<stop offset="1" stop-color="#959A9C"/>
+<stop offset="0" stop-color="#898A8B"/>
+<stop offset="0.2606" stop-color="#BFC2C1"/>
+<stop offset="0.6606" stop-color="#5D5F61"/>
+<stop offset="1" stop-color="#979A9A"/>
 </linearGradient>
 <path d="M24.24,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879h-14.72c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639h18.44z" fill="url(#SVGID_12_)"/>
 <path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626h-17.53c-0.164,0.19-0.293,0.4-0.377,0.63z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_recent.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_recent.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_recent.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -19,8 +19,8 @@
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559  c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
 <path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0  c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
@@ -36,33 +36,33 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M14.999,30C6.729,30,0,23.271,0,15S6.729,0,14.999,0C23.271,0,30,6.729,30,15S23.271,30,14.999,30L14.999,30  z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="1.1948" y2="28.8709">
-<stop offset="0" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#454B4D"/>
+<stop offset="0" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#47494B"/>
 </linearGradient>
 <path d="M14.999,29C7.281,29,1,22.72,1,15S7.281,1,14.999,1C22.72,1,29,7.28,29,15S22.72,29,14.999,29  L14.999,29z" fill="url(#SVGID_1__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.5835" y2="28.5506">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.2364" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#697173"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.2364" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#6C6F70"/>
 </linearGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_2__)" r="13.611"/>
-<path d="M15.474,15.476c4.559,0,8.961-0.286,13.127-0.81C28.425,7.305,22.406,1.389,14.999,1.389  c-7.36,0-13.357,5.847-13.6,13.151C5.846,15.143,10.568,15.476,15.474,15.476z" fill="#F1F1F2" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15.474,15.476c4.559,0,8.961-0.286,13.127-0.81C28.425,7.305,22.406,1.389,14.999,1.389  c-7.36,0-13.357,5.847-13.6,13.151C5.846,15.143,10.568,15.476,15.474,15.476z" fill="#F1F2F2" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="1.5186" x2="28.6768" y1="8.2915" y2="8.2915">
-<stop offset="0" style="stop-color:#C0C5C7"/>
-<stop offset="0.2" style="stop-color:#F7FDFF"/>
-<stop offset="0.8" style="stop-color:#F7FDFF"/>
-<stop offset="1" style="stop-color:#CDD3D5"/>
+<stop offset="0" style="stop-color:#C2C5C4"/>
+<stop offset="0.2" style="stop-color:#F9FDFA"/>
+<stop offset="0.8" style="stop-color:#F9FDFA"/>
+<stop offset="1" style="stop-color:#CFD3D1"/>
 </linearGradient>
 <path d="M14.999,1.778c7.453,0,13.503,5.99,13.605,13.416c0.002-0.063,0.007-0.129,0.007-0.194  c0-7.517-6.095-13.611-13.612-13.611C7.482,1.389,1.389,7.483,1.389,15c0,0.065,0.003,0.131,0.005,0.194  C1.498,7.769,7.548,1.778,14.999,1.778z" fill="url(#SVGID_3__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.999" x2="14.999" y1="27.249" y2="2.9914">
-<stop offset="0" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#454B4D"/>
+<stop offset="0" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#47494B"/>
 </linearGradient>
 <path d="M14.999,27.055C8.352,27.055,2.944,21.648,2.944,15S8.352,2.945,14.999,2.945  c6.648,0,12.056,5.406,12.056,12.055S21.647,27.055,14.999,27.055L14.999,27.055z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15.001" x2="15.001" y1="26.3296" y2="3.0368">
 <stop offset="0" style="stop-color:#FAF9F9"/>
 <stop offset="0.4" style="stop-color:#FAF9F9"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <path d="M14.999,26.666C8.566,26.666,3.333,21.432,3.333,15S8.566,3.334,14.999,3.334S26.668,8.568,26.668,15  S21.432,26.666,14.999,26.666L14.999,26.666z" fill="url(#SVGID_5_)"/>
 <path d="M14.999,15.832c3.849,0,7.521-0.322,10.89-0.905C25.848,8.956,20.98,4.111,14.999,4.111  c-5.979,0-10.846,4.845-10.886,10.815C7.479,15.51,11.15,15.832,14.999,15.832z" fill="#FFFFFF" fill-opacity="0.7" stroke-opacity="0.7"/>
@@ -78,23 +78,23 @@
 <rect fill="#404041" height="1.882" transform="matrix(0.8678 -0.497 0.497 0.8678 -9.1555 13.0056)" width="0.627" x="19.548" y="22.766"/>
 <rect fill="#404041" height="1.884" transform="matrix(0.497 -0.8678 0.8678 0.497 -5.7368 10.9541)" width="0.627" x="6.267" y="9.483"/>
 <rect fill="#404041" height="1.882" transform="matrix(0.4991 -0.8665 0.8665 0.4991 -5.7273 30.3844)" width="0.63" x="23.105" y="19.206"/>
-<path d="M15.953,15.552c-0.04-0.188-0.133-0.352-0.261-0.482l1.34-4.418l-1.117-0.34l-1.392,4.587  c-0.24,0.138-0.42,0.372-0.475,0.653h-2.55v0.389h2.55c0.009,0.05,0.024,0.101,0.043,0.148L8.091,22.09l0.505,0.506l5.978-5.979  c0.129,0.063,0.273,0.102,0.427,0.102c0.471,0,0.862-0.333,0.953-0.777h9.158v-0.389H15.953z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M15.953,15.552c-0.04-0.188-0.133-0.352-0.261-0.482l1.34-4.418l-1.117-0.34l-1.392,4.587  c-0.24,0.138-0.42,0.372-0.475,0.653h-2.55v0.389h2.55c0.009,0.05,0.024,0.101,0.043,0.148L8.091,22.09l0.505,0.506l5.978-5.979  c0.129,0.063,0.273,0.102,0.427,0.102c0.471,0,0.862-0.333,0.953-0.777h9.158v-0.389H15.953z" fill="#222021" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(0.9569 0.2903 -0.2903 0.9569 409.6663 189.0642)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-428.2788" x2="-428.2788" y1="-57.4336" y2="-51.435">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<stop offset="0" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#222021"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="17.032,10.101 15.915,9.763 14.22,15.344 15.339,15.684 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="8.3799" x2="15.2201" y1="21.7544" y2="14.9142">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#231F20"/>
+<stop offset="0" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#222021"/>
 </linearGradient>
 <polygon fill="url(#SVGID_7_)" points="15.479,15.16 14.974,14.655 8.091,21.539 8.596,22.044 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="18.3057" x2="18.3057" y1="14.9443" y2="15.5124">
-<stop offset="0" style="stop-color:#FF0000"/>
-<stop offset="1" style="stop-color:#A8000B"/>
+<stop offset="0" style="stop-color:#B34D4D"/>
+<stop offset="1" style="stop-color:#763242"/>
 </linearGradient>
 <path d="M25.111,15h-9.158c-0.091-0.442-0.482-0.778-0.953-0.778S14.138,14.558,14.049,15h-2.55v0.389h2.55  c0.089,0.443,0.48,0.778,0.951,0.778s0.862-0.335,0.953-0.778h9.158V15z" fill="url(#SVGID_8_)"/>
-<circle cx="15" cy="15.194" fill="#F99792" r="0.583"/>
+<circle cx="15" cy="15.194" fill="#DABEB1" r="0.583"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_service.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_service.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_service.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -19,8 +19,8 @@
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559  c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
 <path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0  c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
@@ -36,30 +36,30 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5  c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
 <path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15  l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691  l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586  c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156  l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979  l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202  l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848  L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212  l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15  c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428  C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15  C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094  c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
 <radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383  l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15  l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85  l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164  l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552  l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443  L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247  l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_tv.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_tv.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_tv.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -19,8 +19,8 @@
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559  c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
 <path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0  c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
@@ -43,26 +43,26 @@
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="3.2046" y2="25.112">
 <stop offset="0" style="stop-color:#F2F2F2"/>
 <stop offset="0.1212" style="stop-color:#F2F2F2"/>
-<stop offset="0.5515" style="stop-color:#ADB2B5"/>
-<stop offset="1" style="stop-color:#E6E9E8"/>
+<stop offset="0.5515" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#E7E8E7"/>
 </linearGradient>
 <path d="M29,24.333c0,0.431-0.35,0.777-0.778,0.777H1.777C1.348,25.11,1,24.764,1,24.333V4.111  c0-0.429,0.348-0.777,0.777-0.777h26.444C28.65,3.334,29,3.683,29,4.111V24.333z" fill="url(#SVGID_2__)"/>
-<path d="M28.222,24.723H1.777C1.348,24.723,1,24.374,1,23.944v0.389c0,0.431,0.348,0.777,0.777,0.777  h26.444c0.429,0,0.778-0.347,0.778-0.777v-0.389C29,24.374,28.65,24.723,28.222,24.723z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M28.222,24.723H1.777C1.348,24.723,1,24.374,1,23.944v0.389c0,0.431,0.348,0.777,0.777,0.777  h26.444c0.429,0,0.778-0.347,0.778-0.777v-0.389C29,24.374,28.65,24.723,28.222,24.723z" fill="#222021" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.999" x2="14.999" y1="20.7036" y2="5.2349">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <rect fill="url(#SVGID_3__)" height="15.943" width="24.889" x="2.555" y="4.89"/>
 <rect fill="#FFFFFF" height="0.39" width="24.889" x="2.555" y="20.443"/>
 <polygon fill="#FFFFFF" fill-opacity="0.2" points="2.95,13.056 27.055,9.876 27.055,5.277 2.943,5.277 " stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.999" x2="14.999" y1="24.2773" y2="21.3131">
-<stop offset="0" style="stop-color:#57CDEA"/>
-<stop offset="1" style="stop-color:#196BDE"/>
+<stop offset="0" style="stop-color:#83BEB9"/>
+<stop offset="1" style="stop-color:#5473A3"/>
 </linearGradient>
 <path d="M15,21.806c0.537,0,0.971,0.436,0.971,0.972S15.537,23.75,15,23.75c-0.535,0-0.973-0.437-0.973-0.973  S14.465,21.806,15,21.806 M15,21.222c-0.859,0-1.557,0.697-1.557,1.556c0,0.859,0.697,1.556,1.557,1.556s1.555-0.696,1.555-1.556  C16.555,21.919,15.859,21.222,15,21.222L15,21.222z" fill="url(#SVGID_4__)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="3.7866" y2="24.3979">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+<stop offset="0" style="stop-color:#E7E8E7"/>
+<stop offset="1" style="stop-color:#AFB3B2"/>
 </linearGradient>
 <path d="M27.832,3.722H2.166c-0.43,0-0.777,0.349-0.777,0.778v19.055c0,0.431,0.348,0.778,0.777,0.778h11.369  c-0.414-0.39-0.674-0.941-0.674-1.556c0-0.613,0.26-1.165,0.674-1.556H2.166V4.5h25.666v16.722H16.465  c0.414,0.391,0.674,0.942,0.674,1.556c0,0.614-0.26,1.166-0.674,1.556h11.367c0.43,0,0.779-0.348,0.779-0.778V4.5  C28.611,4.07,28.262,3.722,27.832,3.722z" fill="url(#SVGID_5_)"/>
 <path d="M21.611,26.277H8.389c-0.35,0-0.643-0.248-0.727-0.583c-0.016,0.063-0.027,0.127-0.027,0.194  c0,0.431,0.338,0.778,0.754,0.778h13.223c0.416,0,0.754-0.348,0.754-0.778c0-0.067-0.012-0.132-0.027-0.194  C22.254,26.029,21.963,26.277,21.611,26.277z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_recorder.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_recorder.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_recorder.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,10 +5,10 @@
 <rect fill="none" height="60" width="60"/>
 <path d="M49.816,18.774L49.816,18.774c2.203-4.334,1.499-9.768-2.128-13.393c-3.624-3.624-9.056-4.33-13.391-2.127  l0,0c0,0-0.002,0.001-0.005,0.002c-1.055,0.538-2.049,1.242-2.932,2.125L21.019,15.725c-0.3-0.3-0.79-0.3-1.09,0l-0.544,0.544  v-0.002l-2.177,2.179c-0.299,0.3-0.299,0.789,0,1.089l-4.897,4.897c-4.51,4.51-4.51,11.821,0,16.33  c2.907,2.907,6.978,3.929,10.711,3.087c0.18-0.039,0.357-0.081,0.535-0.131c0.151-0.041,0.301-0.088,0.449-0.135  c0.041-0.015,0.083-0.024,0.125-0.038v3.85c-0.892,0.086-1.541,0.4-1.541,1.388v5.367h-5.405c-0.166,0-0.327,0.02-0.482,0.055  c-0.028,0.005-0.05,0.016-0.077,0.021c-0.13,0.033-0.258,0.074-0.378,0.128c-0.012,0.005-0.023,0.013-0.036,0.017  c-0.776,0.364-1.32,1.14-1.32,2.046v0.506c0,0.084,0.005,0.166,0.014,0.333c0.008,0.153,0.02,0.377,0.033,0.745h0.002h22.994h0.001  c0.032-0.767,0.048-0.92,0.048-1.078v-0.506c0-0.906-0.542-1.682-1.321-2.046c-0.01-0.004-0.021-0.012-0.033-0.017  c-0.122-0.054-0.248-0.095-0.378-0.128c-0.027-0.006-0.051-0.017-0.077-0.021c-0.156-0.035-0.317-0.055-0.482-0.055h-5.405  l-0.001-5.367c0-0.987-0.649-1.302-1.538-1.388v-6.742l4.788-4.79c0.301,0.3,0.79,0.3,1.09,0l2.721-2.721  c0.3-0.299,0.3-0.789,0-1.089c0,0,10.687-10.718,10.854-10.906v-0.001c0.645-0.736,1.186-1.529,1.613-2.367L49.816,18.774z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="267.0962" x2="290.189" y1="468.0112" y2="468.0112">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+<stop offset="0.7091" style="stop-color:#6A6C6E"/>
+<stop offset="1" style="stop-color:#AAAFAE"/>
 </linearGradient>
 <path d="M47.688,5.382c-4.507-4.509-11.819-4.509-16.327,0L21.019,15.725l16.328,16.328l10.341-10.342  C52.198,17.202,52.199,9.893,47.688,5.382z" fill="url(#SVGID_1_)"/>
 <path d="M47.688,5.382c-4.507-4.509-11.819-4.509-16.327,0l-1.634,1.633  c4.51-4.509,9.643-2.331,14.151,2.178c4.511,4.51,6.687,9.644,2.178,14.151l1.632-1.633C52.198,17.202,52.199,9.893,47.688,5.382z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -58,147 +58,147 @@
 <circle cx="41.157" cy="11.914" fill="#FFFFFF" r="0.77"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="267.4819" x2="267.4819" y1="462.314" y2="479.7079">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M23.196,14.637c0.301-0.302,0.301-0.788,0-1.091l-1.088,1.091  C22.409,14.937,22.895,14.937,23.196,14.637z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="267.481" x2="267.481" y1="462.3311" y2="479.7029">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M27.549,10.28c0.302-0.3,0.302-0.788,0-1.088l-1.087,1.088C26.763,10.582,27.249,10.581,27.549,10.28  z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="267.481" x2="267.481" y1="462.3467" y2="479.6524">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M31.903,5.927c0.292-0.291,0.294-0.754,0.023-1.057c-0.192,0.168-0.386,0.33-0.566,0.512  l-0.545,0.545C31.116,6.228,31.603,6.228,31.903,5.927z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="270.9458" x2="270.9458" y1="462.3418" y2="479.7027">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="27.549" cy="14.635" fill="url(#SVGID_7_)" r="0.769"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="270.9458" x2="270.9458" y1="462.3311" y2="479.6974">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="31.905" cy="10.28" fill="url(#SVGID_8_)" r="0.769"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="270.9458" x2="270.9458" y1="462.3247" y2="479.6966">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="36.26" cy="5.926" fill="url(#SVGID_9_)" r="0.769"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="274.7954" x2="274.7954" y1="462.314" y2="479.7079">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="28.094" cy="19.534" fill="url(#SVGID_10_)" r="0.77"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="274.7944" x2="274.7944" y1="462.3257" y2="479.7086">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="32.448" cy="15.181" fill="url(#SVGID_11_)" r="0.77"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="274.7944" x2="274.7944" y1="462.3267" y2="479.6985">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="36.803" cy="10.825" fill="url(#SVGID_12_)" r="0.769"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="289.8052" x2="289.8052" y1="462.335" y2="479.7068">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M38.437,29.876c-0.301,0.301-0.301,0.788,0,1.088l1.088-1.088  C39.225,29.574,38.737,29.575,38.437,29.876z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="289.8052" x2="289.8052" y1="462.3247" y2="479.7076">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M42.79,25.521c-0.301,0.301-0.301,0.787,0,1.09l1.088-1.09C43.579,25.22,43.091,25.22,42.79,25.521z  " fill="url(#SVGID_14_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="289.8032" x2="289.8032" y1="462.3516" y2="479.6407">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M48.201,21.146c-0.302-0.274-0.765-0.271-1.057,0.02c-0.301,0.302-0.301,0.788,0,1.089l0.544-0.544  C47.871,21.529,48.034,21.335,48.201,21.146z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="286.3403" x2="286.3403" y1="462.3247" y2="479.7076">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="38.436" cy="25.521" fill="url(#SVGID_16_)" r="0.77"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="286.3403" x2="286.3403" y1="462.3271" y2="479.7046">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="42.79" cy="21.167" fill="url(#SVGID_17_)" r="0.77"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="286.3403" x2="286.3403" y1="462.3262" y2="479.7036">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M47.688,17.357c-0.297,0.3-0.786,0.3-1.088,0c-0.301-0.301-0.301-0.788,0-1.089s0.787-0.301,1.088,0  C47.991,16.569,47.989,17.057,47.688,17.357z" fill="url(#SVGID_18_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="282.4907" x2="282.4907" y1="462.3296" y2="479.707">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M34.08,25.521c-0.298,0.301-0.786,0.301-1.088,0c-0.301-0.301-0.301-0.788,0-1.089  c0.301-0.3,0.789-0.301,1.088,0C34.383,24.734,34.381,25.22,34.08,25.521z" fill="url(#SVGID_19_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="282.4917" x2="282.4917" y1="462.3237" y2="479.7066">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="37.892" cy="20.622" fill="url(#SVGID_20_)" r="0.77"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="282.4917" x2="282.4917" y1="462.3267" y2="479.7041">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="42.246" cy="16.269" fill="url(#SVGID_21_)" r="0.77"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="278.6431" x2="278.6431" y1="462.3335" y2="479.7054">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="32.992" cy="20.078" fill="url(#SVGID_22_)" r="0.769"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="278.6431" x2="278.6431" y1="462.3223" y2="479.7107">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <circle cx="37.347" cy="15.724" fill="url(#SVGID_23_)" r="0.77"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="278.6431" x2="278.6431" y1="462.3242" y2="479.7016">
 <stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
+<stop offset="0.2" style="stop-color:#4F4F4F"/>
 <stop offset="0.7152" style="stop-color:#000000"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
@@ -233,9 +233,9 @@
 <path d="M28.748,47.992c0,0.426-0.344,0.77-0.77,0.77h-3.079c-0.425,0-0.768-0.344-0.768-0.77V25.67  c0-0.425,0.343-0.771,0.768-0.771h3.079c0.426,0,0.77,0.346,0.77,0.771V47.992z" fill="url(#SVGID_27_)"/>
 <path d="M26.439,29.237c-2.124,0-3.849-1.727-3.849-3.848c0-2.123,1.725-3.85,3.849-3.85  c2.121,0,3.848,1.727,3.848,3.85C30.288,27.511,28.56,29.237,26.439,29.237L26.439,29.237z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="26.439" x2="26.439" y1="22.3696" y2="28.3803">
-<stop offset="0" style="stop-color:#9D9B9C"/>
-<stop offset="0.1515" style="stop-color:#D6D4D4"/>
-<stop offset="0.703" style="stop-color:#555557"/>
+<stop offset="0" style="stop-color:#9C9C9C"/>
+<stop offset="0.1515" style="stop-color:#D5D5D5"/>
+<stop offset="0.703" style="stop-color:#565656"/>
 <stop offset="0.9879" style="stop-color:#575757"/>
 <stop offset="1" style="stop-color:#575757"/>
 </linearGradient>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -43,30 +43,30 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5  c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
 <path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15  l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691  l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586  c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156  l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979  l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202  l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848  L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212  l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15  c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428  C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15  C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094  c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
 <radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383  l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15  l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85  l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164  l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552  l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443  L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247  l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_active.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_active.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_active.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,29 +3,29 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3687" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#A7E722"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+<stop offset="0" style="stop-color:#93AC5D"/>
+<stop offset="0.297" style="stop-color:#93AC5D"/>
+<stop offset="0.6667" style="stop-color:#356742"/>
+<stop offset="0.7939" style="stop-color:#447B42"/>
+<stop offset="1" style="stop-color:#447B42"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399  c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514  c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+<stop offset="0" style="stop-color:#3C7440"/>
+<stop offset="1" style="stop-color:#1E3A31"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737  c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12  c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112  C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711  c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571  C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617  C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B1BE95" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737  c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108  c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982  c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273  c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107  c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736  c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606  c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B1BE95" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+<stop offset="0" style="stop-color:#315D3E"/>
+<stop offset="0.5" style="stop-color:#1E3A31"/>
+<stop offset="1" style="stop-color:#2E593D"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31  c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535  c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
@@ -34,30 +34,30 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5  c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
 <path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15  l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691  l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586  c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156  l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979  l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202  l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848  L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212  l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15  c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428  C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15  C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094  c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
 <radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383  l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15  l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85  l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164  l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552  l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443  L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247  l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_end.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_end.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_end.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,37 +5,37 @@
 <rect fill="none" height="60" width="60"/>
 <g>
 <radialGradient cx="-1374.2305" cy="2708.6123" gradientTransform="matrix(0 1 1 0 -2678.1238 1416.3748)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="36.2612">
-<stop offset="0" style="stop-color:#FDA932"/>
-<stop offset="0.297" style="stop-color:#FDA932"/>
-<stop offset="0.6667" style="stop-color:#CF170D"/>
-<stop offset="0.7939" style="stop-color:#FD6E2C"/>
-<stop offset="1" style="stop-color:#FD6E2C"/>
+<stop offset="0" style="stop-color:#C0A26F"/>
+<stop offset="0.297" style="stop-color:#C0A26F"/>
+<stop offset="0.6667" style="stop-color:#954749"/>
+<stop offset="0.7939" style="stop-color:#BE8A6B"/>
+<stop offset="1" style="stop-color:#BE8A6B"/>
 </radialGradient>
 <path d="M17.884,35.418c0.413-0.078,0.579-0.318,0.603-0.895c0.027-0.721,0.29-3.172,0.431-3.764   c0.124-0.521,0.342-0.805,0.941-0.98c0.75-0.22,3.188-1.037,10.143-1.038c6.954,0,9.393,0.807,10.141,1.038   c0.651,0.201,0.777,0.389,0.941,0.98c0.162,0.586,0.402,3.043,0.431,3.764c0.024,0.576,0.16,0.82,0.577,0.883   c0.731,0.113,13.291,2.238,14.601,2.502c0.794,0.16,1.237,0.045,1.292-0.705c0.231-3.012-2.009-7.641-3.005-9.067   c-0.887-1.274-1.687-2.667-3.82-3.557c-2.028-0.845-12.133-2.548-21.158-2.548c-9.026-0.001-19.132,1.704-21.159,2.548   c-2.133,0.889-2.935,2.282-3.82,3.555c-0.995,1.429-3.237,6.055-3.006,9.069c0.058,0.748,0.5,0.863,1.292,0.703   C4.62,37.645,17.169,35.549,17.884,35.418z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0 1 1 0 -2678.1238 1416.3748)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1383.7373" x2="-1383.3947" y1="2721.2969" y2="2718.4587">
-<stop offset="0" style="stop-color:#C8540E"/>
-<stop offset="1" style="stop-color:#990C00"/>
+<stop offset="0" style="stop-color:#905A46"/>
+<stop offset="1" style="stop-color:#6B2E36"/>
 </linearGradient>
 <path d="M40.145,29.779c0.65,0.202,0.775,0.39,0.94,0.981c0.162,0.584,0.401,3.043,0.431,3.762   c0.024,0.578,0.16,0.82,0.576,0.885c0.046,0.008,0.062,0.01,0.063,0.01c0.244,0.039,0.993,0.164,2.039,0.342   c-0.026-0.258-0.37-3.525-1.036-4.357C41.938,29.877,40.145,29.779,40.145,29.779z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0 1 -1 0 -3579.3215 1416.3782)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1383.7422" x2="-1383.3992" y1="-3596.1938" y2="-3599.0347">
-<stop offset="0" style="stop-color:#C8540E"/>
-<stop offset="1" style="stop-color:#990C00"/>
+<stop offset="0" style="stop-color:#905A46"/>
+<stop offset="1" style="stop-color:#6B2E36"/>
 </linearGradient>
 <path d="M19.841,29.779c-0.654,0.203-0.778,0.39-0.942,0.981c-0.163,0.586-0.404,3.045-0.433,3.766   c-0.021,0.574-0.158,0.818-0.574,0.883c-0.047,0.008-0.061,0.01-0.061,0.01c-0.245,0.039-0.994,0.164-2.041,0.338   c0.028-0.254,0.371-3.523,1.036-4.355C18.043,29.876,19.841,29.779,19.841,29.779z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 51.2805 -77.5527)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="78.5283" x2="43.332" y1="-72.9224" y2="-108.1187">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+<stop offset="0" style="stop-color:#D3C59A"/>
+<stop offset="1" style="stop-color:#D0BA98"/>
 </linearGradient>
 <path d="M5.021,28.75c0.887-1.275,1.688-2.668,3.819-3.555   c2.029-0.846,12.134-2.55,21.16-2.549c9.027-0.001,19.13,1.703,21.161,2.549c2.131,0.888,2.933,2.28,3.819,3.554   c0.912,1.311,2.875,5.32,3.009,8.3c0.146-3.016-2.031-7.511-3.009-8.915c-0.888-1.274-1.688-2.666-3.82-3.556   c-2.028-0.845-12.134-2.548-21.158-2.549c-9.027,0.001-19.133,1.706-21.16,2.55c-2.133,0.889-2.935,2.282-3.82,3.555   c-0.979,1.404-3.158,5.899-3.009,8.915C2.146,34.068,4.108,30.06,5.021,28.75z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 51.2805 -77.5527)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="82.8936" x2="42.849" y1="-73.0874" y2="-113.132">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+<stop offset="0" style="stop-color:#D3C59A"/>
+<stop offset="1" style="stop-color:#D0BA98"/>
 </linearGradient>
 <path d="M17.884,35.418c0.413-0.078,0.579-0.318,0.603-0.895   c0.027-0.721,0.29-3.172,0.431-3.764c0.124-0.521,0.342-0.805,0.941-0.98c0.75-0.22,3.188-1.037,10.143-1.038   c6.954,0,9.393,0.807,10.141,1.038c0.651,0.201,0.777,0.389,0.941,0.98c0.162,0.586,0.402,3.043,0.431,3.764   c0.024,0.576,0.16,0.82,0.577,0.883c0.731,0.113,13.291,2.238,14.601,2.502c0.794,0.16,1.237,0.045,1.292-0.705   c0.027-0.354,0.018-0.73-0.017-1.119c-0.094,0.643-0.526,0.748-1.276,0.594c-1.311-0.262-13.869-2.385-14.6-2.5   c-0.418-0.064-0.553-0.307-0.576-0.883c-0.029-0.719-0.27-3.177-0.433-3.765c-0.163-0.59-0.287-0.777-0.941-0.979   c-0.746-0.229-3.188-1.039-10.14-1.037c-6.954,0-9.393,0.817-10.143,1.037c-0.599,0.176-0.816,0.459-0.94,0.981   c-0.141,0.59-0.403,3.042-0.433,3.763c-0.022,0.576-0.189,0.816-0.603,0.893C17.168,34.32,4.62,36.414,3.309,36.68   c-0.751,0.15-1.183,0.049-1.275-0.596c-0.036,0.389-0.044,0.766-0.018,1.119c0.058,0.748,0.5,0.861,1.292,0.703   C4.62,37.645,17.169,35.549,17.884,35.418z" fill="url(#SVGID_5_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(0 1 1 0 -2702.5007 1379.2039)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-1353.1973" x2="-1353.1973" y1="2756.7813" y2="2707.613">
-<stop offset="0" style="stop-color:#B6661B"/>
-<stop offset="0.5" style="stop-color:#700303"/>
-<stop offset="1" style="stop-color:#B6661B"/>
+<stop offset="0" style="stop-color:#885F4A"/>
+<stop offset="0.5" style="stop-color:#4F2430"/>
+<stop offset="1" style="stop-color:#885F4A"/>
 </linearGradient>
 <path d="M6.355,27.326c2.275-0.843,14.095-2.529,23.646-2.53   c9.552,0,21.371,1.687,23.646,2.53c0.431,0.161,0.804,0.343,1.144,0.531c-0.233-0.341-0.472-0.685-0.733-1.024   c-0.069-0.028-0.127-0.056-0.196-0.082c-2.309-0.856-14.245-2.568-23.858-2.568c-9.616,0-21.553,1.71-23.862,2.566   c-0.07,0.028-0.128,0.058-0.198,0.085c-0.26,0.339-0.5,0.685-0.733,1.023C5.554,27.667,5.924,27.487,6.355,27.326z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 </g>
@@ -44,30 +44,30 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5  c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
 <path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15  l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691  l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586  c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156  l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979  l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202  l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848  L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212  l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15  c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428  C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15  C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094  c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
 <radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383  l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15  l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85  l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164  l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552  l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443  L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247  l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_hold.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_hold.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_hold.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,37 +3,37 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-2349.8247" cy="1517.2324" gradientTransform="matrix(4.489659e-010 -1 -1 -4.489659e-010 1546.7637 -2331.9561)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="36.2594">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="0.297" style="stop-color:#FFC144"/>
-<stop offset="0.6667" style="stop-color:#EF6902"/>
-<stop offset="0.7939" style="stop-color:#FEB037"/>
-<stop offset="1" style="stop-color:#FEB037"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="0.297" style="stop-color:#C7B17C"/>
+<stop offset="0.6667" style="stop-color:#A86F49"/>
+<stop offset="0.7939" style="stop-color:#C2A673"/>
+<stop offset="1" style="stop-color:#C2A673"/>
 </radialGradient>
 <path d="M42.117,24.584c-0.412,0.077-0.578,0.316-0.602,0.895c-0.027,0.719-0.291,3.172-0.433,3.764  c-0.125,0.521-0.342,0.804-0.94,0.979c-0.75,0.221-3.188,1.038-10.144,1.039c-6.953,0-9.396-0.809-10.142-1.038  c-0.651-0.201-0.774-0.389-0.94-0.98c-0.162-0.586-0.401-3.045-0.433-3.764c-0.022-0.576-0.157-0.819-0.575-0.883  c-0.729-0.113-13.291-2.238-14.601-2.502c-0.795-0.158-1.236-0.045-1.293,0.704c-0.231,3.013,2.01,7.642,3.004,9.068  c0.888,1.272,1.688,2.664,3.82,3.555C10.869,36.267,20.977,37.97,30,37.97c9.027,0,19.132-1.705,21.159-2.549  c2.134-0.891,2.934-2.282,3.82-3.555c0.994-1.429,3.236-6.056,3.005-9.068c-0.057-0.749-0.499-0.862-1.293-0.702  C55.381,22.357,42.832,24.451,42.117,24.584z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(4.489659e-010 -1 -1 -4.489659e-010 1546.7637 -2331.9561)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2359.3091" x2="-2358.9661" y1="1529.9209" y2="1527.0802">
-<stop offset="0" style="stop-color:#E17B15"/>
-<stop offset="1" style="stop-color:#B05004"/>
+<stop offset="0" style="stop-color:#A47952"/>
+<stop offset="1" style="stop-color:#7C4738"/>
 </linearGradient>
 <path d="M19.859,30.222c-0.652-0.201-0.775-0.389-0.941-0.98c-0.162-0.586-0.402-3.045-0.432-3.764  c-0.023-0.576-0.158-0.819-0.576-0.883c-0.047-0.008-0.061-0.011-0.061-0.012c-0.246-0.039-0.994-0.165-2.041-0.34  c0.024,0.255,0.371,3.523,1.034,4.354C18.064,30.123,19.859,30.222,19.859,30.222z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(4.489659e-010 -1 1 4.489659e-010 2447.9541 -2331.959)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2359.3081" x2="-2358.9651" y1="-2404.8115" y2="-2407.6523">
-<stop offset="0" style="stop-color:#E17B15"/>
-<stop offset="1" style="stop-color:#B05004"/>
+<stop offset="0" style="stop-color:#A47952"/>
+<stop offset="1" style="stop-color:#7C4738"/>
 </linearGradient>
 <path d="M40.16,30.222c0.654-0.203,0.779-0.389,0.943-0.98c0.162-0.586,0.401-3.045,0.434-3.766  c0.021-0.574,0.158-0.817,0.574-0.883c0.045-0.008,0.059-0.009,0.059-0.009c0.246-0.04,0.994-0.166,2.041-0.34  c-0.026,0.256-0.369,3.522-1.035,4.354C41.957,30.124,40.16,30.222,40.16,30.222z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 -1182.6451 -838.0215)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1453.7261" x2="-1488.9213" y1="-225.5083" y2="-260.7034">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+<stop offset="0" style="stop-color:#D3C59A"/>
+<stop offset="1" style="stop-color:#D0BA98"/>
 </linearGradient>
 <path d="M54.979,31.252c-0.888,1.272-1.688,2.667-3.819,3.555  c-2.027,0.845-12.132,2.549-21.16,2.549c-9.025,0-19.129-1.704-21.158-2.549c-2.133-0.889-2.934-2.281-3.82-3.555  c-0.912-1.312-2.873-5.318-3.008-8.299c-0.147,3.014,2.029,7.509,3.008,8.913c0.888,1.272,1.688,2.664,3.82,3.555  C10.869,36.267,20.977,37.97,30,37.97c9.027,0,19.132-1.705,21.159-2.549c2.134-0.891,2.934-2.282,3.82-3.555  c0.979-1.404,3.158-5.899,3.009-8.913C57.854,25.934,55.895,29.94,54.979,31.252z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 -1182.6451 -838.0215)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-1449.3701" x2="-1489.4139" y1="-225.6621" y2="-265.7059">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+<stop offset="0" style="stop-color:#D3C59A"/>
+<stop offset="1" style="stop-color:#D0BA98"/>
 </linearGradient>
 <path d="M42.117,24.584c-0.412,0.077-0.578,0.316-0.602,0.895  c-0.027,0.719-0.291,3.172-0.433,3.764c-0.125,0.521-0.342,0.804-0.94,0.979c-0.75,0.221-3.188,1.038-10.144,1.039  c-6.953,0-9.396-0.809-10.142-1.038c-0.651-0.201-0.774-0.389-0.94-0.98c-0.162-0.586-0.401-3.045-0.433-3.764  c-0.022-0.576-0.157-0.819-0.575-0.883c-0.729-0.113-13.291-2.238-14.601-2.502c-0.795-0.158-1.236-0.045-1.293,0.704  c-0.027,0.354-0.018,0.729,0.019,1.12c0.094-0.645,0.524-0.747,1.274-0.596c1.312,0.265,13.869,2.388,14.601,2.5  c0.418,0.064,0.553,0.309,0.575,0.884c0.029,0.722,0.271,3.179,0.433,3.766c0.164,0.589,0.289,0.776,0.94,0.979  c0.746,0.229,3.188,1.038,10.142,1.037c6.955,0.001,9.394-0.816,10.144-1.036c0.6-0.177,0.815-0.458,0.94-0.981  c0.142-0.59,0.402-3.043,0.433-3.763c0.022-0.576,0.188-0.815,0.602-0.894c0.715-0.133,13.264-2.228,14.574-2.49  c0.75-0.151,1.184-0.051,1.274,0.594c0.036-0.389,0.046-0.768,0.019-1.119c-0.058-0.749-0.499-0.863-1.293-0.703  C55.381,22.357,42.832,24.451,42.117,24.584z" fill="url(#SVGID_5_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(4.489659e-010 -1 -1 -4.489659e-010 1571.1406 -2294.7852)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2328.7651" x2="-2328.7651" y1="1565.4004" y2="1516.2345">
-<stop offset="0" style="stop-color:#CF8122"/>
-<stop offset="0.5" style="stop-color:#8C4105"/>
-<stop offset="1" style="stop-color:#CF8122"/>
+<stop offset="0" style="stop-color:#9B7956"/>
+<stop offset="0.5" style="stop-color:#64352E"/>
+<stop offset="1" style="stop-color:#9B7956"/>
 </linearGradient>
 <path d="M53.646,32.675C51.37,33.519,39.55,35.204,30,35.205  c-9.551,0-21.371-1.688-23.645-2.53c-0.433-0.161-0.804-0.342-1.144-0.532c0.231,0.341,0.472,0.687,0.731,1.025  c0.068,0.026,0.127,0.056,0.197,0.083C8.451,34.105,20.387,35.818,30,35.818c9.614,0,21.55-1.711,23.86-2.566  c0.069-0.027,0.129-0.059,0.196-0.085c0.261-0.339,0.5-0.685,0.733-1.023C54.447,32.333,54.077,32.514,53.646,32.675z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
@@ -42,30 +42,30 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5  c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
 <path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15  l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691  l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586  c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156  l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979  l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202  l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848  L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212  l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15  c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428  C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15  C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094  c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
 <radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383  l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15  l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85  l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164  l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552  l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443  L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247  l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_waiting.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_waiting.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_waiting.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,37 +3,37 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3691" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="0.297" style="stop-color:#FFC144"/>
-<stop offset="0.6667" style="stop-color:#EF6902"/>
-<stop offset="0.7939" style="stop-color:#FEB037"/>
-<stop offset="1" style="stop-color:#FEB037"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="0.297" style="stop-color:#C7B17C"/>
+<stop offset="0.6667" style="stop-color:#A86F49"/>
+<stop offset="0.7939" style="stop-color:#C2A673"/>
+<stop offset="1" style="stop-color:#C2A673"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.259-1.333c-0.616-0.665-2.566-3.083-2.968-3.735  c-0.353-0.575-0.411-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.084-7.646,9.955-8.107  c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.523-1.778c-2.477-2.889-8.594-5.015-10.75-5.399  c-1.924-0.345-3.877-0.872-6.568,0.235c-2.559,1.054-13.074,8.536-21.11,16.572C11.203,27.277,3.723,37.795,2.668,40.352  c-1.107,2.691-0.58,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.853,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3418" x2="-1638.9102" y1="-2494.9819" y2="-2491.4063">
-<stop offset="0" style="stop-color:#E17B15"/>
-<stop offset="1" style="stop-color:#B05004"/>
+<stop offset="0" style="stop-color:#A47952"/>
+<stop offset="1" style="stop-color:#7C4738"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.035,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.738,2.119-1.514  c-0.252-0.204-3.469-2.809-4.801-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3462" x2="-1638.9143" y1="4063.0557" y2="4066.6326">
-<stop offset="0" style="stop-color:#E17B15"/>
-<stop offset="1" style="stop-color:#B05004"/>
+<stop offset="0" style="stop-color:#A47952"/>
+<stop offset="1" style="stop-color:#7C4738"/>
 </linearGradient>
 <path d="M17.093,35.188c-0.401,0.763-0.347,1.039,0.034,1.713c0.376,0.666,2.352,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.297c-0.034,0.048-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.203-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.093,35.188,17.093,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="48.4072" x2="4.0833" y1="3.4473" y2="47.7712">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+<stop offset="0" style="stop-color:#D3C59A"/>
+<stop offset="1" style="stop-color:#D0BA98"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.345-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.34,4.269,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236  c1.98,0.354,7.297,2.178,10.07,4.711c-2.553-2.815-8.496-4.879-10.617-5.258c-1.924-0.345-3.877-0.872-6.568,0.235  c-2.559,1.054-13.074,8.536-21.11,16.572C11.203,27.277,3.723,37.795,2.668,40.352c-1.107,2.691-0.58,4.645-0.236,6.567  c0.379,2.122,2.441,8.065,5.259,10.617C5.155,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="53.9023" x2="3.4732" y1="3.6543" y2="54.0835">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+<stop offset="0" style="stop-color:#D3C59A"/>
+<stop offset="1" style="stop-color:#D0BA98"/>
 </linearGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.259-1.333  c-0.616-0.665-2.566-3.083-2.968-3.735c-0.353-0.575-0.411-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.084-7.646,9.955-8.107c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.523-1.778  c-0.291-0.339-0.635-0.665-1.012-0.982c0.488,0.657,0.197,1.134-0.607,1.666c-1.4,0.933-14.475,10.225-15.227,10.775  c-0.43,0.314-0.768,0.219-1.299-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.949-0.436-1.711-0.034  c-0.869,0.46-3.763,1.914-9.954,8.106c-6.193,6.192-7.636,9.092-8.108,9.956c-0.378,0.69-0.319,1.135,0.036,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.492,0.533,0.559,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195  c-0.534,0.803-1.009,1.098-1.665,0.606c0.314,0.378,0.643,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.853,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-1610.521" x2="-1610.521" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#CF8122"/>
-<stop offset="0.5" style="stop-color:#8C4105"/>
-<stop offset="1" style="stop-color:#CF8122"/>
+<stop offset="0" style="stop-color:#9B7956"/>
+<stop offset="0.5" style="stop-color:#64352E"/>
+<stop offset="1" style="stop-color:#9B7956"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31  c8.506-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.533,18.959S3.489,41.869,2.195,44.688  c-0.038,0.087-0.063,0.166-0.101,0.251c0.07,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
@@ -42,30 +42,30 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5  c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
 <path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15  l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691  l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586  c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156  l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979  l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202  l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848  L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212  l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15  c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428  C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15  C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094  c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
 <radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383  l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15  l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85  l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164  l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552  l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443  L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247  l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_dialled_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_dialled_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_dialled_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -43,30 +43,30 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5  c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
 <path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15  l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691  l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586  c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156  l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979  l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202  l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848  L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212  l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15  c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428  C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15  C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094  c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
 <radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383  l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15  l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85  l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164  l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552  l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443  L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247  l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
 </g>
@@ -74,20 +74,20 @@
 <polygon fill="none" points="30.152,0.436 15.607,0.436 15.186,0 14.762,0.436 0.152,0.436 0.152,15.436 0,15.592 0.152,15.592   0.152,30.436 30.152,30.436 30.152,15.594 30.295,15.594 30.152,15.447 "/>
 <polygon fill-opacity="0.35" points="8.484,30.434 8.48,15.594 0.4,15.594 0,15.592 15.186,0 30.295,15.594 21.907,15.594 21.915,30.436   " stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8438)" gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="-2176.5103" x2="-2176.5103" y1="2985.5796" y2="2956.2766">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1455" style="stop-color:#45E8FF"/>
-<stop offset="0.5576" style="stop-color:#30A4D5"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#7DC7BB"/>
+<stop offset="0.1455" style="stop-color:#7DC7BB"/>
+<stop offset="0.5576" style="stop-color:#6292A3"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1___)" points="27.438,14.594 15.184,1.861 2.814,14.594 9.48,14.594 9.484,29.142 20.91,29.145   20.907,14.594 "/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8438)" gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="-2176.4844" x2="-2176.4844" y1="2984.1128" y2="2970.6938">
-<stop offset="0" style="stop-color:#B3FCFF"/>
-<stop offset="0.4182" style="stop-color:#B3FCFF"/>
-<stop offset="1" style="stop-color:#5FBAD8"/>
+<stop offset="0" style="stop-color:#CAE8D4"/>
+<stop offset="0.4182" style="stop-color:#CAE8D4"/>
+<stop offset="1" style="stop-color:#83B4B4"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2___)" points="3.195,14.592 15.182,2.286 27.108,14.594 27.934,14.594 15.184,1.436 2.37,14.592 "/>
 <line fill="none" x1="9.484" x2="20.91" y1="29.138" y2="29.14"/>
-<polygon fill="#33AEDB" points="20.912,29.436 9.484,29.434 9.484,28.842 20.912,28.844 "/>
+<polygon fill="#659BA9" points="20.912,29.436 9.484,29.434 9.484,28.842 20.912,28.844 "/>
 <rect fill="none" height="30" width="30" x="0.152" y="0.436"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_missed_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_missed_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_missed_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -43,30 +43,30 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5  c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
 <path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15  l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691  l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586  c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156  l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979  l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202  l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848  L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212  l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15  c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428  C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15  C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094  c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
 <radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383  l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15  l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85  l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164  l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552  l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443  L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247  l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
 </g>
@@ -74,18 +74,18 @@
 <polygon fill="none" points="15.053,0 14.626,0.439 0,0.439 0,30.439 30,30.439 30,0.439 15.476,0.439 "/>
 <path d="M24.884,30.438c-10.001,0-15.735-4.635-15.735-12.715v-4.339H2.053L15.053,0l12.88,13.385h-6.962v4.339  c0,2.189,2.56,2.768,3.913,2.768h1v9.947H24.884z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 2194 3014.6338)" gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="-2179" x2="-2179" y1="3012.1528" y2="2984.2842">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C6957B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <path d="M19.971,17.724v-5.339h5.611L15.049,1.438L4.418,12.385h5.73v5.339  c0,9.024,7.509,11.715,14.735,11.715v-7.947C22.658,21.491,19.971,20.392,19.971,17.724z" fill="url(#SVGID_1___)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="15" x2="15" y1="1.7129" y2="22.5894">
-<stop offset="0" style="stop-color:#FFB259"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#CDB48B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2___)" points="15.049,2.438 24.62,12.385 25.582,12.385 15.049,1.438 4.418,12.385 5.389,12.385 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3___" x1="22.4268" x2="22.4268" y1="1.7129" y2="22.5894">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C6957B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <path d="M19.971,17.724v1c0,2.668,2.688,3.768,4.913,3.768v-1C22.658,21.491,19.971,20.392,19.971,17.724z" fill="url(#SVGID_3___)"/>
 <rect fill="none" height="30" width="30" y="0.439"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_received_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_received_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_received_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,37 +4,37 @@
 <g>
 <rect fill="none" height="60" width="60"/>
 <radialGradient cx="-2058.7837" cy="-2250.877" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6653">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+<stop offset="0" style="stop-color:#6FB2B5"/>
+<stop offset="0.297" style="stop-color:#6FB2B5"/>
+<stop offset="0.6667" style="stop-color:#4C5F94"/>
+<stop offset="0.7939" style="stop-color:#679FAD"/>
+<stop offset="1" style="stop-color:#679FAD"/>
 </radialGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735  c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107  c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399  c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352  c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514  c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="1" style="stop-color:#1D1A33"/>
 </linearGradient>
 <path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236  c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235  c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567  c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+<stop offset="0" style="stop-color:#C4E6D4"/>
+<stop offset="1" style="stop-color:#7DA8B4"/>
 </linearGradient>
 <path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333  c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967  c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778  c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29  c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034  c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195  c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+<stop offset="0" style="stop-color:#5A7E9E"/>
+<stop offset="0.5091" style="stop-color:#1D1A33"/>
+<stop offset="1" style="stop-color:#516C8F"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803  c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102  c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25  c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
 <rect fill="none" height="60" width="60"/>
@@ -43,30 +43,30 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5  c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
 <path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15  l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691  l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586  c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156  l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979  l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202  l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848  L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212  l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15  c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428  C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15  C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094  c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
 <radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383  l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15  l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85  l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164  l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552  l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443  L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247  l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
 </g>
@@ -74,18 +74,18 @@
 <polygon fill="none" points="30.096,0 0.096,0 0.096,14.833 0,14.833 0.096,14.933 0.096,30 14.601,30 15.021,30.438 15.447,30   30.096,30 30.096,14.963 30.215,14.841 30.096,14.841 "/>
 <polygon fill-opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841   15.021,30.438 " stroke-opacity="0.35"/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="-2176.5142" x2="-2176.5142" y1="2984.646" y2="2957.3247">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1___)" points="2.846,15.859 15.025,28.575 27.398,15.845 20.732,15.843 20.727,1.292 9.375,1.291   9.375,15.859 "/>
 <line fill="none" x1="20.727" x2="9.375" y1="1.297" y2="1.296"/>
-<polygon fill="#E7FFB9" points="9.375,1 20.729,1.001 20.727,1.593 9.375,1.592 "/>
-<polygon fill="#E7FFB9" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
-<polygon fill="#E7FFB9" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
+<polygon fill="#E4EACE" points="9.375,1 20.729,1.001 20.727,1.593 9.375,1.592 "/>
+<polygon fill="#E4EACE" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
+<polygon fill="#E4EACE" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
 <linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="-2165.6621" x2="-2187.9482" y1="2963.2173" y2="2963.2173">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2___)" points="27.016,15.844 15.025,28.15 3.172,15.829 2.348,15.83 15.025,29 27.842,15.844 "/>
 <rect fill="none" height="30" width="30" x="0.096"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_waiting_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_waiting_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_waiting_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,37 +3,37 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <radialGradient cx="-1627.3691" cy="-2479.0078" gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="45.6647">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="0.297" style="stop-color:#FFC144"/>
-<stop offset="0.6667" style="stop-color:#EF6902"/>
-<stop offset="0.7939" style="stop-color:#FEB037"/>
-<stop offset="1" style="stop-color:#FEB037"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="0.297" style="stop-color:#C7B17C"/>
+<stop offset="0.6667" style="stop-color:#A86F49"/>
+<stop offset="0.7939" style="stop-color:#C2A673"/>
+<stop offset="1" style="stop-color:#C2A673"/>
 </radialGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.259-1.333c-0.616-0.665-2.566-3.083-2.968-3.735  c-0.353-0.575-0.411-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.084-7.646,9.955-8.107  c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274  c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.523-1.778c-2.477-2.889-8.594-5.015-10.75-5.399  c-1.924-0.345-3.877-0.872-6.568,0.235c-2.559,1.054-13.074,8.536-21.11,16.572C11.203,27.277,3.723,37.795,2.668,40.352  c-1.107,2.691-0.58,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.853,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3418" x2="-1638.9102" y1="-2494.9819" y2="-2491.4063">
-<stop offset="0" style="stop-color:#E17B15"/>
-<stop offset="1" style="stop-color:#B05004"/>
+<stop offset="0" style="stop-color:#A47952"/>
+<stop offset="1" style="stop-color:#7C4738"/>
 </linearGradient>
 <path d="M35.172,17.108c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.035,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.738,2.119-1.514  c-0.252-0.204-3.469-2.809-4.801-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3462" x2="-1638.9143" y1="4063.0557" y2="4066.6326">
-<stop offset="0" style="stop-color:#E17B15"/>
-<stop offset="1" style="stop-color:#B05004"/>
+<stop offset="0" style="stop-color:#A47952"/>
+<stop offset="1" style="stop-color:#7C4738"/>
 </linearGradient>
 <path d="M17.093,35.188c-0.401,0.763-0.347,1.039,0.034,1.713c0.376,0.666,2.352,3.069,2.967,3.738  c0.493,0.531,0.587,0.869,0.274,1.297c-0.034,0.048-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.119  c-0.203-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.093,35.188,17.093,35.188z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="48.4072" x2="4.0833" y1="3.4473" y2="47.7712">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+<stop offset="0" style="stop-color:#D3C59A"/>
+<stop offset="1" style="stop-color:#D0BA98"/>
 </linearGradient>
 <path d="M2.979,47.467c-0.345-1.925-0.873-3.878,0.235-6.567  c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.34,4.269,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236  c1.98,0.354,7.297,2.178,10.07,4.711c-2.553-2.815-8.496-4.879-10.617-5.258c-1.924-0.345-3.877-0.872-6.568,0.235  c-2.559,1.054-13.074,8.536-21.11,16.572C11.203,27.277,3.723,37.795,2.668,40.352c-1.107,2.691-0.58,4.645-0.236,6.567  c0.379,2.122,2.441,8.065,5.259,10.617C5.155,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="53.9023" x2="3.4732" y1="3.6543" y2="54.0835">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+<stop offset="0" style="stop-color:#D3C59A"/>
+<stop offset="1" style="stop-color:#D0BA98"/>
 </linearGradient>
 <path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.259-1.333  c-0.616-0.665-2.566-3.083-2.968-3.735c-0.353-0.575-0.411-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956  c6.191-6.192,9.084-7.646,9.955-8.107c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967  c0.535,0.492,0.873,0.588,1.301,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.523-1.778  c-0.291-0.339-0.635-0.665-1.012-0.982c0.488,0.657,0.197,1.134-0.607,1.666c-1.4,0.933-14.475,10.225-15.227,10.775  c-0.43,0.314-0.768,0.219-1.299-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.949-0.436-1.711-0.034  c-0.869,0.46-3.763,1.914-9.954,8.106c-6.193,6.192-7.636,9.092-8.108,9.956c-0.378,0.69-0.319,1.135,0.036,1.711  c0.4,0.651,2.351,3.069,2.967,3.736c0.492,0.533,0.559,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195  c-0.534,0.803-1.009,1.098-1.665,0.606c0.314,0.378,0.643,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525  C10.542,55.745,19.853,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-1610.521" x2="-1610.521" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#CF8122"/>
-<stop offset="0.5" style="stop-color:#8C4105"/>
-<stop offset="1" style="stop-color:#CF8122"/>
+<stop offset="0" style="stop-color:#9B7956"/>
+<stop offset="0.5" style="stop-color:#64352E"/>
+<stop offset="1" style="stop-color:#9B7956"/>
 </linearGradient>
 <path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31  c8.506-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26  c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.533,18.959S3.489,41.869,2.195,44.688  c-0.038,0.087-0.063,0.166-0.101,0.251c0.07,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="60" width="60"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,15 +3,15 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9995" x2="29.9995" y1="5.937" y2="55.9156">
-<stop offset="0" style="stop-color:#FEF4CE"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#F0EDDC"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="2,54.248 30,5.752 58,54.248 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.9995" x2="29.9995" y1="8.3774" y2="52.771">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.1394" style="stop-color:#FEE16E"/>
-<stop offset="0.7879" style="stop-color:#F6A800"/>
-<stop offset="1" style="stop-color:#FED43A"/>
+<stop offset="0" style="stop-color:#D3CA99"/>
+<stop offset="0.1394" style="stop-color:#D3CA99"/>
+<stop offset="0.7879" style="stop-color:#AC8A4A"/>
+<stop offset="1" style="stop-color:#C3B475"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="4.564,52.768 30,8.713 55.436,52.768 "/>
 <rect fill-opacity="0.1" height="18.612" stroke-opacity="0.1" width="5.91" x="26.86" y="22.119"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_web_feeds.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_web_feeds.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_web_feeds.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,17 +3,17 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <rect fill="none" height="60" width="60"/>
-<path d="M56.858,51.79c0,2.797-2.269,5.066-5.069,5.066H8.211c-2.801,0-5.066-2.27-5.066-5.066V8.212  c0-2.8,2.267-5.068,5.066-5.068h43.578c2.801,0,5.069,2.269,5.069,5.068V51.79L56.858,51.79z" fill="#F7B388"/>
+<path d="M56.858,51.79c0,2.797-2.269,5.066-5.069,5.066H8.211c-2.801,0-5.066-2.27-5.066-5.066V8.212  c0-2.8,2.267-5.068,5.066-5.068h43.578c2.801,0,5.069,2.269,5.069,5.068V51.79L56.858,51.79z" fill="#D6C1A9"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="287.9697" x2="336.3918" y1="-351.5146" y2="-399.9242">
-<stop offset="0" style="stop-color:#DF4F20"/>
-<stop offset="0.5" style="stop-color:#F48228"/>
-<stop offset="1" style="stop-color:#CF3A21"/>
+<stop offset="0" style="stop-color:#A66C59"/>
+<stop offset="0.5" style="stop-color:#B78C65"/>
+<stop offset="1" style="stop-color:#9B5D55"/>
 </linearGradient>
 <path d="M8.211,55.314c-1.943,0-3.524-1.582-3.524-3.524V8.212c0-1.945,1.581-3.526,3.524-3.526h43.578  c1.944,0,3.526,1.581,3.526,3.526V51.79c0,1.942-1.582,3.524-3.526,3.524H8.211z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="312.4805" x2="312.4805" y1="-348.7539" y2="-403.0745">
-<stop offset="0" style="stop-color:#C5422B"/>
-<stop offset="0.5" style="stop-color:#F48228"/>
-<stop offset="1" style="stop-color:#AD1B00"/>
+<stop offset="0" style="stop-color:#976059"/>
+<stop offset="0.5" style="stop-color:#B78C65"/>
+<stop offset="1" style="stop-color:#793436"/>
 </linearGradient>
 <path d="M51.904,3.857c2.338,0,4.238,1.901,4.238,4.236v43.814c0,2.336-1.9,4.234-4.238,4.234H8.093  c-2.335,0-4.236-1.901-4.236-4.234V8.093c0-2.335,1.902-4.236,4.236-4.236H51.904 M51.904,2.999H8.093  c-2.812,0-5.092,2.282-5.092,5.094v43.814c0,2.81,2.28,5.095,5.092,5.095h43.812c2.815,0,5.097-2.285,5.097-5.095V8.093  C57.001,5.281,54.72,2.999,51.904,2.999L51.904,2.999z" fill="url(#SVGID_2_)"/>
 <circle cx="16.742" cy="43.259" fill="#FFFFFF" r="5.208"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_widget.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_widget.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_widget.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,92 +3,92 @@
 <svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientTransform="matrix(0.9999 0.0024 -0.0024 0.9999 48.3995 33.6767)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-32.1763" x2="-32.1763" y1="-30.9438" y2="-3.796">
-<stop offset="0" style="stop-color:#F2C352"/>
-<stop offset="0.3576" style="stop-color:#F2C352"/>
-<stop offset="0.8909" style="stop-color:#DE7600"/>
-<stop offset="1" style="stop-color:#E79A26"/>
+<stop offset="0" style="stop-color:#C2B282"/>
+<stop offset="0.3576" style="stop-color:#C2B282"/>
+<stop offset="0.8909" style="stop-color:#9B6943"/>
+<stop offset="1" style="stop-color:#AD8F60"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="16.246,25.604 7.274,30.295 9.009,20.321 1.775,13.238 11.796,11.81 16.299,2.737   20.758,11.826 30.772,13.307 23.507,20.355 25.195,30.336 "/>
 <radialGradient cx="-111.4019" cy="-59.6338" gradientTransform="matrix(0.972 0.0144 -0.0144 0.972 123.6391 66.2654)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="23.7106">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.1394" style="stop-color:#FEE16E"/>
-<stop offset="0.5515" style="stop-color:#FFC501"/>
-<stop offset="0.7273" style="stop-color:#F6A800"/>
-<stop offset="1" style="stop-color:#FED43A"/>
+<stop offset="0" style="stop-color:#D3CA99"/>
+<stop offset="0.1394" style="stop-color:#D3CA99"/>
+<stop offset="0.5515" style="stop-color:#B39C4D"/>
+<stop offset="0.7273" style="stop-color:#AC8A4A"/>
+<stop offset="1" style="stop-color:#C3B475"/>
 </radialGradient>
 <polygon fill="url(#SVGID_2_)" points="9.787,20.071 3.331,13.748 12.277,12.471 16.294,4.375 20.273,12.488 29.212,13.81   22.727,20.1 24.235,29.008 16.246,24.785 8.239,28.973 "/>
 <radialGradient cx="-111.1436" cy="-41.29" gradientTransform="matrix(0.972 0.0144 -0.0144 0.972 123.6391 66.2654)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="8.4911">
-<stop offset="0" style="stop-color:#FED95A"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#CDC18B"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <polygon fill="url(#SVGID_3_)" points="16.259,24.059 8.378,28.182 8.239,28.973 16.246,24.785 24.235,29.008 24.1,28.206 "/>
 <radialGradient cx="-111.1377" cy="-56.7529" gradientTransform="matrix(0.972 0.0144 -0.0144 0.972 123.6391 66.2654)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="32.9523">
-<stop offset="0" style="stop-color:#FEF4CE"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#F0EDDC"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <polygon fill="url(#SVGID_4_)" points="12.629,13.199 16.273,5.825 19.9,13.209 28.561,14.442 29.212,13.81 20.273,12.488   16.294,4.375 12.277,12.471 3.331,13.748 3.981,14.384 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="16.2739" x2="16.2739" y1="31.8535" y2="56.5747">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.3152" style="stop-color:#BDC2C4"/>
-<stop offset="0.6727" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#98A1A4"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.0424" style="stop-color:#ECEFED"/>
+<stop offset="0.3152" style="stop-color:#BFC2C1"/>
+<stop offset="0.6727" style="stop-color:#989D9D"/>
+<stop offset="1" style="stop-color:#9CA0A0"/>
 </linearGradient>
 <path d="M26.754,31.854H5.795c-0.891,0-1.613,0.721-1.613,1.611v20.961c0,0.889,0.722,1.611,1.613,1.611  h20.959c0.89,0,1.612-0.723,1.612-1.611V33.465C28.366,32.574,27.644,31.854,26.754,31.854z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="43.6836" x2="43.6836" y1="31.8535" y2="56.5747">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.3152" style="stop-color:#BDC2C4"/>
-<stop offset="0.6727" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#98A1A4"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.0424" style="stop-color:#ECEFED"/>
+<stop offset="0.3152" style="stop-color:#BFC2C1"/>
+<stop offset="0.6727" style="stop-color:#989D9D"/>
+<stop offset="1" style="stop-color:#9CA0A0"/>
 </linearGradient>
 <path d="M54.163,31.854H33.204c-0.891,0-1.613,0.721-1.613,1.611v20.961c0,0.889,0.723,1.611,1.613,1.611  h20.959c0.891,0,1.613-0.723,1.613-1.611V33.465C55.776,32.574,55.054,31.854,54.163,31.854z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="43.6836" x2="43.6836" y1="4.4453" y2="29.167">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.3152" style="stop-color:#BDC2C4"/>
-<stop offset="0.6727" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#98A1A4"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.0424" style="stop-color:#ECEFED"/>
+<stop offset="0.3152" style="stop-color:#BFC2C1"/>
+<stop offset="0.6727" style="stop-color:#989D9D"/>
+<stop offset="1" style="stop-color:#9CA0A0"/>
 </linearGradient>
 <path d="M54.163,4.445H33.204c-0.891,0-1.613,0.721-1.613,1.611v20.959c0,0.893,0.723,1.613,1.613,1.613  h20.959c0.891,0,1.613-0.721,1.613-1.613V6.057C55.776,5.166,55.054,4.445,54.163,4.445z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="16.2739" x2="16.2739" y1="31.8535" y2="56.0371">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.7455" style="stop-color:#98A1A4"/>
-<stop offset="1" style="stop-color:#98A1A4"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.0424" style="stop-color:#ECEFED"/>
+<stop offset="0.7455" style="stop-color:#9CA0A0"/>
+<stop offset="1" style="stop-color:#9CA0A0"/>
 </linearGradient>
 <path d="M28.366,54.426c0,0.889-0.723,1.611-1.612,1.611H5.795c-0.891,0-1.613-0.723-1.613-1.611V33.465  c0-0.891,0.722-1.611,1.613-1.611h20.959c0.89,0,1.612,0.721,1.612,1.611V54.426z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="16.2739" x2="16.2739" y1="31.8535" y2="56.0371">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="0.3152" style="stop-color:#D1D7D9"/>
-<stop offset="0.6727" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#B7C3C7"/>
+<stop offset="0" style="stop-color:#F9FCF9"/>
+<stop offset="0.3152" style="stop-color:#D3D7D5"/>
+<stop offset="0.6727" style="stop-color:#989D9D"/>
+<stop offset="1" style="stop-color:#BCC2C0"/>
 </linearGradient>
 <path d="M26.754,31.854H5.795c-0.891,0-1.613,0.721-1.613,1.611v20.961c0,0.889,0.722,1.611,1.613,1.611  h20.959c0.89,0,1.612-0.723,1.612-1.611V33.465C28.366,32.574,27.644,31.854,26.754,31.854z M27.561,54.426  c0,0.443-0.363,0.807-0.807,0.807H5.795c-0.445,0-0.807-0.363-0.807-0.807V33.465c0-0.443,0.362-0.805,0.807-0.805h20.959  c0.444,0,0.807,0.361,0.807,0.805V54.426z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="43.6836" x2="43.6836" y1="31.8535" y2="56.0371">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="0.5818" style="stop-color:#1B66D8"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="0.5818" style="stop-color:#546F9F"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <path d="M55.776,54.426c0,0.889-0.723,1.611-1.613,1.611H33.204c-0.891,0-1.613-0.723-1.613-1.611V33.465  c0-0.891,0.723-1.611,1.613-1.611h20.959c0.891,0,1.613,0.721,1.613,1.611V54.426z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="43.6836" x2="43.6836" y1="31.8535" y2="57.1121">
-<stop offset="0" style="stop-color:#36DBFF"/>
-<stop offset="0.7394" style="stop-color:#12428C"/>
-<stop offset="1" style="stop-color:#2AA9D9"/>
+<stop offset="0" style="stop-color:#72C3BF"/>
+<stop offset="0.7394" style="stop-color:#373D67"/>
+<stop offset="1" style="stop-color:#5F93A4"/>
 </linearGradient>
 <path d="M54.163,31.854H33.204c-0.891,0-1.613,0.721-1.613,1.611v20.961c0,0.889,0.723,1.611,1.613,1.611  h20.959c0.891,0,1.613-0.723,1.613-1.611V33.465C55.776,32.574,55.054,31.854,54.163,31.854z M54.97,54.426  c0,0.443-0.363,0.807-0.807,0.807H33.204c-0.445,0-0.807-0.363-0.807-0.807V33.465c0-0.443,0.361-0.805,0.807-0.805h20.959  c0.443,0,0.807,0.361,0.807,0.805V54.426z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="43.6836" x2="43.6836" y1="4.4453" y2="29.167">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.7455" style="stop-color:#98A1A4"/>
-<stop offset="1" style="stop-color:#98A1A4"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.0424" style="stop-color:#ECEFED"/>
+<stop offset="0.7455" style="stop-color:#9CA0A0"/>
+<stop offset="1" style="stop-color:#9CA0A0"/>
 </linearGradient>
 <path d="M55.776,27.016c0,0.893-0.723,1.613-1.613,1.613H33.204c-0.891,0-1.613-0.721-1.613-1.613V6.057  c0-0.891,0.723-1.611,1.613-1.611h20.959c0.891,0,1.613,0.721,1.613,1.611V27.016z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="43.6836" x2="43.6836" y1="4.4453" y2="29.167">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="0.3152" style="stop-color:#D1D7D9"/>
-<stop offset="0.6727" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#B7C3C7"/>
+<stop offset="0" style="stop-color:#F9FCF9"/>
+<stop offset="0.3152" style="stop-color:#D3D7D5"/>
+<stop offset="0.6727" style="stop-color:#989D9D"/>
+<stop offset="1" style="stop-color:#BCC2C0"/>
 </linearGradient>
 <path d="M54.163,4.445H33.204c-0.891,0-1.613,0.721-1.613,1.611v20.959c0,0.893,0.723,1.613,1.613,1.613  h20.959c0.891,0,1.613-0.721,1.613-1.613V6.057C55.776,5.166,55.054,4.445,54.163,4.445z M54.97,27.016  c0,0.443-0.363,0.807-0.807,0.807H33.204c-0.445,0-0.807-0.363-0.807-0.807V6.057c0-0.443,0.361-0.805,0.807-0.805h20.959  c0.443,0,0.807,0.361,0.807,0.805V27.016z" fill="url(#SVGID_13_)"/>
 <rect fill="none" height="60" width="60.001"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wire_connect.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wire_connect.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wire_connect.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -19,18 +19,18 @@
 </linearGradient>
 <path d="M13,55.61l-1.59-11.7,10.2-3.314c0.639-0.207,1.783-0.392,2.418-0.392h11.94c0.635,0,1.764,0.179,2.369,0.376l10.25,3.332-1.592,11.7h-34.01z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="25.52" x2="34.48" y1="8.511" y2="8.511">
-<stop offset="0" stop-color="#A8B1B3"/>
+<stop offset="0" stop-color="#ABB0AF"/>
 <stop offset="0.3818" stop-color="#FFFFFF"/>
-<stop offset="0.7091" stop-color="#686E70"/>
-<stop offset="1" stop-color="#A6B0B3"/>
+<stop offset="0.7091" stop-color="#6A6C6E"/>
+<stop offset="1" stop-color="#AAAFAE"/>
 </linearGradient>
 <polygon fill="url(#SVGID_4_)" points="30.48,2,29.45,2,25.52,5.596,25.52,15.02,34.48,15.02,34.48,5.596"/>
 <polygon fill="#FFFFFF" fill-opacity="0.6" points="30.48,2,29.45,2,25.52,5.596,25.52,6.391,29.45,2.796,30.48,2.796,34.48,6.391,34.48,5.596" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="24.82" x2="35.18" y1="26.08" y2="26.08">
-<stop offset="0" stop-color="#A8B1B3"/>
+<stop offset="0" stop-color="#ABB0AF"/>
 <stop offset="0.3818" stop-color="#FFFFFF"/>
-<stop offset="0.7091" stop-color="#686E70"/>
-<stop offset="1" stop-color="#A6B0B3"/>
+<stop offset="0.7091" stop-color="#6A6C6E"/>
+<stop offset="1" stop-color="#AAAFAE"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="23.46" width="10.35" x="24.82" y="14.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="24.82" x2="35.18" y1="22.17" y2="22.17">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -20,49 +20,49 @@
 <path d="M48.688,58v-3.859c0-2.133-1.729-3.86-3.859-3.86H15.237c-2.131,0-3.859,1.728-3.859,3.86V58H48.688z  " fill="url(#SVGID_2_)"/>
 <path d="M44.828,50.28H15.237c-2.131,0-3.859,1.728-3.859,3.86v1.286c0-2.132,1.729-3.86,3.859-3.86  h29.591c2.131,0,3.859,1.729,3.859,3.86v-1.286C48.688,52.008,46.959,50.28,44.828,50.28z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 1644.7402 729.6548)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="1671.6611" x2="1651.5664" y1="642.4497" y2="662.2676">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M9.31,2l4.156,4.152c-5.422,5.422-5.42,14.244,0,19.665l-4.154,4.155  C1.601,22.258,1.601,9.711,9.31,2z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 1644.7402 729.6548)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="1664.2842" x2="1644.192" y1="634.9834" y2="654.7988">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M18.738,7.264l4.153,4.152c-2.52,2.52-2.52,6.617,0,9.136l-4.153,4.153  C13.928,19.898,13.928,12.074,18.738,7.264z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.5073" x2="8.5073" y1="29.6333" y2="-3.0658">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <path d="M9.312,28.686c-3.692-3.693-5.597-8.497-5.753-13.344C3.388,20.618,5.293,25.95,9.312,29.973  l4.154-4.155c-0.217-0.218-0.411-0.448-0.61-0.677L9.312,28.686z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="19.0176" x2="19.0176" y1="24.7275" y2="9.0601">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <path d="M18.738,23.419c-2.242-2.24-3.424-5.136-3.577-8.077c-0.174,3.369,1.009,6.797,3.577,9.363  l4.153-4.153c-0.22-0.22-0.397-0.466-0.578-0.708L18.738,23.419z" fill="url(#SVGID_6_)"/>
 <path d="M9.31,3.286l3.546,3.542c0.2-0.228,0.393-0.459,0.61-0.676L9.31,2c-4.018,4.02-5.921,9.352-5.75,14.628  C3.715,11.779,5.619,6.979,9.31,3.286z" fill="#FFFFFF"/>
 <path d="M18.738,8.551l3.576,3.574c0.181-0.242,0.358-0.487,0.578-0.709l-4.153-4.152  c-2.568,2.568-3.751,5.996-3.577,9.364C15.314,13.688,16.496,10.792,18.738,8.551z" fill="#FFFFFF"/>
 <linearGradient gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -1770.332 729.6548)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="1802.8955" x2="1782.8008" y1="773.6841" y2="793.502">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M50.69,2l-4.156,4.152c5.422,5.422,5.42,14.244,0,19.665l4.154,4.155  C58.399,22.258,58.399,9.711,50.69,2z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -1770.332 729.6548)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="1795.5195" x2="1775.4272" y1="766.2183" y2="786.0338">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M41.262,7.264l-4.153,4.152c2.52,2.52,2.52,6.617,0,9.136l4.153,4.153  C46.072,19.898,46.072,12.074,41.262,7.264z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -125.5918 0)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-177.0845" x2="-177.0845" y1="29.6333" y2="-3.0658">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <path d="M50.688,28.686c3.692-3.693,5.597-8.497,5.753-13.344c0.171,5.276-1.734,10.608-5.753,14.631  l-4.154-4.155c0.217-0.218,0.411-0.448,0.61-0.677L50.688,28.686z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -125.5918 0)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-166.5747" x2="-166.5747" y1="24.7275" y2="9.0601">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <path d="M41.262,23.419c2.242-2.24,3.424-5.136,3.577-8.077c0.175,3.369-1.009,6.797-3.577,9.363  l-4.153-4.153c0.22-0.22,0.397-0.466,0.578-0.708L41.262,23.419z" fill="url(#SVGID_10_)"/>
 <path d="M50.69,3.286l-3.546,3.542c-0.2-0.228-0.393-0.459-0.61-0.676L50.69,2c4.018,4.02,5.921,9.352,5.75,14.628  C56.285,11.779,54.381,6.979,50.69,3.286z" fill="#FFFFFF"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -20,49 +20,49 @@
 <path d="M48.688,58v-3.859c0-2.133-1.729-3.86-3.859-3.86H15.237c-2.131,0-3.859,1.728-3.859,3.86V58H48.688z  " fill="url(#SVGID_2_)"/>
 <path d="M44.828,50.28H15.237c-2.131,0-3.859,1.728-3.859,3.86v1.286c0-2.132,1.729-3.86,3.859-3.86  h29.591c2.131,0,3.859,1.729,3.859,3.86v-1.286C48.688,52.008,46.959,50.28,44.828,50.28z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 1644.7402 729.6548)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="1671.6611" x2="1651.5664" y1="642.4497" y2="662.2676">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M9.31,2l4.156,4.152c-5.422,5.422-5.42,14.244,0,19.665l-4.154,4.155  C1.601,22.258,1.601,9.711,9.31,2z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 1644.7402 729.6548)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="1664.2842" x2="1644.192" y1="634.9834" y2="654.7988">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M18.738,7.264l4.153,4.152c-2.52,2.52-2.52,6.617,0,9.136l-4.153,4.153  C13.928,19.898,13.928,12.074,18.738,7.264z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.5073" x2="8.5073" y1="29.6333" y2="-3.0658">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <path d="M9.312,28.686c-3.692-3.693-5.597-8.497-5.753-13.344C3.388,20.618,5.293,25.95,9.312,29.973  l4.154-4.155c-0.217-0.218-0.411-0.448-0.61-0.677L9.312,28.686z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="19.0176" x2="19.0176" y1="24.7275" y2="9.0601">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <path d="M18.738,23.419c-2.242-2.24-3.424-5.136-3.577-8.077c-0.174,3.369,1.009,6.797,3.577,9.363  l4.153-4.153c-0.22-0.22-0.397-0.466-0.578-0.708L18.738,23.419z" fill="url(#SVGID_6_)"/>
 <path d="M9.31,3.286l3.546,3.542c0.2-0.228,0.393-0.459,0.61-0.676L9.31,2c-4.018,4.02-5.921,9.352-5.75,14.628  C3.715,11.779,5.619,6.979,9.31,3.286z" fill="#FFFFFF"/>
 <path d="M18.738,8.551l3.576,3.574c0.181-0.242,0.358-0.487,0.578-0.709l-4.153-4.152  c-2.568,2.568-3.751,5.996-3.577,9.364C15.314,13.688,16.496,10.792,18.738,8.551z" fill="#FFFFFF"/>
 <linearGradient gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -1770.332 729.6548)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="1802.8955" x2="1782.8008" y1="773.6841" y2="793.502">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M50.69,2l-4.156,4.152c5.422,5.422,5.42,14.244,0,19.665l4.154,4.155  C58.399,22.258,58.399,9.711,50.69,2z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -1770.332 729.6548)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="1795.5195" x2="1775.4272" y1="766.2183" y2="786.0338">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<stop offset="0" style="stop-color:#B3C77D"/>
+<stop offset="0.7273" style="stop-color:#3C743A"/>
+<stop offset="1" style="stop-color:#235138"/>
 </linearGradient>
 <path d="M41.262,7.264l-4.153,4.152c2.52,2.52,2.52,6.617,0,9.136l4.153,4.153  C46.072,19.898,46.072,12.074,41.262,7.264z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -125.5918 0)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-177.0845" x2="-177.0845" y1="29.6333" y2="-3.0658">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <path d="M50.688,28.686c3.692-3.693,5.597-8.497,5.753-13.344c0.171,5.276-1.734,10.608-5.753,14.631  l-4.154-4.155c0.217-0.218,0.411-0.448,0.61-0.677L50.688,28.686z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -125.5918 0)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-166.5747" x2="-166.5747" y1="24.7275" y2="9.0601">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<stop offset="0" style="stop-color:#9AB06A"/>
+<stop offset="1" style="stop-color:#367039"/>
 </linearGradient>
 <path d="M41.262,23.419c2.242-2.24,3.424-5.136,3.577-8.077c0.175,3.369-1.009,6.797-3.577,9.363  l-4.153-4.153c0.22-0.22,0.397-0.466,0.578-0.708L41.262,23.419z" fill="url(#SVGID_10_)"/>
 <path d="M50.69,3.286l-3.546,3.542c-0.2-0.228-0.393-0.459-0.61-0.676L50.69,2c4.018,4.02,5.921,9.352,5.75,14.628  C56.285,11.779,54.381,6.979,50.69,3.286z" fill="#FFFFFF"/>
@@ -74,9 +74,9 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill-opacity="0.35" height="33.866" stroke-opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -257 670.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="260" x2="284" y1="655.9761" y2="655.9761">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="0.8424" style="stop-color:#CC1414"/>
-<stop offset="1" style="stop-color:#FF4D00"/>
+<stop offset="0" style="stop-color:#B36B4D"/>
+<stop offset="0.8424" style="stop-color:#954B50"/>
+<stop offset="1" style="stop-color:#B36B4D"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="25.809,26.431 3,4.177 4.191,2.956 27,25.21 "/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_zipmgr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_zipmgr.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_zipmgr.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,44 +5,44 @@
 <rect fill="none" height="60" width="60"/>
 <rect fill="none" height="60" width="60"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1188.8574" x2="-1185.7031" y1="44.1982" y2="44.1982">
-<stop offset="0" style="stop-color:#959A9C"/>
-<stop offset="0.3394" style="stop-color:#5B6163"/>
-<stop offset="0.7394" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#878A8C"/>
+<stop offset="0" style="stop-color:#979A9A"/>
+<stop offset="0.3394" style="stop-color:#5D5F61"/>
+<stop offset="0.7394" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#898A8B"/>
 </linearGradient>
 <path d="M36.705,55.458c0,0.969,0.705,1.754,1.576,1.754l0,0c0.871,0,1.578-0.785,1.578-1.754V32.937  c0-0.969-0.707-1.752-1.578-1.752l0,0c-0.871,0-1.576,0.784-1.576,1.752V55.458z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1190.4336" x2="-1184.125" y1="50.5068" y2="50.5068">
-<stop offset="0" style="stop-color:#B7BDBF"/>
-<stop offset="0.297" style="stop-color:#8D9699"/>
-<stop offset="0.7333" style="stop-color:#E5EBED"/>
-<stop offset="1" style="stop-color:#B4BDBF"/>
+<stop offset="0" style="stop-color:#B9BDBC"/>
+<stop offset="0.297" style="stop-color:#919595"/>
+<stop offset="0.7333" style="stop-color:#E7EBE8"/>
+<stop offset="1" style="stop-color:#B7BCBA"/>
 </linearGradient>
 <path d="M35.127,50.901c0,0.437,0.352,0.789,0.789,0.789h4.73c0.438,0,0.789-0.353,0.789-0.789v-0.789  c0-0.436-0.352-0.789-0.789-0.789h-4.73c-0.438,0-0.789,0.354-0.789,0.789V50.901z" fill="url(#SVGID_2_)"/>
 <path d="M35.916,49.324h4.73c0.438,0,0.789,0.354,0.789,0.789v0.789c0-0.435-0.352-0.789-0.789-0.789  h-4.73c-0.438,0-0.789,0.354-0.789,0.789v-0.789C35.127,49.677,35.479,49.324,35.916,49.324z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <rect fill-opacity="0.2" height="0.789" stroke-opacity="0.2" width="3.154" x="36.705" y="51.69"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1190.4336" x2="-1184.125" y1="46.5635" y2="46.5635">
-<stop offset="0" style="stop-color:#B7BDBF"/>
-<stop offset="0.297" style="stop-color:#8D9699"/>
-<stop offset="0.7333" style="stop-color:#E5EBED"/>
-<stop offset="1" style="stop-color:#B4BDBF"/>
+<stop offset="0" style="stop-color:#B9BDBC"/>
+<stop offset="0.297" style="stop-color:#919595"/>
+<stop offset="0.7333" style="stop-color:#E7EBE8"/>
+<stop offset="1" style="stop-color:#B7BCBA"/>
 </linearGradient>
 <path d="M35.127,46.958c0,0.437,0.352,0.789,0.789,0.789h4.73c0.438,0,0.789-0.352,0.789-0.789v-0.789  c0-0.435-0.352-0.788-0.789-0.788h-4.73c-0.438,0-0.789,0.353-0.789,0.788V46.958z" fill="url(#SVGID_3_)"/>
 <path d="M35.916,45.38h4.73c0.438,0,0.789,0.353,0.789,0.788v0.789c0-0.436-0.352-0.789-0.789-0.789h-4.73  c-0.438,0-0.789,0.354-0.789,0.789v-0.789C35.127,45.733,35.479,45.38,35.916,45.38z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <rect fill-opacity="0.2" height="0.789" stroke-opacity="0.2" width="3.154" x="36.705" y="47.746"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1190.4336" x2="-1184.125" y1="39.4648" y2="39.4648">
-<stop offset="0" style="stop-color:#B7BDBF"/>
-<stop offset="0.297" style="stop-color:#8D9699"/>
-<stop offset="0.7333" style="stop-color:#E5EBED"/>
-<stop offset="1" style="stop-color:#B4BDBF"/>
+<stop offset="0" style="stop-color:#B9BDBC"/>
+<stop offset="0.297" style="stop-color:#919595"/>
+<stop offset="0.7333" style="stop-color:#E7EBE8"/>
+<stop offset="1" style="stop-color:#B7BCBA"/>
 </linearGradient>
 <path d="M35.127,39.859c0,0.436,0.352,0.789,0.789,0.789h4.73c0.438,0,0.789-0.354,0.789-0.789v-0.789  c0-0.437-0.352-0.789-0.789-0.789h-4.73c-0.438,0-0.789,0.353-0.789,0.789V39.859z" fill="url(#SVGID_4_)"/>
 <path d="M35.916,38.282h4.73c0.438,0,0.789,0.353,0.789,0.789v0.789c0-0.437-0.352-0.789-0.789-0.789  h-4.73c-0.438,0-0.789,0.352-0.789,0.789v-0.789C35.127,38.634,35.479,38.282,35.916,38.282z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <rect fill-opacity="0.2" height="0.789" stroke-opacity="0.2" width="3.154" x="36.705" y="40.648"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-1190.4336" x2="-1184.125" y1="35.521" y2="35.521">
-<stop offset="0" style="stop-color:#B7BDBF"/>
-<stop offset="0.297" style="stop-color:#8D9699"/>
-<stop offset="0.7333" style="stop-color:#E5EBED"/>
-<stop offset="1" style="stop-color:#B4BDBF"/>
+<stop offset="0" style="stop-color:#B9BDBC"/>
+<stop offset="0.297" style="stop-color:#919595"/>
+<stop offset="0.7333" style="stop-color:#E7EBE8"/>
+<stop offset="1" style="stop-color:#B7BCBA"/>
 </linearGradient>
 <path d="M35.127,35.916c0,0.437,0.352,0.789,0.789,0.789h4.73c0.438,0,0.789-0.352,0.789-0.789v-0.789  c0-0.435-0.352-0.789-0.789-0.789h-4.73c-0.438,0-0.789,0.354-0.789,0.789V35.916z" fill="url(#SVGID_5_)"/>
 <path d="M35.916,35.916h4.73c0.438,0,0.789-0.353,0.789-0.789v0.789c0,0.437-0.352,0.789-0.789,0.789h-4.73  c-0.438,0-0.789-0.352-0.789-0.789v-0.789C35.127,35.563,35.479,35.916,35.916,35.916z" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -51,90 +51,90 @@
 <path d="M35.916,34.338h4.73c0.438,0,0.789,0.354,0.789,0.789v0.789c0-0.436-0.352-0.789-0.789-0.789  h-4.73c-0.438,0-0.789,0.354-0.789,0.789v-0.789C35.127,34.691,35.479,34.338,35.916,34.338z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <rect fill-opacity="0.2" height="0.789" stroke-opacity="0.2" width="3.154" x="36.705" y="36.704"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-1196.7441" x2="-1177.8145" y1="31.5776" y2="31.5776">
-<stop offset="0" style="stop-color:#959A9C"/>
-<stop offset="0.3394" style="stop-color:#5B6163"/>
-<stop offset="0.7394" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#878A8C"/>
+<stop offset="0" style="stop-color:#979A9A"/>
+<stop offset="0.3394" style="stop-color:#5D5F61"/>
+<stop offset="0.7394" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#898A8B"/>
 </linearGradient>
 <path d="M47.746,31.184c0,0.871-0.707,1.576-1.576,1.576H30.395c-0.871,0-1.578-0.706-1.578-1.576v-0.789  h18.93V31.184z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-1203.8418" x2="-1170.7168" y1="26.8457" y2="26.8457">
-<stop offset="0" style="stop-color:#67AD1A"/>
-<stop offset="0.2606" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#AFED23"/>
+<stop offset="0" style="stop-color:#4E8146"/>
+<stop offset="0.2606" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#98B060"/>
 </linearGradient>
 <path d="M21.719,28.817c0,0.871,0.705,1.578,1.578,1.578h29.971c0.871,0,1.576-0.707,1.576-1.578v-3.944  c0-0.871-0.705-1.578-1.576-1.578H23.297c-0.873,0-1.578,0.707-1.578,1.578V28.817z" fill="url(#SVGID_7_)"/>
 <path d="M23.297,29.606h29.971c0.871,0,1.576-0.707,1.576-1.578v0.789c0,0.871-0.705,1.578-1.576,1.578H23.297  c-0.873,0-1.578-0.707-1.578-1.578v-0.789C21.719,28.899,22.424,29.606,23.297,29.606z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <path d="M23.297,23.296h29.971c0.871,0,1.576,0.707,1.576,1.578v0.789  c0-0.871-0.705-1.578-1.576-1.578H23.297c-0.873,0-1.578,0.707-1.578,1.578v-0.789C21.719,24.003,22.424,23.296,23.297,23.296z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-1203.8418" x2="-1170.7168" y1="19.7471" y2="19.7471">
-<stop offset="0" style="stop-color:#FFC501"/>
-<stop offset="0.2545" style="stop-color:#F6A800"/>
-<stop offset="1" style="stop-color:#FEEFA7"/>
+<stop offset="0" style="stop-color:#B39C4D"/>
+<stop offset="0.2545" style="stop-color:#AC8A4A"/>
+<stop offset="1" style="stop-color:#E4E0C1"/>
 </linearGradient>
 <path d="M21.719,21.718c0,0.872,0.705,1.578,1.578,1.578h29.971c0.871,0,1.576-0.706,1.576-1.578v-3.943  c0-0.872-0.705-1.578-1.576-1.578H23.297c-0.873,0-1.578,0.706-1.578,1.578V21.718z" fill="url(#SVGID_8_)"/>
 <path d="M23.297,22.507h29.971c0.871,0,1.576-0.706,1.576-1.578v0.789c0,0.872-0.705,1.578-1.576,1.578H23.297  c-0.873,0-1.578-0.706-1.578-1.578v-0.789C21.719,21.801,22.424,22.507,23.297,22.507z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <path d="M23.297,16.198h29.971c0.871,0,1.576,0.706,1.576,1.578v0.789  c0-0.872-0.705-1.578-1.576-1.578H23.297c-0.873,0-1.578,0.706-1.578,1.578v-0.789C21.719,16.904,22.424,16.198,23.297,16.198z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-1203.8418" x2="-1170.7168" y1="12.6484" y2="12.6484">
-<stop offset="0" style="stop-color:#E8522A"/>
-<stop offset="0.2061" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+<stop offset="0" style="stop-color:#AF7563"/>
+<stop offset="0.2061" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#C39072"/>
 </linearGradient>
 <path d="M21.719,14.62c0,0.871,0.705,1.578,1.578,1.578h29.971c0.871,0,1.576-0.707,1.576-1.578v-3.944  c0-0.871-0.705-1.578-1.576-1.578H23.297c-0.873,0-1.578,0.707-1.578,1.578V14.62z" fill="url(#SVGID_9_)"/>
 <path d="M23.297,15.409h29.971c0.871,0,1.576-0.707,1.576-1.578v0.789c0,0.871-0.705,1.578-1.576,1.578H23.297  c-0.873,0-1.578-0.707-1.578-1.578v-0.789C21.719,14.702,22.424,15.409,23.297,15.409z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <path d="M23.297,9.099h29.971c0.871,0,1.576,0.707,1.576,1.578v0.789c0-0.871-0.705-1.578-1.576-1.578  H23.297c-0.873,0-1.578,0.707-1.578,1.578v-0.789C21.719,9.806,22.424,9.099,23.297,9.099z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-1195.9551" x2="-1178.3573" y1="55.6343" y2="55.6343">
-<stop offset="0" style="stop-color:#959A9C"/>
-<stop offset="0.3394" style="stop-color:#5B6163"/>
-<stop offset="0.7394" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#878A8C"/>
+<stop offset="0" style="stop-color:#979A9A"/>
+<stop offset="0.3394" style="stop-color:#5D5F61"/>
+<stop offset="0.7394" style="stop-color:#BFC2C1"/>
+<stop offset="1" style="stop-color:#898A8B"/>
 </linearGradient>
 <path d="M29.605,56.423c0,0.871,0.705,1.578,1.578,1.578h14.197c0.869,0,1.576-0.707,1.576-1.578v-1.578  c0-0.872-0.707-1.577-1.576-1.577H31.184c-0.873,0-1.578,0.706-1.578,1.577V56.423z" fill="url(#SVGID_10_)"/>
 <path d="M31.184,57.212h14.197c0.869,0,1.576-0.708,1.576-1.578v0.789c0,0.871-0.707,1.578-1.576,1.578H31.184  c-0.873,0-1.578-0.707-1.578-1.578v-0.789C29.605,56.504,30.311,57.212,31.184,57.212z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <path d="M31.184,53.268h14.197c0.869,0,1.576,0.706,1.576,1.577v0.789  c0-0.872-0.707-1.578-1.576-1.578H31.184c-0.873,0-1.578,0.706-1.578,1.578v-0.789C29.605,53.974,30.311,53.268,31.184,53.268z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-1176.2363" x2="-1176.2363" y1="38.8081" y2="45.1177">
 <stop offset="0" style="stop-color:#B6B6B6"/>
-<stop offset="0.4727" style="stop-color:#949D9D"/>
-<stop offset="0.8909" style="stop-color:#464B4D"/>
-<stop offset="1" style="stop-color:#676D6E"/>
+<stop offset="0.4727" style="stop-color:#979A9A"/>
+<stop offset="0.8909" style="stop-color:#48494B"/>
+<stop offset="1" style="stop-color:#696B6C"/>
 </linearGradient>
 <path d="M5.154,43.804c0,0.87,0.707,1.577,1.578,1.577h41.014c0.871,0,1.576-0.707,1.576-1.577v-3.155  c0-0.873-0.705-1.578-1.576-1.578H6.732C5.861,39.071,5.154,43.804,5.154,43.804z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="-1176.2363" x2="-1176.2363" y1="38.8081" y2="45.1177">
 <stop offset="0" style="stop-color:#E0E0E0"/>
-<stop offset="0.4727" style="stop-color:#ABB5B5"/>
-<stop offset="0.8909" style="stop-color:#464B4D"/>
-<stop offset="1" style="stop-color:#676D6E"/>
+<stop offset="0.4727" style="stop-color:#AEB2B0"/>
+<stop offset="0.8909" style="stop-color:#48494B"/>
+<stop offset="1" style="stop-color:#696B6C"/>
 </linearGradient>
 <path d="M5.154,43.804c0,0.87,0.707,1.577,1.578,1.577h41.014c0.871,0,1.576-0.707,1.576-1.577v-3.155  c0-0.873-0.705-1.578-1.576-1.578H6.732C5.861,39.071,5.154,43.804,5.154,43.804z M5.943,40.648c0-0.434,0.354-0.789,0.789-0.789  h41.014c0.436,0,0.789,0.355,0.789,0.789v3.155c0,0.434-0.354,0.789-0.789,0.789H6.732c-0.436,0-0.789-0.355-0.789-0.789V40.648z" fill="url(#SVGID_12_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-1177.8145" x2="-1177.8145" y1="2.0005" y2="8.3101">
 <stop offset="0" style="stop-color:#D9D9D9"/>
-<stop offset="0.4727" style="stop-color:#AFBABA"/>
-<stop offset="0.8909" style="stop-color:#646B6E"/>
-<stop offset="1" style="stop-color:#757C7D"/>
+<stop offset="0.4727" style="stop-color:#B2B7B5"/>
+<stop offset="0.8909" style="stop-color:#67696B"/>
+<stop offset="1" style="stop-color:#777A7B"/>
 </linearGradient>
 <path d="M6.732,8.31H50.9c0.871,0,1.578-0.706,1.578-1.577V3.578C52.479,2.707,51.771,2,50.9,2H6.732  C5.861,2,5.154,2.707,5.154,3.578C5.154,3.578,5.861,8.31,6.732,8.31z" fill="url(#SVGID_13_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-1177.8145" x2="-1177.8145" y1="2.0005" y2="8.3101">
 <stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="0.4727" style="stop-color:#D0DEDE"/>
-<stop offset="0.8909" style="stop-color:#646B6E"/>
-<stop offset="1" style="stop-color:#757C7D"/>
+<stop offset="0.4727" style="stop-color:#D4DAD6"/>
+<stop offset="0.8909" style="stop-color:#67696B"/>
+<stop offset="1" style="stop-color:#777A7B"/>
 </linearGradient>
 <path d="M5.154,3.578c0,0,0.707,4.732,1.578,4.732H50.9c0.871,0,1.578-0.706,1.578-1.577V3.578  C52.479,2.707,51.771,2,50.9,2H6.732C5.861,2,5.154,2.707,5.154,3.578z M5.943,3.578c0-0.435,0.354-0.789,0.789-0.789H50.9  c0.436,0,0.789,0.354,0.789,0.789v3.155c0,0.434-0.354,0.788-0.789,0.788H6.732C6.297,7.521,5.943,3.578,5.943,3.578z" fill="url(#SVGID_14_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="-1160.0684" x2="-1160.0684" y1="2.0005" y2="45.4">
-<stop offset="0" style="stop-color:#DAE0E3"/>
-<stop offset="0.5273" style="stop-color:#8C9A9B"/>
-<stop offset="1" style="stop-color:#292F36"/>
+<stop offset="0" style="stop-color:#DDE0DE"/>
+<stop offset="0.5273" style="stop-color:#919696"/>
+<stop offset="1" style="stop-color:#2D2D32"/>
 </linearGradient>
 <path d="M5.775,2.332L16.986,8.31v30.761L5.775,45.049c-0.375-0.288-0.621-0.736-0.621-1.245V3.578  C5.154,3.067,5.4,2.62,5.775,2.332z" fill="url(#SVGID_15_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="-1154.9414" x2="-1154.9414" y1="2.2153" y2="45.1406">
-<stop offset="0" style="stop-color:#EBF2F5"/>
-<stop offset="0.2545" style="stop-color:#C8D0D2"/>
-<stop offset="0.5273" style="stop-color:#A1B1B3"/>
-<stop offset="1" style="stop-color:#292F36"/>
+<stop offset="0" style="stop-color:#EEF2EF"/>
+<stop offset="0.2545" style="stop-color:#CBCFCD"/>
+<stop offset="0.5273" style="stop-color:#A6AEAC"/>
+<stop offset="1" style="stop-color:#2D2D32"/>
 </linearGradient>
 <path d="M5.775,2.332l0.957,0.509V44.54l-0.957,0.509c-0.375-0.288-0.621-0.736-0.621-1.245V3.578  C5.154,3.067,5.4,2.62,5.775,2.332z" fill="url(#SVGID_16_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="-1164.0117" x2="-1164.0117" y1="1.7437" y2="45.7098">
-<stop offset="0" style="stop-color:#B5BABD"/>
-<stop offset="0.5273" style="stop-color:#758182"/>
-<stop offset="1" style="stop-color:#292F36"/>
+<stop offset="0" style="stop-color:#B7BBBA"/>
+<stop offset="0.5273" style="stop-color:#797E7E"/>
+<stop offset="1" style="stop-color:#2D2D32"/>
 </linearGradient>
 <polygon fill="url(#SVGID_17_)" points="13.041,6.208 16.986,8.31 16.986,39.071 13.041,41.173 "/>
 <path d="M16.986,39.071L5.775,45.049c-0.338-0.26-0.563-0.655-0.604-1.104C5.232,44.097,16.986,39.071,16.986,39.071z  " fill-opacity="0.1" stroke-opacity="0.1"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_0_3mp.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_0_3mp.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_0_3mp.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30" x="0.002"/>
+<rect fill="none" height="30" width="30"/>
 </g>
-<path d="M1,3v24h28v-24h-28zm25,21h-22v-18h22v18z"/>
-<path d="M7.488,11.28c0.752,0,1.32,0.267,1.705,0.801,0.383,0.534,0.576,1.477,0.576,2.827,0,1.481-0.195,2.485-0.584,3.016-0.389,0.528-0.963,0.793-1.721,0.793-0.664,0-1.166-0.176-1.504-0.526-0.34-0.353-0.561-0.797-0.662-1.334-0.104-0.537-0.154-1.187-0.154-1.947,0-1.325,0.197-2.261,0.592-2.808,0.393-0.54,0.979-0.82,1.752-0.82zm-0.033,6.63c0.332,0,0.574-0.187,0.729-0.56,0.156-0.373,0.232-1.187,0.232-2.438,0-1.204-0.08-1.975-0.238-2.313-0.16-0.336-0.4-0.505-0.723-0.505-0.293,0-0.51,0.117-0.648,0.352-0.137,0.234-0.225,0.54-0.258,0.918-0.035,0.378-0.051,0.894-0.051,1.548,0,1.289,0.076,2.11,0.229,2.466,0.154,0.34,0.396,0.52,0.728,0.52z"/>
-<path d="M11.42,18.72c-0.215,0-0.398-0.075-0.553-0.229-0.152-0.153-0.229-0.335-0.229-0.548,0-0.215,0.074-0.396,0.227-0.547,0.15-0.148,0.336-0.225,0.555-0.225,0.215,0,0.396,0.075,0.549,0.225,0.15,0.149,0.227,0.332,0.227,0.547,0,0.216-0.076,0.397-0.227,0.551-0.15,0.16-0.33,0.24-0.55,0.24z"/>
-<path d="M13.78,14.38c0.957,0,1.555-0.098,1.793-0.293,0.236-0.195,0.354-0.495,0.354-0.898,0-0.354-0.096-0.622-0.284-0.801-0.191-0.179-0.476-0.269-0.853-0.269-0.332,0-0.799,0.083-1.402,0.249h-0.01v-0.859c0.613-0.153,1.166-0.229,1.66-0.229,0.746,0,1.307,0.149,1.68,0.449,0.375,0.3,0.563,0.749,0.563,1.348,0,0.413-0.113,0.769-0.338,1.067-0.226,0.297-0.547,0.508-0.967,0.632,0.457,0.081,0.805,0.272,1.047,0.573,0.244,0.301,0.365,0.678,0.365,1.131,0,0.744-0.22,1.305-0.652,1.678-0.437,0.372-1.086,0.559-1.956,0.559-0.521,0-1.055-0.076-1.602-0.229v-0.85h0.01c0.637,0.158,1.141,0.238,1.508,0.238,0.443,0,0.775-0.111,0.999-0.334,0.225-0.225,0.336-0.559,0.336-1.004,0-0.479-0.135-0.822-0.4-1.03-0.268-0.208-0.885-0.313-1.852-0.313v-0.828z"/>
-<path d="M24.86,11.36v7.28h-1.328v-5.04l-1.373,2.617h-0.561l-1.38-2.62v5.039h-1.334v-7.28h1.123l1.871,3.56,1.869-3.56h1.107z"/>
+<path d="M27,4H3C1.896,4,1,4.896,1,6v18c0,1.104,0.896,2,2,2h24c1.104,0,2-0.896,2-2V6C29,4.896,28.104,4,27,4z M7.584,18.26  c-0.504,0.686-1.254,1.034-2.227,1.034c-0.85,0-1.506-0.233-1.949-0.694c-0.432-0.448-0.716-1.021-0.846-1.701  c-0.125-0.653-0.188-1.453-0.188-2.375c0-1.648,0.245-2.789,0.747-3.486c0.51-0.708,1.272-1.068,2.266-1.068  c0.967,0,1.709,0.352,2.207,1.044c0.49,0.682,0.729,1.83,0.729,3.509C8.323,16.361,8.081,17.584,7.584,18.26z M10.904,18.963  c-0.22,0.219-0.489,0.331-0.801,0.331S9.521,19.182,9.3,18.96s-0.334-0.49-0.334-0.798c0-0.313,0.112-0.58,0.332-0.799  c0.22-0.217,0.491-0.327,0.806-0.327c0.311,0,0.58,0.11,0.8,0.327c0.22,0.219,0.332,0.486,0.332,0.799  C11.235,18.474,11.123,18.743,10.904,18.963z M16.611,18.574c-0.557,0.478-1.389,0.72-2.477,0.72c-0.641,0-1.305-0.095-1.976-0.283  l-0.146-0.04v-1.372h0.2c0.807,0.192,1.399,0.287,1.822,0.287c0.474,0,0.83-0.115,1.057-0.343c0.228-0.227,0.343-0.585,0.343-1.063  c0-0.514-0.132-0.867-0.403-1.078c-0.194-0.152-0.717-0.333-2.098-0.333h-0.2V13.69h0.2c1.365,0,1.854-0.166,2.023-0.306  c0.238-0.196,0.354-0.499,0.354-0.924c0-0.372-0.091-0.638-0.28-0.815c-0.188-0.178-0.486-0.268-0.885-0.268  c-0.379,0-0.927,0.098-1.629,0.292h-0.199l-0.065-0.193v-1.188l0.151-0.038c0.747-0.187,1.434-0.282,2.041-0.282  c0.938,0,1.657,0.196,2.141,0.583c0.497,0.397,0.749,0.994,0.749,1.773c0,0.538-0.149,1.009-0.444,1.401  c-0.188,0.247-0.426,0.45-0.714,0.606c0.327,0.136,0.597,0.335,0.806,0.595c0.319,0.396,0.481,0.895,0.481,1.482  C17.464,17.361,17.178,18.09,16.611,18.574z M26.429,19.2h-1.994v-5.435l-1.325,2.529h-0.916l-1.331-2.531V19.2h-2v-9.137h1.669  l2.123,4.042l2.123-4.042h1.651V19.2z"/>
+<path d="M5.346,11.343c-0.281,0-0.474,0.103-0.604,0.323c-0.15,0.255-0.246,0.597-0.284,1.019c-0.04,0.445-0.061,1.063-0.061,1.839  c0,1.883,0.141,2.605,0.259,2.88c0.152,0.353,0.371,0.518,0.689,0.518c0.199,0,0.488-0.057,0.691-0.548  c0.174-0.42,0.263-1.379,0.263-2.85c0-1.755-0.146-2.431-0.268-2.689C5.873,11.499,5.655,11.343,5.346,11.343z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_12mp.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_12mp.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_12mp.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30" x="0.001"/>
+<rect fill="none" height="30" width="30"/>
 </g>
-<path d="M0.999,3v24h28v-24h-28zm25,21h-22v-18h22v18z"/>
-<path d="M10.74,17.9v0.781h-4.31v-0.781h1.533v-5.448l-1.529,0.35v-0.781l2.152-0.679h0.709v6.559h1.449v-0.004z"/>
-<path d="M16.18,17.83v0.851h-4.354v-0.533c0-0.508,0.088-0.959,0.264-1.353s0.393-0.729,0.65-1.008c0.256-0.279,0.582-0.584,0.977-0.916,0.471-0.397,0.77-0.705,0.893-0.923,0.125-0.218,0.186-0.435,0.186-0.649,0-0.378-0.1-0.662-0.301-0.852-0.199-0.191-0.5-0.286-0.9-0.286-0.422,0-0.936,0.109-1.537,0.327h-0.01v-0.869c0.631-0.198,1.246-0.298,1.846-0.298,0.738,0,1.301,0.162,1.684,0.485,0.385,0.324,0.576,0.802,0.576,1.434,0,0.354-0.087,0.704-0.259,1.047-0.174,0.344-0.58,0.784-1.22,1.321-0.359,0.303-0.639,0.555-0.84,0.757-0.203,0.202-0.373,0.424-0.512,0.665-0.137,0.244-0.213,0.51-0.227,0.8h3.084z"/>
-<path d="M23.57,11.4v7.28h-1.328v-5.04l-1.371,2.617h-0.563l-1.378-2.617v5.04h-1.331v-7.281h1.122l1.869,3.56,1.871-3.56h1.11z"/>
+<path d="M27,4H3C1.896,4,1,4.896,1,6v18c0,1.104,0.896,2,2,2h24c1.104,0,2-0.896,2-2V6C29,4.896,28.104,4,27,4z M10.235,19.2H4.661  v-1.338h1.84v-6.088l-1.84,0.422v-1.335l2.724-0.859l1.11-0.009v7.869h1.74V19.2z M16.763,19.2h-5.627v-0.839  c0-0.635,0.112-1.209,0.334-1.704c0.219-0.49,0.493-0.916,0.815-1.265c0.313-0.338,0.713-0.714,1.19-1.116  c0.546-0.459,0.891-0.813,1.027-1.053c0.13-0.23,0.196-0.459,0.196-0.681c0-0.394-0.1-0.689-0.298-0.877  c-0.201-0.191-0.518-0.288-0.943-0.288c-0.482,0-1.08,0.128-1.778,0.38h-0.2l-0.08-0.188v-1.19l0.14-0.044  c0.774-0.243,1.539-0.367,2.275-0.367c0.931,0,1.655,0.212,2.15,0.63c0.506,0.427,0.763,1.057,0.763,1.873  c0,0.455-0.112,0.908-0.332,1.347c-0.222,0.441-0.717,0.98-1.515,1.648c-0.424,0.358-0.755,0.657-0.995,0.896  c-0.229,0.229-0.424,0.482-0.58,0.758c-0.116,0.202-0.191,0.424-0.227,0.658h3.684V19.2z M25.622,19.2h-1.994v-5.435l-1.325,2.529  h-0.916l-1.331-2.531V19.2h-2v-9.137h1.669l2.123,4.042l2.123-4.042h1.651V19.2z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_1_3mp.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_1_3mp.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_1_3mp.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,5 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M0.998,3v24h28v-24h-28zm25,21h-22v-18h22v18z"/>
-<path d="M9.573,17.86v0.781h-4.31v-0.781h1.533v-5.45l-1.533,0.352v-0.78l2.152-0.68h0.709v6.559h1.449z"/>
-<path d="M11.3,18.72c-0.215,0-0.398-0.076-0.553-0.23-0.152-0.152-0.229-0.334-0.229-0.547,0-0.215,0.074-0.396,0.227-0.547,0.15-0.148,0.336-0.225,0.555-0.225,0.215,0,0.396,0.076,0.549,0.225,0.15,0.15,0.227,0.332,0.227,0.547s-0.076,0.398-0.227,0.551c-0.16,0.16-0.34,0.24-0.55,0.24z"/>
-<path d="M13.66,14.38c0.957,0,1.555-0.098,1.793-0.293,0.236-0.195,0.355-0.496,0.355-0.898,0-0.355-0.096-0.623-0.285-0.801-0.191-0.18-0.475-0.27-0.852-0.27-0.332,0-0.799,0.084-1.402,0.25h-0.01v-0.859c0.613-0.154,1.166-0.23,1.66-0.23,0.746,0,1.307,0.15,1.68,0.449,0.375,0.301,0.563,0.75,0.563,1.348,0,0.414-0.113,0.77-0.338,1.068-0.225,0.297-0.547,0.508-0.967,0.631,0.457,0.082,0.805,0.273,1.047,0.574,0.244,0.301,0.365,0.678,0.365,1.131,0,0.744-0.219,1.305-0.652,1.678-0.436,0.371-1.086,0.559-1.955,0.559-0.521,0-1.055-0.076-1.602-0.23v-0.85h0.01c0.637,0.16,1.141,0.24,1.508,0.24,0.443,0,0.775-0.111,0.998-0.334,0.225-0.225,0.336-0.559,0.336-1.004,0-0.479-0.135-0.822-0.4-1.031-0.268-0.207-0.885-0.313-1.852-0.313v-0.827z"/>
-<path d="M24.74,11.36v7.281h-1.328v-5.039l-1.373,2.617h-0.561l-1.377-2.617v5.039h-1.334v-7.281h1.123l1.871,3.561,1.869-3.561h1.105z"/>
+<path d="M27,4H3C1.896,4,1,4.896,1,6v18c0,1.104,0.896,2,2,2h24c1.104,0,2-0.896,2-2V6C29,4.896,28.104,4,27,4z M8.235,19.2H2.661  v-1.338h1.84v-6.088l-1.84,0.422v-1.335l2.724-0.859l1.11-0.009v7.869h1.74V19.2z M10.904,18.963  c-0.22,0.22-0.489,0.331-0.801,0.331S9.521,19.181,9.3,18.96c-0.221-0.222-0.334-0.49-0.334-0.798c0-0.312,0.112-0.581,0.332-0.798  c0.22-0.218,0.491-0.328,0.806-0.328c0.311,0,0.58,0.11,0.8,0.328c0.22,0.217,0.332,0.486,0.332,0.798S11.124,18.743,10.904,18.963z   M16.611,18.575c-0.557,0.477-1.389,0.719-2.477,0.719c-0.64,0-1.305-0.096-1.976-0.283l-0.146-0.041v-1.371h0.2  c0.807,0.193,1.399,0.287,1.822,0.287c0.474,0,0.83-0.115,1.057-0.343c0.228-0.228,0.343-0.585,0.343-1.063  c0-0.514-0.132-0.867-0.403-1.079c-0.194-0.152-0.716-0.333-2.098-0.333h-0.2V13.69h0.2c1.365,0,1.854-0.166,2.023-0.306  c0.239-0.196,0.354-0.499,0.354-0.924c0-0.372-0.091-0.638-0.28-0.815c-0.189-0.178-0.487-0.268-0.885-0.268  c-0.378,0-0.927,0.098-1.628,0.292h-0.2l-0.065-0.193v-1.188l0.152-0.038c0.747-0.187,1.433-0.282,2.041-0.282  c0.937,0,1.657,0.196,2.141,0.583c0.497,0.397,0.749,0.994,0.749,1.773c0,0.538-0.149,1.009-0.444,1.401  c-0.188,0.247-0.426,0.45-0.714,0.606c0.327,0.136,0.597,0.335,0.806,0.595c0.319,0.396,0.481,0.895,0.481,1.482  C17.464,17.361,17.178,18.09,16.611,18.575z M26.429,19.2h-1.994v-5.435l-1.325,2.529h-0.916l-1.331-2.531V19.2h-2v-9.137h1.669  l2.123,4.042l2.123-4.042h1.651V19.2z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_3mp.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_3mp.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_3mp.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30" x="0.003"/>
+<rect fill="none" height="30" width="30"/>
 </g>
-<path d="M1,3v24h28v-24h-28zm25,21h-22v-18h22v18z"/>
-<path d="M9.762,14.38c0.957,0,1.555-0.098,1.793-0.293,0.236-0.195,0.355-0.494,0.355-0.898,0-0.354-0.096-0.621-0.285-0.801-0.191-0.178-0.475-0.268-0.852-0.268-0.332,0-0.799,0.082-1.402,0.248h-0.01v-0.86c0.613-0.152,1.166-0.229,1.66-0.229,0.746,0,1.307,0.148,1.68,0.449,0.375,0.299,0.563,0.748,0.563,1.348,0,0.412-0.113,0.768-0.338,1.066-0.225,0.297-0.547,0.508-0.967,0.633,0.457,0.08,0.805,0.271,1.047,0.572,0.244,0.303,0.365,0.68,0.365,1.131,0,0.746-0.219,1.305-0.652,1.678-0.436,0.373-1.086,0.559-1.955,0.559-0.521,0-1.055-0.076-1.602-0.229v-0.85h0.01c0.637,0.157,1.141,0.237,1.508,0.237,0.443,0,0.775-0.11,0.998-0.334,0.225-0.224,0.336-0.558,0.336-1.004,0-0.479-0.135-0.822-0.4-1.029-0.268-0.209-0.885-0.313-1.852-0.313v-0.829z"/>
-<path d="M20.84,11.36v7.28h-1.328v-5.04l-1.373,2.617h-0.56l-1.38-2.62v5.039h-1.334v-7.28h1.123l1.871,3.559,1.869-3.559h1.11z"/>
+<path d="M27,4H3C1.896,4,1,4.896,1,6v18c0,1.104,0.896,2,2,2h24c1.104,0,2-0.896,2-2V6C29,4.896,28.104,4,27,4z M12.108,18.574  c-0.557,0.478-1.39,0.72-2.477,0.72c-0.64,0-1.305-0.095-1.976-0.283l-0.146-0.04v-1.372h0.2c0.807,0.192,1.399,0.287,1.822,0.287  c0.474,0,0.83-0.115,1.057-0.343c0.228-0.227,0.343-0.585,0.343-1.063c0-0.514-0.132-0.867-0.403-1.078  c-0.194-0.152-0.716-0.333-2.098-0.333h-0.2V13.69h0.2c1.365,0,1.854-0.166,2.023-0.306c0.239-0.196,0.354-0.499,0.354-0.924  c0-0.372-0.091-0.638-0.28-0.815c-0.189-0.178-0.487-0.268-0.885-0.268c-0.378,0-0.927,0.098-1.628,0.292h-0.2l-0.065-0.193v-1.188  l0.152-0.038C8.647,10.064,9.334,9.97,9.941,9.97c0.937,0,1.657,0.196,2.141,0.583c0.497,0.397,0.749,0.994,0.749,1.773  c0,0.538-0.15,1.009-0.445,1.401c-0.187,0.247-0.425,0.45-0.713,0.606c0.327,0.136,0.597,0.335,0.806,0.595  c0.319,0.396,0.481,0.894,0.481,1.482C12.96,17.361,12.673,18.09,12.108,18.574z M21.925,19.2h-1.994v-5.435l-1.325,2.529h-0.916  l-1.331-2.531V19.2h-2v-9.137h1.669l2.123,4.042l2.123-4.042h1.651V19.2z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_9mp.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_9mp.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_9mp.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30" x="0.002"/>
+<rect fill="none" height="30" width="30"/>
 </g>
-<path d="M1,3v24h28v-24h-28zm25,21h-22v-18h22v18z"/>
-<path d="M9.594,18.6v-0.84c0.303,0.078,0.637,0.117,1.006,0.117,0.539,0,0.947-0.168,1.221-0.506,0.273-0.336,0.434-0.889,0.482-1.652-0.334,0.305-0.764,0.459-1.283,0.459-0.625,0-1.102-0.203-1.43-0.604-0.326-0.41-0.49-0.98-0.49-1.72,0-0.813,0.195-1.447,0.584-1.898,0.389-0.453,0.951-0.68,1.688-0.68,0.764,0,1.342,0.268,1.732,0.805,0.391,0.535,0.586,1.443,0.586,2.727,0,1.26-0.246,2.225-0.736,2.898-0.492,0.672-1.219,1.009-2.184,1.009-0.35,0-0.74-0.04-1.176-0.12zm1.746-3.24c0.318,0,0.563-0.119,0.734-0.354,0.17-0.236,0.256-0.572,0.256-1.004,0-0.635-0.08-1.111-0.238-1.432-0.16-0.318-0.398-0.479-0.713-0.479-0.311,0-0.545,0.119-0.707,0.357-0.16,0.236-0.24,0.707-0.24,1.41,0,0.535,0.074,0.918,0.227,1.15,0.15,0.22,0.38,0.34,0.68,0.34z"/>
-<path d="M20.9,11.36v7.282h-1.328v-5.04l-1.373,2.617h-0.561l-1.377-2.617v5.04h-1.334v-7.282h1.123l1.871,3.561,1.869-3.561h1.112z"/>
+<path d="M10.299,11.343c-0.303,0-0.526,0.111-0.681,0.34c-0.117,0.172-0.255,0.586-0.255,1.581c0,0.598,0.081,1.026,0.24,1.271  c0.144,0.221,0.356,0.328,0.65,0.328c0.318,0,0.553-0.112,0.72-0.342c0.179-0.247,0.27-0.613,0.27-1.087  c0-0.727-0.089-1.274-0.266-1.627C10.817,11.49,10.602,11.343,10.299,11.343z"/>
+<path d="M27,4H3C1.896,4,1,4.896,1,6v18c0,1.104,0.896,2,2,2h24c1.104,0,2-0.896,2-2V6C29,4.896,28.104,4,27,4z M12.347,18.002  c-0.627,0.857-1.563,1.292-2.781,1.292c-0.428,0-0.915-0.048-1.447-0.144l-0.165-0.029v-1.435l0.25,0.065  c0.345,0.089,0.735,0.134,1.157,0.134c0.59,0,1.019-0.174,1.31-0.532c0.247-0.305,0.413-0.785,0.495-1.434  c-0.37,0.217-0.806,0.327-1.3,0.327c-0.81,0-1.438-0.27-1.869-0.801c-0.42-0.519-0.634-1.253-0.634-2.183  c0-1.021,0.252-1.832,0.749-2.41c0.504-0.586,1.237-0.884,2.176-0.884c0.981,0,1.735,0.352,2.242,1.046  c0.499,0.684,0.742,1.793,0.742,3.39C13.271,15.954,12.959,17.164,12.347,18.002z M21.925,19.2h-1.994v-5.435l-1.325,2.529h-0.916  l-1.331-2.531V19.2h-2v-9.137h1.669l2.123,4.042l2.123-4.042h1.651V19.2z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_accented_characters.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_accented_characters.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_accented_characters.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<polygon points="7.79,8.82,5.865,5.946,4.046,5.946,6.243,8.82"/>
-<polygon points="16.47,8.303,19,5,17.42,5,15.72,7,14,5,12.42,5,14.96,8.303"/>
-<path d="M5.394,8.9c-1.107,0-2.283,0.171-3.527,0.513v1.528c1.217-0.362,2.259-0.544,3.128-0.544,0.533,0,0.967,0.087,1.302,0.262,0.335,0.174,0.574,0.42,0.718,0.738,0.144,0.317,0.215,0.774,0.215,1.368v1.118c-1.107,0-2.037,0.05-2.789,0.148-0.752,0.1-1.401,0.305-1.947,0.615-0.548,0.312-0.952,0.718-1.216,1.221-0.263,0.502-0.395,1.105-0.395,1.81,0,1.101,0.304,1.957,0.913,2.568,0.607,0.612,1.452,0.918,2.532,0.918,1.559,0,2.707-0.629,3.445-1.887l0.44,1.71h1.2v-8.295c0-1.313-0.358-2.275-1.077-2.887-0.717-0.607-1.698-0.913-2.942-0.913zm1.835,8.11c0,0.827-0.21,1.481-0.63,1.963-0.421,0.482-1.004,0.723-1.749,0.723-0.588,0-1.032-0.177-1.332-0.533-0.302-0.354-0.451-0.857-0.451-1.507,0-0.766,0.229-1.369,0.687-1.81s1.278-0.662,2.461-0.662h1.015v1.832z"/>
-<polygon points="19.86,10.4,19.86,9.074,11.94,9.074,11.94,10.6,17.28,10.6,11.52,19.66,11.52,21,19.99,21,19.99,19.46,14.09,19.46"/>
-<path d="M29,19.44c-0.471,0.157-1.142,0.236-2.01,0.236-1.004,0-1.764-0.409-2.275-1.226-0.514-0.817-0.77-1.991-0.77-3.522,0-1.429,0.258-2.541,0.774-3.338,0.516-0.796,1.272-1.194,2.271-1.194,0.772,0,1.416,0.082,1.928,0.246v-1.494c-0.725-0.17-1.397-0.256-2.02-0.256-1.702,0-2.999,0.521-3.892,1.563-0.892,1.043-1.338,2.518-1.338,4.425,0,2.044,0.41,3.601,1.23,4.671,0.82,1.069,2.051,1.604,3.691,1.604,0.175,0,0.332-0.022,0.501-0.03-0.234,0.652-0.441,1.331-0.612,1.866h-1.48v1h2v-0.001h1c0.088,0.04,0.368-1.64,0.73-3.089,0.087-0.021,0.183-0.029,0.268-0.054v-1.409z"/>
+</g>
+<polygon points="7.79,8.82 5.865,5.946 4.046,5.946 6.243,8.82 "/>
+<polygon points="16.467,8.303 19,5 17.424,5 15.72,7 14,5 12.424,5 14.957,8.303 "/>
+<path d="M5.394,8.9c-1.107,0-2.283,0.171-3.527,0.513v1.528c1.217-0.362,2.259-0.544,3.128-0.544c0.533,0,0.967,0.087,1.302,0.262  c0.335,0.174,0.574,0.42,0.718,0.738c0.144,0.317,0.215,0.774,0.215,1.368v1.118c-1.107,0-2.037,0.05-2.789,0.148  c-0.752,0.1-1.401,0.305-1.947,0.615c-0.548,0.312-0.952,0.718-1.216,1.221c-0.263,0.502-0.395,1.105-0.395,1.81  c0,1.101,0.304,1.957,0.913,2.568c0.607,0.612,1.452,0.918,2.532,0.918c1.559,0,2.707-0.629,3.445-1.887L8.213,21h1.2v-8.295  c0-1.313-0.358-2.275-1.077-2.887C7.619,9.206,6.638,8.9,5.394,8.9z M7.229,17.012c0,0.827-0.21,1.481-0.63,1.963  c-0.421,0.482-1.004,0.723-1.749,0.723c-0.588,0-1.032-0.177-1.332-0.533c-0.302-0.354-0.451-0.857-0.451-1.507  c0-0.766,0.229-1.369,0.687-1.81c0.458-0.441,1.278-0.662,2.461-0.662h1.015V17.012z"/>
+<polygon points="19.861,10.397 19.861,9.074 11.945,9.074 11.945,10.603 17.277,10.603 11.525,19.656 11.525,21 19.994,21   19.994,19.462 14.088,19.462 "/>
+<path d="M28.998,19.441c-0.471,0.157-1.142,0.236-2.01,0.236c-1.004,0-1.764-0.409-2.275-1.226c-0.514-0.817-0.77-1.991-0.77-3.522  c0-1.429,0.258-2.541,0.774-3.338c0.516-0.796,1.272-1.194,2.271-1.194c0.772,0,1.416,0.082,1.928,0.246V9.156  c-0.725-0.17-1.397-0.256-2.02-0.256c-1.702,0-2.999,0.521-3.892,1.563c-0.892,1.043-1.338,2.518-1.338,4.425  c0,2.044,0.41,3.601,1.23,4.671c0.82,1.069,2.051,1.604,3.691,1.604c0.175,0,0.332-0.022,0.501-0.03  c-0.234,0.652-0.441,1.331-0.612,1.866H25v1h2v-0.002h1c0.088,0.041,0.368-1.639,0.73-3.088c0.087-0.021,0.183-0.029,0.268-0.054  V19.441z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_activitystream.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_activitystream.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_activitystream.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M10.37,17.18c-0.731-0.662-1.288-1.417-1.714-2.314-1.002-2.12-0.705-5.979-0.611-6.944,0.072-2.494,2.419-4.848,4.767-5.638-0.98-1.273-2.62-2.288-3.874-2.288h-1.214c-1.915,0-4.342,2.367-4.342,4.388,0,0-0.29,4.066,0.575,6.022,0.475,1.067,0.918,1.963,1.889,2.645,0.003,0.14,0.012,0.733,0.003,0.87-0.118,1.98-5.847,4.35-5.847,4.35v5.72h4v-1.927l0.407-0.536c0.296-0.391,0.623-0.597,1.705-1.277,2.241-1.4,3.669-2.44,4.258-3.07z"/>
-<path d="M19.52,14.01c0.908-1.782,0.423-5.978,0.423-5.978,0-1.858-2.47-4.034-4.35-4.034h-1.191c-1.88,0-4.354,2.176-4.354,4.034,0,0-0.431,4.175,0.419,5.972,0.467,0.982,1.139,1.708,2.092,2.334,0.003,0.128,0.01,0.794,0.002,0.921-0.006,0.087-0.037,0.179-0.068,0.271h3.143c0.659-1.187,1.783-2.071,3.138-2.391,0.29-0.33,0.53-0.7,0.75-1.12z"/>
-<path d="M21.94,7.903c0.108,0.996,0.446,4.888-0.639,7.017-0.015,0.028-0.035,0.052-0.05,0.08h3.439c-0.311-0.36-0.514-0.724-0.534-1.075-0.009-0.146,0-0.75,0.003-0.896,0.947-0.685,1.361-1.57,1.861-2.618,0.926-1.938,0.587-6.022,0.587-6.022,0-2.011-2.43-4.378-4.34-4.378h-1.214c-1.253,0-2.889,1.016-3.874,2.282,2.33,0.791,4.67,3.135,4.75,5.621z"/>
-<path d="M15,24.82l-2.916-6.596c-1.45,1.83-5.827,4.19-6.08,4.53v5.25h9.09c-0.05-0.29-0.09-0.58-0.09-0.89v-2.294z"/>
-<path d="M27.11,17h-7.223c-1.6,0-2.89,1.29-2.89,2.89v7.221c0,1.596,1.294,2.89,2.889,2.89h7.223c1.6,0,2.89-1.29,2.89-2.89v-7.22c0-1.6-1.29-2.89-2.89-2.89zm-7.3,11.56c-0.752,0-1.361-0.608-1.361-1.359s0.609-1.36,1.361-1.36,1.363,0.609,1.363,1.36-0.61,1.36-1.36,1.36zm5.29,0h-1.93c0.002-0.08,0.012-0.159,0.012-0.241,0-2.48-2.021-4.5-4.506-4.5-0.078,0-0.154,0.008-0.23,0.012v-1.928c0.076-0.002,0.152-0.012,0.23-0.012,3.549,0,6.438,2.884,6.438,6.428,0,0.08-0.01,0.16-0.01,0.24zm3.44,0h-1.93c0.003-0.082,0.013-0.164,0.013-0.245,0-4.377-3.564-7.937-7.947-7.937-0.078,0-0.154,0.009-0.23,0.012v-1.929c0.078-0.001,0.152-0.011,0.23-0.011,5.448,0,9.879,4.424,9.879,9.864,0.01,0.08-0.01,0.16-0.01,0.25z"/>
+</g>
+<path d="M10.299,17.467c0.053-0.005,0.277-0.016,0.332-0.021C9.006,15.738,8,13.14,8,10.481c0-3.686,1.954-6.821,4.67-7.988  C11.854,0.987,10.515,0,9,0C6.519,0,4.5,2.641,4.5,5.892c0,2.276,1.011,4.543,2.514,5.648c0.117,0.087,0.184,0.224,0.184,0.367v0.33  c0,1.304-1.227,1.792-2.249,1.814C0.504,14.5,0.018,19.742,0,20h5.387C6.514,18.701,8.1,17.687,10.299,17.467z"/>
+<path d="M15,19c0-2.104,1.64-3.816,3.706-3.97C19.511,13.754,20,12.124,20,10.481C20,6.905,17.758,4,15,4s-5,2.905-5,6.481  c0,2.504,1.123,4.998,2.793,6.213c0.131,0.096,0.205,0.246,0.205,0.404v0.362c0,1.435-1.364,1.972-2.5,1.996  C5.561,19.949,5.02,25.716,5,26h10V19z"/>
+<path d="M22,10.481c0,1.588-0.365,3.15-1.002,4.519h6.512c-0.644-0.486-1.445-0.846-2.461-0.948c-0.776,0-2.25-0.378-2.25-1.814  v-0.33c0-0.144,0.07-0.28,0.184-0.367c1.507-1.105,2.518-3.372,2.518-5.648C25.5,2.641,23.481,0,21,0  c-1.515,0-2.854,0.987-3.67,2.493C20.046,3.66,22,6.796,22,10.481z"/>
+<path d="M28,17h-9c-1.104,0-2,0.896-2,2v9c0,1.104,0.896,2,2,2h9c1.104,0,2-0.896,2-2v-9C30,17.896,29.104,17,28,17z M19.807,28.555  c-0.752,0-1.361-0.608-1.361-1.359c0-0.75,0.609-1.36,1.361-1.36s1.363,0.61,1.363,1.36C21.17,27.946,20.559,28.555,19.807,28.555z   M25.102,28.555H23.17c0.003-0.08,0.013-0.159,0.013-0.241c0-2.48-2.022-4.5-4.507-4.5c-0.078,0-0.154,0.008-0.23,0.012v-1.928  c0.076-0.002,0.152-0.011,0.23-0.011c3.549,0,6.438,2.883,6.438,6.427C25.113,28.396,25.105,28.475,25.102,28.555z M28.543,28.555  H26.61c0.003-0.082,0.013-0.164,0.013-0.245c0-4.377-3.564-7.937-7.947-7.937c-0.078,0-0.154,0.01-0.23,0.012v-1.928  c0.078-0.002,0.152-0.012,0.23-0.012c5.448,0,9.88,4.425,9.88,9.864C28.556,28.391,28.544,28.473,28.543,28.555z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_contact.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_contact.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_contact.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M8.648,14.904c0.002,0.148,0.014,0.419,0.004,0.566c-0.007,0.102-0.043,0.209-0.08,0.317h5.857  c-0.037-0.108-0.072-0.216-0.079-0.317c-0.011-0.157,0-0.437,0.003-0.596c1.086-0.732,2.027-1.654,2.6-2.776  c1.061-2.08,0.672-7.392,0.672-7.392C17.625,2.538,14.383,0,12.189,0h-1.391C8.605,0,5.375,2.538,5.375,4.707  c0,0-0.332,5.294,0.658,7.392C6.577,13.243,7.536,14.175,8.648,14.904z"/>
-<path d="M13,22.5c0-0.768,0.102-1.51,0.273-2.225L11.5,24.286l-3.401-7.694C6.402,18.725,1.295,21.482,1,21.87V28h13.769  C13.66,26.446,13,24.551,13,22.5z"/>
-<path d="M22.5,15c-4.136,0-7.5,3.364-7.5,7.5s3.364,7.5,7.5,7.5s7.5-3.364,7.5-7.5S26.636,15,22.5,15z M22.5,28  c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5s5.5,2.468,5.5,5.5S25.533,28,22.5,28z"/>
-<polygon points="24,21 24,18 21,18 21,21 18,21 18,24 21,24 21,27 24,27 24,24 27,24 27,21 "/>
+<path d="M14,23c0-1.917,0.607-3.692,1.633-5.154c-0.676-0.348-1.234-0.944-1.234-1.938V15.48c0-0.187,0.093-0.365,0.245-0.478  C16.652,13.566,18,10.619,18,7.66C18,3.434,15.309,0,12,0S6,3.434,6,7.66c0,2.959,1.348,5.907,3.352,7.343  c0.157,0.113,0.245,0.291,0.245,0.478v0.428c0,1.695-1.636,2.33-2.999,2.359C0.673,18.85,0.024,25.664,0,26h14.525  C14.191,25.061,14,24.053,14,23z"/>
+<path d="M23,16c-3.865,0-7,3.135-7,7c0,3.867,3.135,7,7,7s7-3.133,7-7C30,19.135,26.865,16,23,16z M24,24v4h-2v-4h-4v-2h4v-4h2v4h4  v2H24z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_calendar.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_calendar.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_calendar.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,8 +4,7 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M18.881,18.278c-1.127,0.918-1.888,1.747-2.285,2.485C16.199,21.499,16,22.26,16,23.042V24h7v-1.035h-4.652  c0.029-0.588,0.141-1.068,0.308-1.378c0.165-0.308,0.396-0.613,0.687-0.911c0.295-0.3,0.761-0.712,1.4-1.237  c0.582-0.478,1.019-0.882,1.314-1.215c0.296-0.335,0.519-0.69,0.672-1.07c0.15-0.38,0.226-0.798,0.226-1.256  c0-0.953-0.306-1.673-0.915-2.164C21.428,13.245,20.531,13,19.35,13c-0.963,0-1.953,0.149-2.971,0.445v1.481  c0.928-0.329,1.71-0.496,2.346-0.496c1.142,0,1.714,0.52,1.714,1.555c0,0.399-0.111,0.759-0.332,1.076  C19.885,17.381,19.477,17.786,18.881,18.278z"/>
-<path d="M23,3V1h-3v2h-4.137c0.496,0.919,0.836,1.932,1.006,3H26v3h-9.131c-0.11,0.694-0.293,1.364-0.546,2H26v16H6V16.87  c-1.068-0.171-2.081-0.51-3-1.007V30h26V3H23z"/>
-<path d="M11,16.323V23H9v1h6v-1h-1.563v-8.096C12.706,15.492,11.885,15.971,11,16.323z"/>
-<path d="M15,7.5C15,3.364,11.636,0,7.5,0S0,3.364,0,7.5S3.364,15,7.5,15S15,11.636,15,7.5z M13,7.5c0,2.857-2.192,5.212-4.982,5.474  L12,7H8.973C8.788,4.948,7.568,3.19,5.838,2.258C6.363,2.091,6.921,2,7.5,2C10.533,2,13,4.468,13,7.5z M2,7.5  c0-1.521,0.621-2.898,1.622-3.896C5.353,3.878,6.706,5.257,6.945,7H4l3.983,5.976C7.824,12.989,7.663,13,7.5,13  C4.467,13,2,10.532,2,7.5z"/>
+<path d="M7,16c-1.438,0-2.793-0.348-4-0.949V28c0,1.104,0.896,2,2,2h22c1.104,0,2-0.896,2-2V12H14.479C12.861,14.41,10.113,16,7,16z   M16,25.042c0-0.782,0.199-1.544,0.596-2.278c0.397-0.738,1.158-1.567,2.285-2.485c0.596-0.492,1.004-0.897,1.226-1.217  c0.221-0.317,0.332-0.677,0.332-1.076c0-1.035-0.572-1.555-1.714-1.555c-0.636,0-1.418,0.167-2.346,0.496v-1.481  C17.396,15.149,18.387,15,19.35,15c1.182,0,2.078,0.245,2.689,0.733c0.609,0.491,0.915,1.211,0.915,2.164  c0,0.458-0.075,0.876-0.226,1.256c-0.153,0.38-0.376,0.735-0.672,1.07c-0.296,0.333-0.732,0.737-1.314,1.215  c-0.64,0.525-1.105,0.938-1.4,1.237c-0.291,0.298-0.521,0.604-0.687,0.911c-0.167,0.31-0.278,0.79-0.308,1.378H23V26h-7V25.042z   M15,26H9v-1h2v-8.14l-2,0.417v-1.288L12.063,15h1.375v10H15V26z"/>
+<path d="M27,3h-4V2c0-0.552-0.447-1-1-1h-1c-0.553,0-1,0.448-1,1v1h-4.949C15.652,4.207,16,5.562,16,7c0,1.053-0.191,2.06-0.525,3  H29V5C29,3.896,28.104,3,27,3z"/>
+<path d="M14,7c0-3.867-3.134-7-7-7C5.899,0,4.862,0.26,3.937,0.713c3.864,1.889,4.169,4.746,4.103,5.953H9h2L7,12L3,6.666h2h1.043  c0.074-0.533,0.172-3.057-4.017-4.59C0.774,3.34,0,5.079,0,7c0,3.865,3.134,7,7,7S14,10.865,14,7z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_contact.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_contact.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_contact.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<path d="M22,19.5c-0.169-0.222-3.088-1.801-4.056-3.02L16,21l-1.943-4.521c-0.968,1.22-3.888,2.797-4.057,3.019V23h12V19.5z"/>
-<path d="M19.294,9.689c0-1.053-1.188-2.249-2.314-2.588C16.985,7.234,17,7.365,17,7.5c0,2.868-1.283,5.438-3.299,7.181  c0.198,0.195,0.415,0.378,0.67,0.546c0.002,0.086,0.007,0.53,0.001,0.614c-0.004,0.058-0.024,0.12-0.046,0.183  c0-0.001,0.001-0.002,0.001-0.002h3.347c0,0,0,0.001,0.001,0.001c-0.021-0.062-0.042-0.124-0.046-0.182  c-0.007-0.09,0-0.523,0.001-0.614c0.621-0.418,1.056-0.91,1.382-1.553C19.618,12.487,19.294,9.689,19.294,9.689z"/>
-<path d="M15.231,2c0.641,0.897,1.125,1.909,1.424,3H24v20H8v-8.025C7.833,16.983,7.669,17,7.5,17c-0.866,0-1.702-0.127-2.5-0.345V19  H3v2h2v3H3v2h2v2h22V2H15.231z"/>
-<path d="M7.5,0C3.364,0,0,3.364,0,7.5S3.364,15,7.5,15S15,11.636,15,7.5S11.636,0,7.5,0z M2,7.5c0-1.521,0.62-2.898,1.621-3.896  C5.353,3.878,6.706,5.257,6.945,7H4l3.983,5.976C7.824,12.989,7.663,13,7.5,13C4.467,13,2,10.532,2,7.5z M8.018,12.974L12,7H8.973  C8.788,4.948,7.568,3.19,5.838,2.258C6.363,2.091,6.921,2,7.5,2C10.533,2,13,4.468,13,7.5C13,10.357,10.809,12.712,8.018,12.974z"/>
+<path d="M7,0C5.899,0,4.862,0.26,3.937,0.713c3.864,1.889,4.169,4.746,4.103,5.953H9h2L7,12L3,6.666h2h1.043  c0.074-0.533,0.172-3.057-4.017-4.59C0.774,3.34,0,5.079,0,7c0,3.865,3.134,7,7,7s7-3.135,7-7C14,3.133,10.866,0,7,0z"/>
+<rect height="11" width="2" x="28" y="5"/>
+<path d="M3,15.051V30h2V15.769C4.298,15.608,3.629,15.364,3,15.051z"/>
+<path d="M25,2H14.479C15.438,3.432,16,5.15,16,7c0,0.84-0.124,1.65-0.34,2.422C16.064,9.161,16.516,9,17,9c1.654,0,3,1.717,3,3.83  c0,1.479-0.674,2.953-1.678,3.671c-0.076,0.057-0.121,0.146-0.121,0.239v0.214c0,0.934,0.98,1.18,1.498,1.18  C22.664,18.425,22.988,21.832,23,22H11c0.014-0.168,0.336-3.575,3.301-3.866c0.68-0.015,1.5-0.332,1.5-1.18V16.74  c0-0.094-0.047-0.183-0.123-0.239C14.674,15.783,14,14.31,14,12.83c0-0.071,0.014-0.138,0.017-0.208C12.365,14.678,9.836,16,7,16v14  h18c1.104,0,2-0.896,2-2V4C27,2.896,26.104,2,25,2z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_favourites.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_favourites.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_favourites.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M29,13l-8.982-1.1l-3.212-6.315C16.934,6.204,17,6.844,17,7.5c0,5.238-4.262,9.5-9.5,9.5c-0.137,0-0.27-0.015-0.405-0.021  L9.5,19.316L8,28l8-4.1l8,4.1l-1.5-8.684L29,13z"/>
-<path d="M15,7.5C15,3.364,11.636,0,7.5,0S0,3.364,0,7.5S3.364,15,7.5,15S15,11.636,15,7.5z M13,7.5c0,2.857-2.191,5.212-4.982,5.474  L12,7H8.973C8.787,4.948,7.568,3.19,5.838,2.258C6.363,2.092,6.921,2,7.5,2C10.533,2,13,4.468,13,7.5z M2,7.5  c0-1.521,0.621-2.898,1.621-3.896C5.354,3.878,6.706,5.258,6.945,7H4l3.983,5.976C7.824,12.989,7.663,13,7.5,13  C4.467,13,2,10.532,2,7.5z"/>
+<path d="M29.949,12.944c-0.136-0.408-0.518-0.686-0.949-0.686h-9.217l-2.825-8.571c-0.081-0.247-0.255-0.442-0.474-0.558  C16.338,3.047,16.169,3,15.992,3c-0.004,0-0.008,0-0.012,0c-0.299,0.004-0.569,0.146-0.753,0.367C15.721,4.479,16,5.707,16,7  c0,4.963-4.037,9-9,9c-0.856,0-1.682-0.128-2.467-0.352l5.34,3.977l-3.174,9.044c-0.145,0.414-0.004,0.874,0.35,1.135  C7.225,29.935,7.434,30,7.644,30c0.208,0,0.415-0.064,0.592-0.193L16,24.103l7.766,5.704C23.941,29.936,24.149,30,24.357,30  c0.209,0,0.418-0.065,0.595-0.196c0.353-0.261,0.494-0.721,0.349-1.135l-3.174-9.044l7.471-5.564  C29.943,13.804,30.085,13.354,29.949,12.944z"/>
+<path d="M7,0C5.899,0,4.862,0.26,3.937,0.713c3.864,1.889,4.169,4.746,4.103,5.953H9h2L7,12L3,6.666h2h1.043  c0.074-0.533,0.172-3.057-4.017-4.59C0.774,3.34,0,5.079,0,7c0,3.865,3.134,7,7,7s7-3.135,7-7C14,3.133,10.866,0,7,0z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_homescreen.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_homescreen.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_homescreen.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,6 +4,7 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M24,1h-9.591c0.565,0.601,1.06,1.269,1.454,2H25v18H11v-4.677c-0.636,0.253-1.306,0.436-2,0.547V26c0,1.65,1.35,3,3,3h12  c1.65,0,3-1.35,3-3V4C27,2.35,25.65,1,24,1z M14,26h-3v-2h3V26z M18,27c-1.104,0-2-0.896-2-2s0.896-2,2-2c1.105,0,2,0.896,2,2  S19.105,27,18,27z M25,26h-3v-2h3V26z"/>
-<path d="M15,7.5C15,3.364,11.636,0,7.5,0S0,3.364,0,7.5S3.364,15,7.5,15S15,11.636,15,7.5z M2,7.5c0-1.521,0.621-2.898,1.621-3.896  C5.354,3.878,6.706,5.257,6.945,7H4l3.983,5.976C7.824,12.989,7.663,13,7.5,13C4.467,13,2,10.532,2,7.5z M8.018,12.974L12,7H8.973  C8.787,4.948,7.568,3.19,5.838,2.258C6.363,2.091,6.921,2,7.5,2C10.533,2,13,4.468,13,7.5C13,10.357,10.809,12.712,8.018,12.974z"/>
+<path d="M23,1h-9.312c0.539,0.6,0.999,1.272,1.364,2H23v18H9v-5.232C8.356,15.915,7.688,16,7,16v11c0,1.104,0.895,2,2,2h14  c1.104,0,2-0.896,2-2V3C25,1.896,24.104,1,23,1z M12,26H9v-2h3V26z M16,27c-1.105,0-2-0.896-2-2s0.895-2,2-2c1.104,0,2,0.896,2,2  S17.104,27,16,27z M23,26h-3v-2h3V26z"/>
+<path d="M15.475,4C15.809,4.94,16,5.947,16,7c0,3.909-2.511,7.235-6,8.475V20h12V4H15.475z"/>
+<path d="M7,0C5.899,0,4.862,0.26,3.936,0.713c3.865,1.889,4.17,4.746,4.104,5.953H9h2L7,12L3,6.666h2h1.043  c0.074-0.533,0.172-3.057-4.017-4.59C0.774,3.34,0,5.079,0,7c0,3.865,3.134,7,7,7c3.865,0,7-3.135,7-7C14,3.133,10.866,0,7,0z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_video_collection.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_video_collection.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_video_collection.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M19,13v-2h-2.677c-0.284,0.714-0.651,1.383-1.092,2h1.77v1h-2v-0.69c-0.875,1.127-1.995,2.049-3.283,2.69h3.28v3h-5v-2.345c-0.643,0.176-1.312,0.283-2,0.319v2.02h-2v2h2v1h-2v2h13v-2h-1v-1h1v-2h-2v-3h2v-2h-1v-1h1zm-8,9h-2v-1h2v1zm3,0h-2v-1h2v1zm3,0h-2v-1h2v1z"/>
-<path d="M16.87,6c0.08,0.49,0.13,0.988,0.13,1.5s-0.05,1.01-0.13,1.5h4.13v17h-17v-9.677c-1.121-0.446-2.135-1.1-3-1.914v14.59h23v-23h-7.131z"/>
-<path d="M14.41,1c0.813,0.865,1.468,1.879,1.914,3h9.68v20h3v-23h-14.59z"/>
-<path d="M7.5,0c-4.136,0-7.5,3.364-7.5,7.5s3.364,7.5,7.5,7.5,7.5-3.36,7.5-7.5-3.36-7.5-7.5-7.5zm-5.5,7.5c0-1.521,0.621-2.898,1.621-3.896,1.733,0.274,3.085,1.653,3.324,3.396h-2.945l3.983,5.976c-0.159,0.01-0.32,0.02-0.483,0.02-3.033,0-5.5-2.47-5.5-5.5zm6.018,5.47l3.982-5.97h-3.027c-0.186-2.052-1.405-3.81-3.135-4.742,0.525-0.167,1.083-0.258,1.662-0.258,3.03,0,5.5,2.468,5.5,5.5,0,2.86-2.19,5.21-4.982,5.47z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<rect height="2" width="2" x="10" y="22"/>
+<rect height="2" width="2" x="7" y="22"/>
+<rect height="5" width="7" x="9" y="15"/>
+<rect height="2" width="2" x="13" y="22"/>
+<rect height="2" width="2" x="16" y="11"/>
+<rect height="2" width="2" x="16" y="22"/>
+<path d="M27,1H13.689c0.777,0.866,1.389,1.881,1.785,3H26v17v3h1c1.104,0,2-0.896,2-2V3C29,1.896,28.104,1,27,1z"/>
+<path d="M13.689,13H15v-1.896C14.645,11.793,14.203,12.428,13.689,13z"/>
+<path d="M22,6h-6.059C15.978,6.329,16,6.662,16,7c0,0.688-0.085,1.355-0.232,2H20c0.553,0,1,0.448,1,1s-0.447,1-1,1h-1v2h1  c0.553,0,1,0.448,1,1s-0.447,1-1,1h-2v5h2c0.553,0,1,0.447,1,1s-0.447,1-1,1h-1v2h1c0.553,0,1,0.447,1,1s-0.447,1-1,1H5  c-0.553,0-1-0.447-1-1s0.447-1,1-1h1v-2H5c-0.553,0-1-0.447-1-1s0.447-1,1-1h2v-4c-2.307,0-4.406-0.879-6-2.311V27  c0,1.104,0.896,2,2,2h19c1.104,0,2-0.896,2-2V8C24,6.896,23.104,6,22,6z"/>
+<path d="M7,0C5.899,0,4.862,0.26,3.937,0.713c3.864,1.889,4.169,4.746,4.103,5.953H9h2L7,12L3,6.666h2h1.043  c0.074-0.533,0.172-3.057-4.017-4.59C0.774,3.34,0,5.079,0,7c0,3.865,3.134,7,7,7s7-3.135,7-7C14,3.133,10.866,0,7,0z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_addcity.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_addcity.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_addcity.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,12 +4,7 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="3" width="2" x="12" y="8"/>
-<rect height="3" width="2" x="16" y="8"/>
-<rect height="3" width="2" x="12" y="13"/>
-<path d="M12,21h1.131c0.152-0.962,0.449-1.874,0.869-2.717V18h-2V21z"/>
-<path d="M16,15.591c0.602-0.565,1.27-1.06,2-1.454V13h-2V15.591z"/>
-<path d="M10,24V6.091l5-2.857l5,2.857v7.254C20.799,13.127,21.635,13,22.5,13c2.051,0,3.947,0.66,5.5,1.769V8h-6V4.93l-7-4l-7,4V11  H2v14H1v3h13.77c-0.832-1.166-1.404-2.526-1.639-4H10z M22,10h4v2h-4V10z M8,23H4v-2h4V23z M8,19H4v-2h4V19z M8,15H4v-2h4V15z"/>
-<path d="M22.5,15c-4.135,0-7.5,3.364-7.5,7.5s3.365,7.5,7.5,7.5c4.137,0,7.5-3.364,7.5-7.5S26.637,15,22.5,15z M22.5,28  c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5s5.5,2.468,5.5,5.5S25.533,28,22.5,28z"/>
-<polygon points="24,21 24,18 21,18 21,21 18,21 18,24 21,24 21,27 24,27 24,24 27,24 27,21 "/>
+<path d="M23,16c-3.866,0-7,3.134-7,7s3.134,7,7,7s7-3.134,7-7S26.866,16,23,16z M24,24v4h-2v-4h-4v-2h4v-4h2v4h4v2H24z"/>
+<path d="M26,14.525c0.711,0.252,1.384,0.583,2,0.997V10c0-1.104-0.896-2-2-2h-1c-1.104,0-2,0.896-2,2h3v2h-3v2h3V14.525z"/>
+<path d="M14,23h-3v-4h3V23c0-2.307,0.879-4.406,2.311-6H16v-4h3v1.95c0.923-0.46,1.932-0.772,3-0.891V7c0-0.001,0-0.003,0-0.005V5  c0-0.379-0.215-0.725-0.553-0.895l-6-3C15.307,1.035,15.152,1,15,1c-0.154,0-0.307,0.035-0.447,0.105l-6,3C8.213,4.275,8,4.621,8,5  v2c0,0.001,0,0.001,0,0.002V25H7v-2H4v-2h3v-2H4v-2h3v-2H4v-2h3c0-1.104-0.896-2-2-2H4c-1.104,0-2,0.896-2,2v12.092  c-0.581,0.207-1,0.756-1,1.408C1,27.328,1.671,28,2.5,28h13.021C14.562,26.568,14,24.85,14,23z M16,7h3v4h-3V7z M11,7h3v4h-3V7z   M11,13h3v4h-3V13z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="30" width="30"/>
-<path d="M23.09,4.084l0.707-0.707c0.779-0.777,2.053-0.777,2.83,0,0.777,0.778,0.777,2.051,0,2.828l-0.707,0.708-2.83-2.829z"/>
-<path d="M25.21,4.791c-3.891-3.89-10.25-3.89-14.14,0l-4.247,4.243c-1.913-0.685-2.636-0.192-3.514,0.686l-1.436,1.435,16.97,16.97,1.438-1.438c0.879-0.877,1.371-1.602,0.686-3.514l4.244-4.244c3.89-3.9,3.89-10.26,0-14.15z"/>
-<path d="M12.47,23.87c-1.675,0.432-3.569-0.033-4.935-1.396-1.363-1.365-1.83-3.262-1.399-4.938l6.334,6.34z"/>
+<path d="M5.954,9.943L20.14,24.053c0.69,1.91,0.198,2.633-0.681,3.512L18.023,29L1,12.067l1.436-1.436  C3.313,9.753,4.038,9.261,5.954,9.943z"/>
+<path d="M12.262,24.475c-1.676,0.432-3.574-0.029-4.943-1.392c-1.368-1.36-1.839-3.256-1.41-4.928L12.262,24.475z"/>
+<path d="M28.147,11.771c0,0-0.413-2.225-2.375-4.551l0.066-0.066c0.778-0.778,0.775-2.048-0.004-2.826  C25.055,3.553,23.779,3.555,23,4.332L22.943,4.39c-2.385-2.043-4.697-2.466-4.697-2.466c-0.968-0.171-1.985-0.156-2.924,0.16  c-1.508,0.507-2.375,1.876-3.349,3.055c-0.616,0.747-1.2,1.535-1.847,2.256C9.37,8.238,8.64,8.787,7.99,9.147l12.942,12.873  c0.358-0.649,0.908-1.379,1.752-2.136c0.721-0.647,1.509-1.231,2.256-1.849c1.18-0.974,2.551-1.843,3.055-3.349  C28.31,13.752,28.321,12.737,28.147,11.771z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_inactive.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_inactive.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_inactive.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="30" width="29.999"/>
-<path d="M23.085,4.084l0.707-0.707c0.778-0.777,2.054-0.777,2.83,0c0.776,0.779,0.776,2.051,0,2.828l-0.707,0.709L23.085,4.084z"/>
-<path d="M12.467,23.869c-1.676,0.43-3.57-0.033-4.936-1.398c-1.363-1.363-1.83-3.262-1.398-4.936L12.467,23.869z"/>
-<path d="M4.652,8.801C4.137,8.952,3.74,9.289,3.309,9.721l-1.436,1.436l16.97,16.971l1.437-1.437c0.432-0.433,0.77-0.827,0.92-1.346  L4.652,8.801z"/>
-<path d="M24.146,19.996l1.063-1.063c3.889-3.89,3.889-10.252,0-14.144c-3.891-3.889-10.253-3.889-14.142,0l-1.063,1.063  L24.146,19.996z"/>
-<rect height="35.828" transform="matrix(-0.7061 0.7082 -0.7082 -0.7061 36.2137 14.9664)" width="1.867" x="14.067" y="-2.915"/>
+<rect fill="none" height="30" width="30"/>
+<path d="M5.954,9.943L20.14,24.053c0.69,1.91,0.198,2.633-0.681,3.512L18.023,29L1,12.067l1.436-1.436  C3.313,9.753,4.038,9.261,5.954,9.943z"/>
+<path d="M12.262,24.475c-1.676,0.432-3.574-0.029-4.943-1.392c-1.368-1.36-1.839-3.256-1.41-4.928L12.262,24.475z"/>
+<path d="M23.42,19.27c0.506-0.413,1.02-0.818,1.521-1.233c1.18-0.974,2.551-1.843,3.055-3.349c0.314-0.936,0.326-1.95,0.152-2.916  c0,0-0.413-2.225-2.375-4.551l0.066-0.066c0.778-0.778,0.775-2.048-0.004-2.826C25.055,3.553,23.779,3.555,23,4.332L22.943,4.39  c-2.385-2.043-4.697-2.466-4.697-2.466c-0.968-0.171-1.985-0.156-2.924,0.16c-1.508,0.507-2.375,1.876-3.349,3.055  c-0.403,0.489-0.8,0.99-1.202,1.484L23.42,19.27z"/>
+<path d="M27.693,26.372c0.389,0.389,0.41,1.005,0.048,1.368c-0.362,0.362-0.978,0.343-1.366-0.046L2.307,3.625  C1.918,3.236,1.896,2.621,2.26,2.258c0.363-0.362,0.979-0.34,1.367,0.049L27.693,26.372z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_new.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_new.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_new.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-</g>
-<path d="M22.213,3.21l0.707-0.707c0.779-0.777,2.053-0.777,2.83,0c0.777,0.778,0.777,2.051,0,2.828l-0.707,0.708L22.213,3.21z"/>
-<path d="M11.593,22.994c-1.675,0.431-3.569-0.033-4.935-1.397c-1.363-1.364-1.83-3.262-1.399-4.937L11.593,22.994z"/>
-<path d="M22.5,13c1.539,0,2.989,0.376,4.276,1.028c1.092-3.451,0.283-7.387-2.44-10.111c-3.891-3.89-10.254-3.89-14.143,0L5.95,8.16  C4.037,7.475,3.313,7.968,2.436,8.846L1,10.281l12.011,12.011C13.123,17.15,17.332,13,22.5,13z"/>
-<path d="M22.5,15c-4.136,0-7.5,3.364-7.5,7.5s3.364,7.5,7.5,7.5s7.5-3.364,7.5-7.5S26.636,15,22.5,15z M22.5,28  c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5s5.5,2.468,5.5,5.5S25.533,28,22.5,28z"/>
-<rect height="3" width="9" x="18" y="21"/>
-<rect height="9" width="3" x="21" y="18"/>
+<path d="M12.262,24.475c-1.676,0.432-3.574-0.029-4.943-1.393c-1.368-1.359-1.839-3.256-1.41-4.928L12.262,24.475z"/>
+<path d="M14,23c0-1.467,0.359-2.85,0.985-4.074L5.954,9.943c-1.916-0.683-2.642-0.19-3.519,0.688L1,12.067l13.311,13.239  C14.115,24.568,14,23.799,14,23z"/>
+<path d="M23,14c1.723,0,3.328,0.495,4.697,1.338c0.115-0.205,0.221-0.418,0.298-0.65c0.314-0.936,0.326-1.95,0.152-2.916  c0,0-0.413-2.225-2.375-4.551l0.066-0.066c0.778-0.778,0.775-2.048-0.004-2.826C25.055,3.553,23.779,3.555,23,4.332L22.943,4.39  c-2.385-2.043-4.697-2.466-4.697-2.466c-0.968-0.171-1.985-0.156-2.924,0.16c-1.508,0.507-2.375,1.876-3.349,3.055  c-0.616,0.747-1.2,1.535-1.847,2.256C9.37,8.238,8.64,8.787,7.99,9.147l8.118,8.075C17.761,15.255,20.235,14,23,14z"/>
+<path d="M23,16c-3.865,0-7,3.135-7,7c0,3.867,3.135,7,7,7s7-3.133,7-7C30,19.135,26.865,16,23,16z M24,24v4h-2v-4h-4v-2h4v-4h2v4h4  v2H24z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_snooze.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_snooze.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<path d="M22.21,3.211l0.707-0.707c0.779-0.777,2.054-0.777,2.83,0s0.776,2.051,0,2.828l-0.707,0.707-2.83-2.828z"/>
+<path d="M18.9,29v-1.805l6.233-9.879h-5.823v-2.02h9.551v1.771l-6.271,9.914h6.41v2.02h-10.1z"/>
+<path d="M9.701,21.1l-4.442-4.44c-0.431,1.676,0.036,3.572,1.399,4.938,0.865,0.863,1.943,1.365,3.043,1.508v-2.006z"/>
+<path d="M24.34,3.918c-3.892-3.891-10.25-3.891-14.14,0l-4.25,4.242c-1.913-0.685-2.637-0.191-3.514,0.686l-1.436,1.434,8.729,8.729h7.58v-5.709h9.664c0.77-3.26-0.1-6.849-2.63-9.382z"/>
+<path d="M11.46,29v-1.053l3.637-5.762h-3.398v-1.18h5.571v1.031l-3.657,5.783h3.739v1.18h-5.887z"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alpha_mode.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alpha_mode.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alpha_mode.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M8.898,13h2.273l-3.217-11.65h-2.531l-3.359,11.65h1.953l0.688-2.563h3.523l0.671,2.56zm-3.89-3.875l1.469-5.789,1.43,5.789h-2.899z"/>
-<path d="M18.96,12.18c0.651-0.547,0.977-1.367,0.977-2.461,0-1.567-0.742-2.521-2.227-2.859,1.292-0.458,1.938-1.354,1.938-2.688,0-0.938-0.278-1.642-0.836-2.113s-1.394-0.707-2.508-0.707h-3.891v11.65h3.617c1.3,0,2.28-0.27,2.93-0.82zm-4.4-9.516h1.281c0.542,0,0.949,0.144,1.223,0.43s0.41,0.714,0.41,1.281c0,0.667-0.149,1.153-0.449,1.461s-0.77,0.461-1.41,0.461h-1.055v-3.633zm0,9.026v-4.081h1.164c0.683,0,1.184,0.164,1.504,0.492s0.48,0.836,0.48,1.523c0,0.734-0.155,1.262-0.465,1.582s-0.812,0.48-1.504,0.48h-1.177z"/>
-<path d="M25.95,2.57c0.484,0,1.034,0.091,1.648,0.273v-1.366c-0.62-0.167-1.237-0.25-1.852-0.25-1.505,0-2.634,0.485-3.387,1.457s-1.129,2.426-1.129,4.363c0,2.161,0.374,3.715,1.121,4.66s1.863,1.418,3.348,1.418c0.646,0,1.278-0.083,1.898-0.25v-1.328c-0.558,0.156-1.083,0.234-1.578,0.234-0.849,0-1.485-0.372-1.91-1.117s-0.637-1.972-0.637-3.68c0-1.469,0.206-2.571,0.617-3.309s1.03-1.101,1.86-1.101z"/>
-<polygon points="17,18,21,18,21,22.93,12,22.93,12,18.93,5,23.97,12,29,12,25.93,24,25.93,24,16,17,16"/>
+</g>
+<path d="M8.836,13h2.273L7.891,1.352H5.359L2,13h1.953l0.688-2.563h3.523L8.836,13z M4.945,9.125l1.469-5.789l1.43,5.789H4.945z"/>
+<path d="M18.898,12.18c0.651-0.547,0.977-1.367,0.977-2.461c0-1.567-0.742-2.521-2.227-2.859c1.292-0.458,1.938-1.354,1.938-2.688  c0-0.938-0.278-1.642-0.836-2.113s-1.394-0.707-2.508-0.707h-3.891V13h3.617C17.271,13,18.247,12.727,18.898,12.18z M14.5,2.664  h1.281c0.542,0,0.949,0.144,1.223,0.43s0.41,0.714,0.41,1.281c0,0.667-0.149,1.153-0.449,1.461s-0.77,0.461-1.41,0.461H14.5V2.664z   M14.5,11.688V7.609h1.164c0.683,0,1.184,0.164,1.504,0.492s0.48,0.836,0.48,1.523c0,0.734-0.155,1.262-0.465,1.582  s-0.812,0.48-1.504,0.48H14.5z"/>
+<path d="M25.891,2.57c0.484,0,1.034,0.091,1.648,0.273V1.477c-0.62-0.167-1.237-0.25-1.852-0.25c-1.505,0-2.634,0.485-3.387,1.457  s-1.129,2.426-1.129,4.363c0,2.161,0.374,3.715,1.121,4.66s1.863,1.418,3.348,1.418c0.646,0,1.278-0.083,1.898-0.25v-1.328  c-0.558,0.156-1.083,0.234-1.578,0.234c-0.849,0-1.485-0.372-1.91-1.117s-0.637-1.972-0.637-3.68c0-1.469,0.206-2.571,0.617-3.309  S25.063,2.57,25.891,2.57z"/>
+<path d="M19.5,15H18c-0.828,0-1.5,0.672-1.5,1.5S17.172,18,18,18h1.5c1.381,0,2.5,1.119,2.5,2.5S20.881,23,19.5,23H18h-5v-2  c0-0.347-0.18-0.668-0.475-0.851C12.365,20.051,12.183,20,12,20c-0.152,0-0.307,0.035-0.447,0.105l-6,3C5.214,23.275,5,23.621,5,24  s0.214,0.725,0.553,0.895l6,3C11.693,27.965,11.848,28,12,28c0.183,0,0.365-0.051,0.525-0.149C12.82,27.668,13,27.347,13,27v-1h6.5  c3.033,0,5.5-2.467,5.5-5.5S22.533,15,19.5,15z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_app_exit.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_app_exit.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_app_exit.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<rect fill="none" height="30" width="30"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g>
 <rect fill="none" height="30" width="30"/>
-<polygon points="12,6.75,12,3,3,9.75,12,16.5,12,10.5,22.5,10.5,22.5,20.25,17.25,20.25,17.25,24,26.25,24,26.25,6.75"/>
+</g>
+<path d="M19,8h-9V5c0-0.389-0.225-0.74-0.576-0.906C9.289,4.031,9.145,4,9,4C8.771,4,8.543,4.079,8.359,4.231l-6,5.001  C2.132,9.422,2,9.703,2,10s0.132,0.578,0.359,0.768l6,5C8.543,15.921,8.771,16,9,16c0.145,0,0.289-0.031,0.424-0.094  C9.775,15.741,10,15.389,10,15v-3h9c2.757,0,5,2.243,5,5s-2.243,5-5,5h-1c-1.104,0-2,0.896-2,2s0.896,2,2,2h1c4.963,0,9-4.037,9-9  S23.963,8,19,8z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_all.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_all.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_all.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<path d="M16,3v11h11V3H16z M24,11h-5V6h5V11z"/>
-<path d="M16,27h11V16H16V27z M19,19h5v5h-5V19z"/>
-<rect height="12" width="12" x="2" y="2"/>
-<path d="M3,27h11V16H3V27z M6,19h5v5H6V19z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-2 -2 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M14,1v11h11V1H14z M22,9h-5V4h5V9z"/>
+<path d="M14,25h11V14H14V25z M17,17h5v5h-5V17z"/>
+<path d="M1,25h11V14H1V25z M4,17h5v5H4V17z"/>
+<path d="M12,10c0,1.104-0.896,2-2,2H2c-1.104,0-2-0.896-2-2V2c0-1.104,0.896-2,2-2h8c1.104,0,2,0.896,2,2V10z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_collections.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_collections.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_collections.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<polygon points="5.999,1 5.999,4 26,4 26,24 29,24 29,1 "/>
-<path d="M1,29h23V6H1V29z M4,9h17v17H4V9z"/>
-<rect height="6" width="6" x="6" y="11"/>
-<path d="M13,17h6v-6h-6V17z M15,13h2v2h-2V13z"/>
-<path d="M6,24h6v-6H6V24z M8,20h2v2H8V20z"/>
-<path d="M13,24h6v-6h-6V24z M15,20h2v2h-2V20z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-1 -1 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect height="4" width="4" x="14" y="19"/>
+<rect height="4" width="4" x="5" y="19"/>
+<path d="M21,5H2C0.895,5,0,5.896,0,7v19c0,1.104,0.895,2,2,2h19c1.104,0,2-0.896,2-2V7C23,5.896,22.104,5,21,5z M11,25H3v-8h8V25z   M11,16H3V8h8V16z M20,25h-8v-8h8V25z M20,16h-8V8h8V16z"/>
+<rect height="4" width="4" x="14" y="10"/>
+<path d="M26,0H7C5.895,0,5,0.896,5,2v1h20v17v3h1c1.104,0,2-0.896,2-2V2C28,0.896,27.104,0,26,0z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_down.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_down.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_down.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="2,5 15,27 28,5 "/>
+<path d="M27,7c0-0.334-0.084-0.668-0.25-0.97C26.396,5.395,25.727,5,25,5H5C4.273,5,3.604,5.395,3.25,6.03C3.084,6.332,3,6.666,3,7  c0,0.369,0.102,0.736,0.305,1.061l9.999,16C13.67,24.645,14.311,25,15,25s1.33-0.355,1.696-0.939l9.999-16  C26.898,7.736,27,7.369,27,7L27,7z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_left.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_left.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_left.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g>
 <rect fill="none" height="30" width="30"/>
-<polygon points="25,28 3,15 25,2 "/>
+</g>
+<path d="M23,27c0.334,0,0.668-0.084,0.97-0.25C24.605,26.396,25,25.727,25,25V5c0-0.727-0.395-1.396-1.03-1.75  C23.668,3.084,23.334,3,23,3c-0.369,0-0.736,0.102-1.061,0.305l-16,9.999C5.355,13.67,5,14.311,5,15s0.355,1.33,0.939,1.696  l16,9.999C22.264,26.898,22.631,27,23,27L23,27z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_right.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_right.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_right.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g>
 <rect fill="none" height="30" width="30"/>
-<polygon points="5,2 27,15 5,28 "/>
+</g>
+<path d="M7,27c-0.334,0-0.668-0.084-0.97-0.25C5.395,26.396,5,25.727,5,25V5c0-0.727,0.395-1.396,1.03-1.75C6.332,3.084,6.666,3,7,3  c0.369,0,0.736,0.102,1.061,0.305l16,9.999C24.645,13.67,25,14.311,25,15s-0.355,1.33-0.939,1.696l-16,9.999  C7.736,26.898,7.369,27,7,27L7,27z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_up.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_up.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_up.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="2,25 15,3 28,25 "/>
+<path d="M27,23c0,0.334-0.084,0.668-0.25,0.97C26.396,24.605,25.727,25,25,25H5c-0.727,0-1.396-0.395-1.75-1.03  C3.084,23.668,3,23.334,3,23c0-0.369,0.102-0.736,0.305-1.061l9.999-16C13.67,5.355,14.311,5,15,5s1.33,0.355,1.696,0.939l9.999,16  C26.898,22.264,27,22.631,27,23L27,23z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_artists.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_artists.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_artists.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M8.648,14.904c0.002,0.148,0.014,0.419,0.004,0.566c-0.007,0.102-0.043,0.209-0.08,0.317h5.857l0.001,0.001  c-0.037-0.108-0.073-0.217-0.08-0.318c-0.011-0.157,0-0.437,0.003-0.596c1.086-0.732,2.027-1.654,2.6-2.776  c1.061-2.08,0.672-7.392,0.672-7.392C17.625,2.538,14.383,0,12.189,0h-1.391C8.605,0,5.375,2.538,5.375,4.707  c0,0-0.332,5.294,0.658,7.392C6.577,13.243,7.536,14.175,8.648,14.904z"/>
-<path d="M21,22.021v-0.839c-1.642-1.041-4.826-2.992-6.097-4.591L11.5,24.286l-3.401-7.694C6.401,18.725,1.294,21.482,1,21.87V28  h15.111C16.038,27.677,16,27.343,16,27C16,24.396,18.2,22.251,21,22.021z"/>
-<path d="M23,15v9.3c-0.456-0.187-0.961-0.3-1.5-0.3c-1.934,0-3.5,1.343-3.5,3c0,1.656,1.566,3,3.5,3s3.5-1.344,3.5-3v-7.333L29,21  v-4L23,15z"/>
+<path d="M21.632,22.847v-2.501c-0.97-1.055-2.325-1.891-4.233-2.078c-1.035,0-3-0.492-3-2.359V15.48  c0-0.188,0.093-0.365,0.245-0.479C16.652,13.566,18,10.619,18,7.66C18,3.434,15.309,0,12,0S6,3.434,6,7.66  c0,2.959,1.348,5.906,3.352,7.342c0.157,0.113,0.245,0.291,0.245,0.479v0.428c0,1.695-1.636,2.33-2.999,2.359  C0.673,18.85,0.024,25.664,0,26h17.273C17.896,24.338,19.572,23.08,21.632,22.847z"/>
+<path d="M29.547,16.167l-5.211-1.153C24.295,15.005,24.252,15,24.211,15c-0.131,0-0.259,0.044-0.363,0.126  c-0.137,0.11-0.216,0.276-0.216,0.451v0.576v2.309v6.552c-0.399-0.132-0.841-0.206-1.303-0.206c-1.839,0-3.329,1.163-3.329,2.596  C19,28.837,20.49,30,22.329,30s3.618-1.163,3.618-2.597c0-0.077,0-5.665,0-7.966l3.348,0.741c0.043,0.009,0.084,0.014,0.126,0.014  c0,0,0.259-0.044,0.362-0.127C29.92,19.956,30,19.791,30,19.615V16.73C30,16.46,29.812,16.227,29.547,16.167z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_natural.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_natural.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_natural.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M2,3v24h26v-24h-26zm23,21h-20v-18h20v18z"/>
+<path d="M25,6v18H5V6H25 M26,3H4C2.896,3,2,3.896,2,5v20c0,1.104,0.896,2,2,2h22c1.104,0,2-0.896,2-2V5C28,3.896,27.104,3,26,3L26,3  z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_stretched.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_stretched.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_stretched.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M2,3v24h26v-24h-26zm23,21h-20v-18h20v18z"/>
-<path d="M19,12h-8v6h8v-6zm-2,4h-4v-2h4v2z"/>
-<polygon points="15,7,12,10,18,10"/>
-<polygon points="15,23,18,20,12,20"/>
-<polygon points="21,12,21,18,24,15"/>
-<polygon points="9,12,6,15,9,18"/>
+<path d="M25,6v18H5V6H25 M26,3H4C2.896,3,2,3.896,2,5v20c0,1.104,0.896,2,2,2h22c1.104,0,2-0.896,2-2V5C28,3.896,27.104,3,26,3L26,3  z"/>
+<path d="M19,12h-8v6h8V12z M17,16h-4v-2h4V16z"/>
+<polygon points="15,7 12,10 18,10 "/>
+<polygon points="15,23 18,20 12,20 "/>
+<polygon points="21,12 21,18 24,15 "/>
+<polygon points="9,12 6,15 9,18 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_zoom.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_zoom.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_zoom.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,11 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M25,22.28v1.72h-4.914c-0.518,0.064-1.04,0.109-1.57,0.109-0.535,0-1.061-0.044-1.582-0.109h-4.455l-3,3h18.52v-7.275c-0.213,0.248-0.428,0.496-0.662,0.729-0.71,0.72-1.5,1.32-2.34,1.83z"/>
-<path d="M5,6h2.348c0.539-1.081,1.244-2.093,2.107-3h-7.455v18.75l3-3.001v-12.75z"/>
-<rect height="2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -15.0422 48.8201)" width="4.999" x="0.09" y="26.52"/>
-<path d="M10.72,21.52l1.499-1.498c4.112,3.081,9.965,2.763,13.7-0.977,4.102-4.101,4.102-10.75,0-14.85-4.1-4.102-10.75-4.102-14.85,0-3.739,3.738-4.058,9.591-0.977,13.7l-1.49,1.5-0.707-0.707-4.949,4.95,3.535,3.535,4.95-4.95-0.71-0.69zm2.48-15.21c2.924-2.925,7.682-2.924,10.6,0s2.925,7.682,0,10.6c-2.924,2.925-7.683,2.924-10.6,0-2.93-2.91-2.93-7.674,0-10.6z"/>
-<polygon points="17,16,20,16,20,13,23,13,23,10,20,10,20,7,17,7,17,10,14,10,14,13,17,13"/>
+<path d="M22.5,10H20V7.5C20,6.672,19.328,6,18.5,6S17,6.672,17,7.5V10h-2.5c-0.828,0-1.5,0.672-1.5,1.5c0,0.828,0.672,1.5,1.5,1.5  H17v2.5c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5V13h2.5c0.828,0,1.5-0.672,1.5-1.5C24,10.672,23.328,10,22.5,10z"/>
+<path d="M11.281,18.719c4.1,4.102,10.748,4.102,14.848,0c4.102-4.1,4.102-10.748,0-14.848c-4.1-4.102-10.748-4.102-14.85-0.002  C7.18,7.971,7.18,14.619,11.281,18.719z M24.008,5.992c2.93,2.93,2.93,7.678,0,10.605c-2.928,2.93-7.678,2.93-10.605,0  C10.473,13.67,10.473,8.92,13.4,5.99C16.33,3.063,21.078,3.063,24.008,5.992z"/>
+<path d="M1.381,27.205l1.414,1.414c0.781,0.781,2.047,0.781,2.828,0l-4.242-4.242C0.6,25.158,0.6,26.424,1.381,27.205z"/>
+<path d="M26,21.432V26H11.07l-2.619,2.619C8.281,28.791,8.082,28.906,7.875,29H27c1.105,0,2-0.896,2-2v-8.623  c-0.429,0.621-0.911,1.211-1.457,1.756C27.063,20.615,26.541,21.039,26,21.432z"/>
+<path d="M4,18.93V4h4.555c0.389-0.541,0.824-1.059,1.311-1.545C10.41,1.91,11,1.429,11.621,1H3C1.896,1,1,1.896,1,3v19.129  c0.096-0.211,0.214-0.412,0.381-0.58L4,18.93z"/>
+<path d="M29,4.214V3c0-1.104-0.895-2-2-2h-1.213c0.621,0.429,1.211,0.912,1.757,1.457C28.09,3.002,28.571,3.593,29,4.214z"/>
+<path d="M10.17,21.951l1.541-1.541c-0.393-0.303-0.777-0.623-1.139-0.982c-0.359-0.361-0.68-0.746-0.982-1.139l-1.541,1.543  c-0.766-0.451-1.768-0.355-2.426,0.303l-2.828,2.828l4.242,4.242l2.828-2.828C10.524,23.719,10.622,22.719,10.17,21.951z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_attach.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_attach.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_attach.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,5 +4,5 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M11,1v19.5c0,2.205,1.794,4,4,4c2.205,0,4-1.795,4-4V8h-3v12.5c0,0.551-0.449,1-1,1s-1-0.449-1-1V4h7v18.5  c0,2.481-2.019,4.5-4.5,4.5h-3C11.019,27,9,24.981,9,22.5V8H6v14.5c0,4.136,3.364,7.5,7.5,7.5h3c4.136,0,7.5-3.364,7.5-7.5V1H11z"/>
+<path d="M22.5,1h-10C11.672,1,11,1.672,11,2.5v18c0,2.206,1.795,4,4,4s4-1.794,4-4v-11C19,8.672,18.328,8,17.5,8S16,8.672,16,9.5v11  c0,0.552-0.449,1-1,1s-1-0.448-1-1V4h7v18.5c0,2.481-2.019,4.5-4.5,4.5h-3C11.019,27,9,24.981,9,22.5v-13C9,8.672,8.328,8,7.5,8  S6,8.672,6,9.5v13c0,4.136,3.364,7.5,7.5,7.5h3c4.136,0,7.5-3.364,7.5-7.5v-20C24,1.672,23.328,1,22.5,1z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_audio.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_audio.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_audio.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M10,3v17.44c-0.751-0.28-1.599-0.44-2.5-0.44-3.037,0-5.5,1.79-5.5,4s2.463,4,5.5,4,5.5-1.791,5.5-4v-15h11v9.44c-0.75-0.28-1.6-0.44-2.5-0.44-3.037,0-5.5,1.791-5.5,4s2.463,4,5.5,4,5.5-1.791,5.5-4v-19h-17z"/>
+<path d="M25,3H12c-1.104,0-2,0.896-2,2v15.439C9.249,20.16,8.401,20,7.5,20C4.463,20,2,21.791,2,24s2.463,4,5.5,4s5.5-1.791,5.5-4V9  h11v9.439C23.249,18.16,22.401,18,21.5,18c-3.037,0-5.5,1.791-5.5,4s2.463,4,5.5,4s5.5-1.791,5.5-4V5C27,3.896,26.104,3,25,3z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_autoflash.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_autoflash.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_autoflash.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,6 +4,6 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M11.25,29l-1.008-3.844h-5.279l-1.031,3.84h-2.93l5.039-17.47h3.797l4.824,17.47h-3.406zm-1.484-5.81l-2.145-8.684-2.203,8.684h4.348z"/>
-<polygon points="24.13,21,28,9.999,19.36,10,22.54,1,17.24,1,13,13,21.64,13,18.83,21,14,21,21.5,29,29,21"/>
+<path d="M6.163,12L1,29h3.002l1.072-4h5.376l1.056,4H15l-4.947-17H6.163z M5.61,23l2.173-8.104L9.922,23H5.61z"/>
+<path d="M27,21h-2.869L28,10h-8.639l3.179-9h-5.302L13,13h8.639l-2.811,8H16c-0.396,0-0.756,0.234-0.916,0.598  c-0.159,0.363-0.089,0.785,0.179,1.078l5.5,6C20.952,28.883,21.22,29,21.5,29s0.548-0.117,0.737-0.324l5.5-6  c0.268-0.293,0.338-0.715,0.179-1.078C27.756,21.234,27.396,21,27,21z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_automatic.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_automatic.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_automatic.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,6 +4,6 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M17.28,20.82h2.273l-3.21-11.64h-2.532l-3.359,11.65h1.953l0.688-2.563h3.524l0.67,2.55zm-3.89-3.87l1.469-5.789,1.431,5.789h-2.899z"/>
-<path d="M1,3v24h28v-24h-28zm25,21h-22v-18h22v18z"/>
+<polygon points="13.889,16.409 15.912,16.409 14.914,12.368 "/>
+<path d="M27,4H3C1.896,4,1,4.896,1,6v18c0,1.104,0.896,2,2,2h24c1.104,0,2-0.896,2-2V6C29,4.896,28.104,4,27,4z M16.882,20.2  l-0.588-2.242h-2.775L12.917,20.2h-2.128l3.055-10.593h2.518L19.288,20.2H16.882z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_back.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_back.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_back.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="11,8 11,3 1,10 11,17 11,12 25,12 25,22 17,22 17,26 29,26 29,8 "/>
+<path d="M19,8h-9V5c0-0.389-0.225-0.74-0.576-0.906C9.289,4.031,9.145,4,9,4C8.771,4,8.543,4.079,8.359,4.231l-6,5.001  C2.132,9.422,2,9.703,2,10s0.132,0.578,0.359,0.768l6,5C8.543,15.921,8.771,16,9,16c0.145,0,0.289-0.031,0.424-0.094  C9.775,15.741,10,15.389,10,15v-3h9c2.757,0,5,2.243,5,5s-2.243,5-5,5h-1c-1.104,0-2,0.896-2,2s0.896,2,2,2h1c4.963,0,9-4.037,9-9  S23.963,8,19,8z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace1.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace1.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace1.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<rect fill="none" height="30" width="30"/>
-<polygon points="28,13,10,13,10,9,1,15,10,21,10,17,28,17"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-2 -9 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M25,4H9V1c0-0.375-0.209-0.718-0.542-0.889C8.313,0.037,8.156,0,8,0C7.795,0,7.592,0.063,7.419,0.186l-7,5.001  C0.156,5.374,0,5.678,0,6c0,0.323,0.156,0.626,0.419,0.814l7,5C7.592,11.938,7.795,12,8,12c0.156,0,0.313-0.037,0.457-0.111  C8.791,11.718,9,11.375,9,11V8h16c1.104,0,2-0.896,2-2S26.104,4,25,4z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M12,5l-12,10,12,10h18v-20h-18zm15,17h-13.91l-8.4-7,8.4-7h13.91v14z"/>
-<polygon points="15.81,20.31,19.34,16.78,22.88,20.31,25,18.19,21.46,14.66,25,11.12,22.88,9,19.34,12.54,15.81,9,13.69,11.12,17.22,14.66,13.69,18.19"/>
+</g>
+<path d="M28,5H12c-0.209,0-0.406,0.041-0.596,0.101c-0.032,0.01-0.064,0.018-0.096,0.029c-0.188,0.069-0.359,0.165-0.515,0.284  C10.78,5.424,0.75,13.438,0.75,13.438C0.276,13.818,0,14.393,0,15s0.276,1.182,0.75,1.562c0,0,10.03,8.015,10.044,8.024  c0.155,0.119,0.327,0.215,0.515,0.284c0.031,0.012,0.063,0.02,0.096,0.029C11.594,24.959,11.791,25,12,25h16c1.104,0,2-0.896,2-2V7  C30,5.896,29.104,5,28,5z M24.949,17.828c0.586,0.586,0.586,1.536,0,2.122c-0.585,0.585-1.535,0.585-2.121,0L20,17.122l-2.828,2.828  c-0.586,0.585-1.536,0.585-2.121,0c-0.586-0.586-0.586-1.536,0-2.122L17.879,15l-2.828-2.828c-0.586-0.586-0.586-1.536,0-2.121  c0.585-0.586,1.535-0.586,2.121,0L20,12.879l2.828-2.828c0.586-0.586,1.536-0.586,2.121,0c0.586,0.585,0.586,1.535,0,2.121  L22.121,15L24.949,17.828z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.133"/>
-<path d="M22,9.767l-8.541-8.55v9.767l-3.671-3.66-1.677,1.681s3.792,3.794,5.344,5.342v0.612c-1.552,1.544-5.344,5.341-5.344,5.341l1.676,1.676,3.668-3.659v9.767l8.542-8.549s-3.717-3.717-4.883-4.88c1.16-1.18,4.88-4.883,4.88-4.883zm-3.36,9.763c-0.606,0.604-1.711,1.713-2.755,2.754v-5.502c1.05,1.05,2.2,2.19,2.76,2.75zm-2.74-7.02v-5.496c1.036,1.043,2.141,2.147,2.747,2.753-0.57,0.553-1.72,1.703-2.75,2.743z"/>
-<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.133"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<path d="M14,2v10.282L9.563,7.986L8,9.549l5.543,5.336L8,20.286l1.563,1.562L14,17.554V28  l8-8l-5.539-5.115L22,10L14,2z M18.477,20.025l-2.473,2.473v-4.944L18.477,20.025z M16.004,12.282V7.336l2.473,2.473L16.004,12.282z  " fill-rule="evenodd"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_headset.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_headset.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_headset.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,8 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M1,17.5C1,19.985,2.791,22,5,22v-9C2.791,13,1,15.015,1,17.5z"/>
-<path d="M29,17.5c0,2.485-1.791,4.5-4,4.5v-9C27.209,13,29,15.015,29,17.5z"/>
-<polygon points="24,21.173 24,16.829 22,18.829 22,19.173 "/>
-<path d="M15,5c3.379,0,6.206,2.406,6.858,5.595L24,13.094V12c0-4.971-4.029-9-9-9s-9,4.029-9,9v11h2V12C8,8.141,11.141,5,15,5z"/>
-<path d="M17,8v8.778l-3.736-3.666L12,14.446l5,4.555l-5,4.612l1.264,1.332l3.743-3.486  L17,30l6-6.999l-4-4l4-4L17,8z M20.473,23.001l-1.998,2.5V21.28L20.473,23.001z M18.475,16.779v-4.223l1.998,2.444L18.475,16.779z" fill-rule="evenodd"/>
+<path d="M0,17.5C0,19.985,1.791,22,4,22v-9C1.791,13,0,15.015,0,17.5z"/>
+<path d="M26,13v9c2.209,0,4-2.015,4-4.5S28.209,13,26,13z"/>
+<path d="M15,2C9.486,2,5,6.486,5,12v10c0,0.553,0.447,1,1,1s1-0.447,1-1V12c0-4.411,3.589-8,8-8s8,3.589,8,8v10c0,0.553,0.447,1,1,1  s1-0.447,1-1V12C25,6.486,20.514,2,15,2z"/>
+<path d="M14,6v8.778l-3.736-3.666L9,12.446l5,4.555l-5,4.612l1.264,1.332l3.743-3.486L14,28l6-6.999l-4-4l4-4L14,6z M17.473,21.001  l-1.998,2.5V19.28L17.473,21.001z M15.475,14.779v-4.223l1.998,2.444L15.475,14.779z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="31px" version="1.1" viewBox="0 0 31 31" width="31px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M15.87,7.11c1.071,1.078,2.212,2.219,2.839,2.845c-0.524,0.52-1.54,1.536-2.521,2.519l1.735,1.73  c1.587-1.591,4.252-4.249,4.252-4.249L13.348,1.12v8.52l2.522,2.516V7.11z"/>
-<path d="M15.862,22.891v-4.349l-2.874-2.867c-1.762,1.756-5.163,5.162-5.163,5.162l1.732,1.731l3.79-3.781V28.88l6.427-6.434  l-1.735-1.731C17.417,21.337,16.628,22.127,15.862,22.891z"/>
-<rect height="1.867" transform="matrix(-0.7079 -0.7063 0.7063 -0.7079 15.5243 37.4201)" width="35.827" x="-2.414" y="14.566"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<polygon fill-rule="evenodd" points="16.004,11.854 16.004,7.336 18.477,9.809 16.219,12.068 17.829,13.679   22,10 14,2 14,9.85 "/>
+<polygon fill-rule="evenodd" points="17.178,21.324 16.004,22.498 16.004,20.15 14,18.146 14,28 18.927,23.074   "/>
+<polygon fill-rule="evenodd" points="12.123,16.269 8,20.286 9.563,21.848 13.699,17.846 "/>
+<path d="M27.693,26.372c0.389,0.389,0.41,1.005,0.049,1.368c-0.363,0.363-0.979,0.343-1.367-0.046L2.307,3.625  C1.918,3.236,1.896,2.621,2.26,2.258c0.363-0.363,0.979-0.341,1.367,0.048L27.693,26.372z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bold.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bold.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bold.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="30" width="30"/>
-<path d="M15.08,27c2.705,0,4.755-0.568,6.148-1.706,1.396-1.138,2.093-2.823,2.093-5.055,0-1.696-0.392-3.015-1.175-3.96-0.783-0.944-1.947-1.589-3.493-1.931,2.792-0.967,4.186-2.812,4.186-5.538,0-1.48-0.336-2.664-1.005-3.549-0.672-0.885-1.542-1.484-2.609-1.795-1.07-0.312-2.45-0.468-4.15-0.468h-8.402v24h8.402zm-2.96-13.97v-6.923h1.981c1.319,0,2.199,0.286,2.639,0.861,0.44,0.574,0.66,1.371,0.66,2.391,0,1.179-0.246,2.087-0.74,2.72-0.493,0.633-1.502,0.949-3.026,0.949h-1.513zm0,10.86v-7.838h1.578c0.924,0,1.661,0.105,2.214,0.321,0.552,0.215,0.998,0.598,1.337,1.15,0.337,0.552,0.507,1.372,0.507,2.454,0,1.321-0.264,2.303-0.79,2.947-0.523,0.644-1.594,0.965-3.203,0.965h-1.653z"/>
+<path d="M15.08,27c2.705,0,4.756-0.568,6.148-1.706c1.396-1.138,2.092-2.823,2.092-5.055c0-1.696-0.391-3.015-1.174-3.96  c-0.783-0.944-1.947-1.59-3.494-1.932c2.793-0.967,4.188-2.812,4.188-5.537c0-1.48-0.336-2.664-1.006-3.55  c-0.672-0.885-1.541-1.483-2.609-1.795C18.158,3.156,16.775,3,15.08,3H6.678v24H15.08z M12.117,13.027v-6.92h1.98  c1.32,0,2.199,0.285,2.639,0.86c0.441,0.574,0.66,1.371,0.66,2.392c0,1.179-0.246,2.086-0.738,2.72  c-0.494,0.633-1.504,0.948-3.027,0.948H12.117z M12.117,23.893v-7.838h1.578c0.924,0,1.66,0.105,2.215,0.321  c0.551,0.215,0.998,0.599,1.336,1.149c0.338,0.553,0.508,1.373,0.508,2.455c0,1.32-0.264,2.303-0.791,2.946  c-0.523,0.644-1.594,0.966-3.203,0.966H12.117L12.117,23.893z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_add_new.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_add_new.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_add_new.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,7 +4,6 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M13.914,18.463c0.347-0.736,0.777-1.424,1.294-2.041l-2.747-2.537L18,9l-8-8v10.282L5.563,6.986L4,8.549l5.543,5.336  L4,19.286l1.563,1.562L10,16.554V27l3.113-3.113C13.046,23.433,13,22.973,13,22.5c0-0.79,0.107-1.554,0.29-2.288l-1.286,1.286  v-4.944L13.914,18.463z M12.004,6.336l2.473,2.473l-2.473,2.474V6.336z"/>
-<path d="M22.5,15c-4.136,0-7.5,3.364-7.5,7.5s3.364,7.5,7.5,7.5s7.5-3.364,7.5-7.5S26.636,15,22.5,15z M22.5,28  c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5s5.5,2.468,5.5,5.5S25.533,28,22.5,28z"/>
-<polygon points="24,21 24,18 21,18 21,21 18,21 18,24 21,24 21,27 24,27 24,24 27,24 27,21 "/>
+<path d="M12.461,13.885L18,9l-8-8v10.282L5.563,6.986L4,8.549l5.543,5.336L4,19.286  l1.563,1.562L10,16.554V27l4-4c0-2.19,0.788-4.198,2.094-5.761L12.461,13.885z M12.004,6.336l2.473,2.473l-2.473,2.474V6.336z   M12.004,21.498v-4.944l2.473,2.472L12.004,21.498z" fill-rule="evenodd"/>
+<path d="M23,16c-3.866,0-7,3.134-7,7s3.134,7,7,7s7-3.134,7-7S26.866,16,23,16z M24,24v4h-2v-4h-4v-2h4v-4h2v4h4v2H24z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_pair.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_pair.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_pair.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,6 +4,6 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M7,0v10.28l-4.437-4.294-1.563,1.563,5.543,5.336-5.543,5.41,1.563,1.562,4.437-4.3v10.45l8-8-5.539-5.115,5.539-4.88-8-8zm4.48,18.02l-2.473,2.473v-4.944l2.473,2.47zm-2.476-7.74v-4.944l2.473,2.473-2.476,2.471z" fill-rule="evenodd"/>
-<path d="M20,4v10.28l-4.438-4.296-1.56,1.566,5.543,5.336-5.54,5.4,1.563,1.562,4.44-4.3v10.45l8-8-5.539-5.115,5.54-4.88-8-8zm4.48,18.02l-2.473,2.473v-4.944l2.47,2.47zm-2.48-7.74v-4.944l2.473,2.473-2.47,2.47z" fill-rule="evenodd"/>
+<path d="M7,0v10.282L2.563,5.986L1,7.549l5.543,5.336L1,18.286l1.563,1.562L7,15.554V26  l8-8l-5.539-5.115L15,8L7,0z M11.477,18.025l-2.473,2.473v-4.944L11.477,18.025z M9.004,10.282V5.336l2.473,2.473L9.004,10.282z" fill-rule="evenodd"/>
+<path d="M20,4v10.282l-4.438-4.296L14,11.549l5.543,5.336L14,22.286l1.563,1.562L20,19.554  V30l8-8l-5.539-5.115L28,12L20,4z M24.477,22.025l-2.473,2.473v-4.944L24.477,22.025z M22.004,14.282V9.336l2.473,2.473  L22.004,14.282z" fill-rule="evenodd"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_all.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_all.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_all.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,8 +4,9 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M12,24.028c1.14-1.123,2.367-2.026,3.658-2.688L17,20l-3.561-3.071L17,14l-5-5  v6.327l-2.996-2.645L8,13.645l3.563,3.284L8,20.253l1.004,0.961L12,18.57V24.028z M13.146,12.283l1.589,1.521l-1.589,1.522V12.283z   M13.146,18.57l1.589,1.521l-1.589,1.522V18.57z" fill-rule="evenodd"/>
-<path d="M10.428,28.235C9.914,27.583,9.889,26.7,10.3,26H5V8h15v12.065C20.332,20.035,20.665,20,21,20c0.673,0,1.339,0.083,2,0.203  V5H2v24h9.086C10.865,28.748,10.641,28.506,10.428,28.235z"/>
-<path d="M25,20.748c1.034,0.386,2.041,0.906,3,1.581V0H7v3h18V20.748z"/>
-<path d="M30,27c-2.454-3.123-5.586-5-9-5s-6.546,1.877-9,5h2.654  c0.695-0.709,1.521-1.386,2.463-1.921C17.047,25.376,17,25.682,17,26c0,2.21,1.792,4,4,4s4-1.79,4-4  c0-0.318-0.047-0.624-0.117-0.921c0.941,0.535,1.768,1.212,2.463,1.921H30z M21,28c-1.104,0-2-0.447-2-1s0.896-1,2-1s2,0.447,2,1  S22.104,28,21,28z" fill-rule="evenodd"/>
+<polygon fill-rule="evenodd" points="13.146,10.283 13.146,13.327 14.734,11.805 "/>
+<polygon fill-rule="evenodd" points="13.146,16.57 13.146,19.614 14.734,18.092 "/>
+<path d="M25,20.748c1.022,0.381,2.02,0.894,2.969,1.558C27.984,22.205,28,22.104,28,22V2  c0-1.1-0.9-2-2-2H10C8.9,0,8,0.9,8,2v1h17V20.748z" fill-rule="evenodd"/>
+<path d="M21,20c0.673,0,1.339,0.083,2,0.203V7c0-1.1-0.9-2-2-2H5C3.9,5,3,5.9,3,7v20  c0,1.1,0.9,2,2,2h6.086c-0.221-0.252-0.445-0.494-0.658-0.765c-0.57-0.725-0.57-1.746,0-2.471C13.348,22.047,17.104,20,21,20z   M9.004,19.214L8,18.253l3.563-3.324L8,11.645l1.004-0.962L12,13.327V7l5,5l-3.561,2.929L17,18l-5,5v-6.43L9.004,19.214z" fill-rule="evenodd"/>
+<path d="M30,27c-2.454-3.123-5.586-5-9-5s-6.546,1.877-9,5h2.654  c0.695-0.709,1.521-1.386,2.463-1.922C17.047,25.376,17,25.682,17,26c0,2.21,1.792,4,4,4s4-1.79,4-4  c0-0.318-0.047-0.624-0.117-0.922c0.941,0.536,1.768,1.213,2.463,1.922H30z M21,28c-1.104,0-2-0.447-2-1s0.896-1,2-1s2,0.447,2,1  S22.104,28,21,28z" fill-rule="evenodd"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_pair.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_pair.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_pair.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,6 +5,6 @@
 <rect fill="none" height="30" width="30"/>
 </g>
 <path d="M7,0v10.282L2.563,5.986L1,7.549l5.543,5.336L1,18.286l1.563,1.562L7,15.554V26  l8-8l-5.539-5.115L15,8L7,0z M11.477,18.025l-2.473,2.473v-4.944L11.477,18.025z M9.004,10.282V5.336l2.473,2.473L9.004,10.282z" fill-rule="evenodd"/>
-<path d="M16.262,21.057c1.367-0.612,2.792-0.959,4.243-1.024L21,19.554V20  c0.675,0,1.342,0.083,2.004,0.204v-0.65l0.811,0.811c1.595,0.411,3.129,1.183,4.563,2.259L29,22l-5.539-5.115L29,12l-8-8v10.282  l-4.438-4.296L15,11.549l5.543,5.336L16.262,21.057z M23.004,9.336l2.473,2.473l-2.473,2.474V9.336z" fill-rule="evenodd"/>
-<path d="M30,27c-2.454-3.123-5.586-5-9-5s-6.546,1.877-9,5h2.654  c0.695-0.709,1.522-1.386,2.463-1.921C17.047,25.376,17,25.682,17,26c0,2.21,1.792,4,4,4s4-1.79,4-4  c0-0.318-0.047-0.624-0.117-0.921c0.94,0.535,1.768,1.212,2.463,1.921H30z M21,28c-1.104,0-2-0.447-2-1s0.896-1,2-1s2,0.447,2,1  S22.104,28,21,28z" fill-rule="evenodd"/>
+<path d="M14.024,22.311c1.686-1.18,3.509-1.919,5.389-2.189L20,19.554v0.512  C20.332,20.035,20.665,20,21,20c0.336,0,0.67,0.035,1.004,0.066v-0.513l0.564,0.564c1.822,0.259,3.589,0.968,5.231,2.082L28,22  l-5.539-5.115L28,12l-8-8v10.282l-4.438-4.296L14,11.549l5.543,5.336L14,22.286L14.024,22.311z M22.004,9.336l2.473,2.473  l-2.473,2.474V9.336z" fill-rule="evenodd"/>
+<path d="M30,27c-2.453-3.123-5.586-5-9-5s-6.545,1.877-9,5h2.654  c0.695-0.709,1.522-1.385,2.463-1.921C17.047,25.376,17,25.682,17,26c0,2.21,1.793,4,4,4c2.209,0,4-1.79,4-4  c0-0.318-0.047-0.625-0.117-0.922c0.941,0.536,1.769,1.213,2.463,1.922H30z M21,28c-1.104,0-2-0.447-2-1s0.896-1,2-1  c1.105,0,2,0.447,2,1S22.105,28,21,28z" fill-rule="evenodd"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_unpair.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_unpair.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_unpair.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,8 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M15,8L7,0v10.282L2.563,5.986L1,7.549l5.543,5.336L1,18.286l1.563,1.562L7,15.554V26l6.489-6.489  c0.238-0.717,0.563-1.394,0.956-2.023l-4.984-4.603L15,8z M9.004,5.336l2.473,2.473l-2.473,2.474V5.336z M11.477,18.025  l-2.473,2.473v-4.944L11.477,18.025z"/>
-<path d="M22.004,9.336l2.473,2.473l-1.229,1.229c0.99,0.077,1.939,0.305,2.822,0.664L28,12l-8-8v9.345  c0.644-0.176,1.313-0.284,2.004-0.319V9.336z"/>
-<path d="M17.194,14.623c0.64-0.432,1.34-0.778,2.077-1.046l-3.709-3.591L14,11.549L17.194,14.623z"/>
-<path d="M22.5,15c-4.136,0-7.5,3.364-7.5,7.5s3.364,7.5,7.5,7.5s7.5-3.364,7.5-7.5S26.636,15,22.5,15z M22.5,28  c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5s5.5,2.468,5.5,5.5S25.533,28,22.5,28z"/>
-<polygon points="26.742,20.378 24.621,18.257 22.5,20.378 20.379,18.257 18.257,20.378 20.379,22.5 18.257,24.621 20.379,26.742   22.5,24.621 24.621,26.742 26.742,24.621 24.621,22.5 "/>
+<path d="M7,0v10.282L2.563,5.986L1,7.549l5.543,5.336L1,18.287l1.563,1.561L7,15.554V26  l8-8l-5.539-5.115L15,8L7,0z M11.477,18.025l-2.473,2.473v-4.944L11.477,18.025z M9.004,10.282V5.336l2.473,2.472L9.004,10.282z" fill-rule="evenodd"/>
+<path d="M22.004,14.064V9.336l2.473,2.472l-2.23,2.232c1.045-0.087,2.1,0.01,3.117,0.286  L28,12l-8-8v10.282l-4.438-4.296L14,11.549l4.072,3.92C19.274,14.682,20.625,14.217,22.004,14.064z" fill-rule="evenodd"/>
+<path d="M14.04,22.248L14,22.287l0.037,0.035C14.039,22.297,14.038,22.271,14.04,22.248z" fill-rule="evenodd"/>
+<path d="M27.949,18.051c-2.733-2.734-7.165-2.734-9.898,0c-2.734,2.734-2.734,7.166,0,9.898c2.733,2.734,7.165,2.734,9.898,0  C30.684,25.217,30.684,20.785,27.949,18.051z M27.242,25.828l-1.414,1.414L23,24.414l-2.828,2.828l-1.414-1.414L21.586,23  l-2.828-2.828l1.414-1.414L23,21.586l2.828-2.828l1.414,1.414L24.414,23L27.242,25.828z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bullet.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bullet.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bullet.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="2" width="17" x="9" y="4"/>
-<circle cx="5.5" cy="5" r="1.5"/>
-<rect height="2" width="17" x="9" y="9"/>
-<circle cx="5.5" cy="10" r="1.5"/>
-<rect height="2" width="17" x="9" y="14"/>
-<rect height="2" width="17" x="8.999" y="19"/>
-<rect height="2" width="17" x="8.999" y="24"/>
-<circle cx="5.5" cy="15" r="1.5"/>
-<circle cx="5.5" cy="20" r="1.5"/>
-<circle cx="5.5" cy="25" r="1.5"/>
+</g>
+<path d="M26,4.5C26,5.328,25.328,6,24.5,6h-14C9.672,6,9,5.328,9,4.5l0,0  C9,3.672,9.672,3,10.5,3h14C25.328,3,26,3.672,26,4.5L26,4.5z" fill-rule="evenodd"/>
+<circle cx="5.5" cy="4.5" fill-rule="evenodd" r="1.5"/>
+<path d="M26,9.5c0,0.828-0.672,1.5-1.5,1.5h-14C9.672,11,9,10.328,9,9.5l0,0  C9,8.672,9.672,8,10.5,8h14C25.328,8,26,8.672,26,9.5L26,9.5z" fill-rule="evenodd"/>
+<circle cx="5.5" cy="9.5" fill-rule="evenodd" r="1.5"/>
+<path d="M26,14.5c0,0.828-0.672,1.5-1.5,1.5h-14C9.672,16,9,15.328,9,14.5l0,0  c0-0.828,0.672-1.5,1.5-1.5h14C25.328,13,26,13.672,26,14.5L26,14.5z" fill-rule="evenodd"/>
+<circle cx="5.5" cy="14.5" fill-rule="evenodd" r="1.5"/>
+<path d="M26,19.5c0,0.828-0.672,1.5-1.5,1.5h-14C9.672,21,9,20.328,9,19.5l0,0  c0-0.828,0.672-1.5,1.5-1.5h14C25.328,18,26,18.672,26,19.5L26,19.5z" fill-rule="evenodd"/>
+<circle cx="5.5" cy="19.5" fill-rule="evenodd" r="1.5"/>
+<path d="M26,24.5c0,0.828-0.672,1.5-1.5,1.5h-14C9.672,26,9,25.328,9,24.5l0,0  c0-0.828,0.672-1.5,1.5-1.5h14C25.328,23,26,23.672,26,24.5L26,24.5z" fill-rule="evenodd"/>
+<circle cx="5.5" cy="24.5" fill-rule="evenodd" r="1.5"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M28.58,7.523l-7.359,4.248c-0.364,0.152-0.771,0.057-0.953-0.256l-1.277-2.142c-0.002,0.002-0.006,0.007-0.007,0.008-0.001-0.001,0-0.003-0.001-0.004-1.119,0.582-3.617,2.223-5.187,3.79-1.632,1.635-3.149,3.394-4.417,5.576,0,0-0.006,0.008-0.008,0.01,0.009,0.002,0.018,0.002,0.027,0.003l2.725,1.743c0.344,0.222,0.412,0.706,0.158,1.078l-4.794,7.05c-0.254,0.37-0.736,0.491-1.081,0.268,0,0-0.298-0.194-1.021-0.83h-0.003c-0.394-0.347-0.411-0.476-0.785-0.925-0.319-0.385-0.573-0.765-0.783-1.114-0.001-0.001-0.004,0-0.005-0.002-0.043-0.071-0.081-0.139-0.119-0.207-0.005-0.009-0.01-0.018-0.015-0.024-0.391-0.698-0.56-1.211-0.56-1.211-0.178-0.688-0.252-3.057,0.563-5.205,0.52-1.364,3.24-5.672,6.42-8.854,3.181-3.182,8.125-6.349,10.3-7.005,2.176-0.656,3.903-0.556,4.417-0.374,0,0,1.326,0.434,2.53,1.536,0.401,0.367,0.439,0.382,0.751,0.765,0.002,0.003,0,0.006,0.002,0.008-0.002-0.002-0.002-0.004-0.004-0.005,0.615,0.757,0.818,1.062,0.818,1.062,0.19,0.327,0.04,0.787-0.34,1.006z"/>
+</g>
+<path d="M27.578,6.524l-7.359,4.248c-0.364,0.153-0.771,0.057-0.953-0.255l-1.277-2.143c-0.002,0.002-0.006,0.008-0.007,0.008  s0-0.002-0.001-0.004c-1.119,0.582-3.617,2.223-5.187,3.792c-1.632,1.634-3.149,3.392-4.417,5.575c0,0-0.006,0.008-0.008,0.01  c0.009,0.002,0.018,0.002,0.027,0.002l2.725,1.744c0.344,0.221,0.412,0.705,0.158,1.078l-4.793,7.041  c-0.254,0.371-0.736,0.492-1.081,0.268c0,0-0.298-0.193-1.021-0.83c-0.001,0-0.002,0-0.003,0c-0.394-0.346-0.411-0.475-0.785-0.924  c-0.319-0.385-0.573-0.766-0.783-1.115c0,0-0.004,0-0.005-0.002c-0.043-0.07-0.081-0.139-0.119-0.207  c-0.005-0.008-0.01-0.018-0.015-0.023c-0.391-0.699-0.56-1.211-0.56-1.211c-0.178-0.688-0.252-3.057,0.563-5.205  c0.52-1.365,3.24-5.671,6.42-8.854c3.181-3.182,8.125-6.348,10.3-7.004c2.176-0.657,3.903-0.557,4.417-0.375  c0,0,1.326,0.433,2.53,1.537c0.401,0.367,0.439,0.38,0.751,0.763c0.002,0.004,0,0.006,0.002,0.008  c-0.002-0.002-0.002-0.004-0.004-0.004C27.709,5.196,27.912,5.5,27.912,5.5C28.111,5.844,27.961,6.303,27.578,6.524z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call_diverted.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call_diverted.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call_diverted.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="28,8 19,8 22.086,11.086 17.171,16 2,16 2,19.95 18.879,19.95 18.879,19.849 18.93,19.899 24.914,13.914 28,17 "/>
+<path d="M27,9h-7c-0.404,0-0.77,0.244-0.924,0.617c-0.154,0.374-0.069,0.804,0.217,1.09l2.045,2.045L17.088,17H4  c-1.104,0-2,0.896-2,2s0.896,2,2,2h14.75v-0.005l5.416-5.415l2.127,2.127C26.484,17.898,26.74,18,27,18  c0.129,0,0.259-0.025,0.383-0.076C27.756,17.77,28,17.404,28,17v-7C28,9.447,27.553,9,27,9z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<polygon points="29,14 25,11 29,8 "/>
-<path d="M6.027,7.025v14.949H26V7.025H6.027z M24.026,20H8V9h16.026V20z"/>
-<polygon points="5,9 2,7 2,20 5,18 "/>
-<rect height="1" width="11.999" x="10" y="12"/>
+</g>
+<path d="M30,8l-3,2V8c0-1.104-0.896-2-2-2H8C6.896,6,6,6.896,6,8v14c0,1.104,0.896,2,2,2h17c1.104,0,2-0.896,2-2v-8l3,2V8z M17.5,21  c-0.828,0-1.5-0.672-1.5-1.5s0.672-1.5,1.5-1.5s1.5,0.672,1.5,1.5S18.328,21,17.5,21z M22.5,21c-0.828,0-1.5-0.672-1.5-1.5  s0.672-1.5,1.5-1.5s1.5,0.672,1.5,1.5S23.328,21,22.5,21z"/>
+<polygon points="0,19 5,17 5,9 0,7 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,8 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="2,20 5,18 5,9 2,7 "/>
-<polygon points="11.174,7.025 13.148,9 24.026,9 24.026,19.876 26,21.85 26,11.75 29,14 29,8 26,10.25 26,7.025 "/>
-<polygon points="15.854,20 8,20 8,12.147 6.027,10.175 6.027,21.975 17.828,21.975 "/>
-<polygon points="17.149,13 21.999,13 21.999,12 16.149,12 "/>
-<rect height="35.827" transform="matrix(0.7063 -0.7079 0.7079 0.7063 -6.0767 14.6963)" width="1.868" x="13.74" y="-3.242"/>
+<path d="M27,10V8c0-1.105-0.896-2-2-2H10.148l12.035,12.035C22.286,18.012,22.392,18,22.5,18c0.828,0,1.5,0.672,1.5,1.5  c0,0.107-0.013,0.213-0.035,0.315l2.898,2.897C26.948,22.491,27,22.252,27,22v-8l3,2V8L27,10z"/>
+<polygon points="0,19 5,17 5,9 0,7 "/>
+<path d="M6,22c0,1.104,0.896,2,2,2h11.852L6,10.147V22z"/>
+<path d="M3.627,2.307C3.238,1.918,2.623,1.895,2.26,2.259C1.896,2.621,1.918,3.236,2.307,3.625l24.068,24.07  c0.389,0.389,1.004,0.408,1.366,0.046c0.362-0.363,0.341-0.979-0.048-1.367L3.627,2.307z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camera.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camera.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camera.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="2" width="5" x="20" y="3.5"/>
-<path d="M2,6.5v20h26v-20h-26zm23,17h-20v-14h20v14z"/>
-<path d="M15.5,10.5c-3.314,0-6,2.686-6,6s2.686,6,6,6,6-2.686,6-6-2.69-6-6-6zm0,9c-1.656,0-3-1.344-3-3s1.344-3,3-3,3,1.344,3,3-1.34,3-3,3z"/>
-<circle cx="7.688" cy="12.17" r="1.5"/>
+</g>
+<path d="M27,6H9H3C1.896,6,1,6.896,1,8v16c0,1.104,0.896,2,2,2h24c1.104,0,2-0.896,2-2V8C29,6.896,28.104,6,27,6z M15,24  c-4.418,0-8-3.582-8-8s3.582-8,8-8s8,3.582,8,8S19.418,24,15,24z M27,11h-4V8h4V11z"/>
+<path d="M15,10c-3.309,0-6,2.691-6,6s2.691,6,6,6s6-2.691,6-6S18.309,10,15,10z M15,20c-2.205,0-4-1.795-4-4c0-2.206,1.795-4,4-4  s4,1.794,4,4C19,18.205,17.205,20,15,20z"/>
+<path d="M9,4c0-0.552-0.447-1-1-1H4C3.447,3,3,3.448,3,4v1h6V4z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_capture.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_capture.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_capture.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<circle cx="6.688" cy="14.67" r="1.5"/>
-<path d="M17.44,19.6c-0.28,1.37-1.49,2.4-2.94,2.4-1.657,0-3-1.344-3-3,0-1.657,1.343-3,3-3,0.891,0,1.682,0.396,2.231,1.012l0.311-3.44c-0.77-0.36-1.63-0.57-2.54-0.57-3.314,0-6,2.686-6,6,0,3.313,2.686,6,6,6s6-2.687,6-6c0-0.805-0.161-1.57-0.447-2.271l-2.61,2.87z"/>
-<polygon points="24,12.64,24,26,4,26,4,12,17.18,12,17.38,9.798,16.51,9,1,9,1,29,27,29,27,12.9"/>
-<polygon points="24.54,7.014,29,11.08,22.99,10.53,18.92,15,19.46,8.988,15,4.922,21.01,5.465,25.08,1"/>
+</g>
+<path d="M24.797,11.616l-2.084,2.288C22.895,14.573,23,15.273,23,16c0,4.418-3.582,8-8,8s-8-3.582-8-8s3.582-8,8-8  c1.176,0,2.287,0.26,3.293,0.715L15.312,6H3C1.896,6,1,6.896,1,8v16c0,1.104,0.896,2,2,2h24c1.104,0,2-0.896,2-2V11.996  L24.797,11.616z"/>
+<path d="M9,5V4c0-0.552-0.447-1-1-1H4C3.447,3,3,3.448,3,4v1H9z"/>
+<path d="M19.922,16c-0.271,0-0.546-0.055-0.805-0.169c-0.054-0.023-0.094-0.064-0.144-0.092C18.979,15.827,19,15.91,19,16  c0,2.205-1.795,4-4,4s-4-1.795-4-4c0-2.206,1.795-4,4-4c1.186,0,2.24,0.528,2.973,1.35l0.219-2.421C17.266,10.344,16.174,10,15,10  c-3.309,0-6,2.691-6,6s2.691,6,6,6s6-2.691,6-6c0-0.106-0.011-0.21-0.016-0.315C20.664,15.886,20.297,16,19.922,16z"/>
+<polygon points="25.537,6.014 30,10.078 23.986,9.535 19.922,14 20.465,7.988 16,3.922 22.016,4.465 26.08,0 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_car_itut.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_car_itut.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<path d="M8.262,21.141c-1.67,0-2.926-0.531-3.766-1.596c-0.842-1.063-1.262-2.811-1.262-5.242c0-2.18,0.423-3.815,1.27-4.908  s2.117-1.64,3.811-1.64c0.691,0,1.386,0.094,2.083,0.281v1.538c-0.691-0.205-1.31-0.308-1.854-0.308  c-0.932,0-1.629,0.415-2.092,1.243c-0.463,0.83-0.694,2.07-0.694,3.723c0,1.922,0.238,3.302,0.716,4.14s1.194,1.257,2.149,1.257  c0.557,0,1.148-0.088,1.775-0.264v1.494C9.7,21.047,8.988,21.141,8.262,21.141z"/>
+<path d="M17.569,19.523c-0.703,1.078-1.717,1.617-3.041,1.617c-0.973,0-1.729-0.265-2.268-0.795s-0.809-1.273-0.809-2.229  c0-0.75,0.168-1.367,0.505-1.85c0.337-0.484,0.875-0.846,1.613-1.086s1.866-0.366,3.384-0.378v-1.002c0-0.58-0.16-1.017-0.479-1.31  s-0.795-0.439-1.428-0.439c-0.732,0-1.632,0.167-2.698,0.501v-1.529c1.113-0.299,2.2-0.448,3.261-0.448  c1.219,0,2.147,0.28,2.786,0.84s0.958,1.384,0.958,2.474V21h-1.389L17.569,19.523z M16.954,16.087H16.11  c-0.768,0-1.344,0.167-1.728,0.501s-0.575,0.832-0.575,1.494c0,0.527,0.114,0.923,0.343,1.187s0.571,0.396,1.028,0.396  c0.574,0,1.014-0.183,1.318-0.549s0.457-0.884,0.457-1.552V16.087z"/>
+<path d="M21.709,21V10.726h1.389l0.466,1.705c0.287-0.598,0.683-1.047,1.187-1.349s1.116-0.453,1.837-0.453  c0.188,0,0.325,0.006,0.413,0.018v1.969c-0.328-0.023-0.568-0.035-0.721-0.035c-0.791,0-1.354,0.175-1.688,0.523  s-0.501,0.924-0.501,1.727V21H21.709z"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_car_qwerty.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_car_qwerty.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<path d="M9.219,14.125c-1.484,0-2.601-0.473-3.348-1.418S4.75,10.208,4.75,8.047c0-1.938,0.376-3.392,1.129-4.363  s1.882-1.457,3.387-1.457c0.614,0,1.231,0.083,1.852,0.25v1.367C10.503,3.661,9.953,3.57,9.469,3.57  c-0.828,0-1.448,0.368-1.859,1.105s-0.617,1.84-0.617,3.309c0,1.708,0.212,2.935,0.637,3.68s1.062,1.117,1.91,1.117  c0.495,0,1.021-0.078,1.578-0.234v1.328C10.497,14.042,9.864,14.125,9.219,14.125z"/>
+<path d="M17.492,12.688c-0.625,0.958-1.526,1.438-2.703,1.438c-0.864,0-1.536-0.235-2.016-0.707s-0.719-1.132-0.719-1.98  c0-0.667,0.149-1.215,0.449-1.645s0.777-0.751,1.434-0.965s1.659-0.325,3.008-0.336V7.602c0-0.516-0.142-0.903-0.426-1.164  s-0.707-0.391-1.27-0.391c-0.651,0-1.45,0.148-2.398,0.445V5.133c0.989-0.266,1.956-0.398,2.898-0.398  c1.083,0,1.909,0.249,2.477,0.746s0.852,1.23,0.852,2.199V14h-1.234L17.492,12.688z M16.945,9.633h-0.75  c-0.683,0-1.194,0.148-1.535,0.445s-0.512,0.739-0.512,1.328c0,0.469,0.102,0.82,0.305,1.055s0.508,0.352,0.914,0.352  c0.511,0,0.901-0.163,1.172-0.488s0.406-0.785,0.406-1.379V9.633z"/>
+<path d="M21.172,14V4.867h1.234l0.414,1.516c0.255-0.531,0.606-0.931,1.055-1.199s0.992-0.402,1.633-0.402  c0.167,0,0.289,0.005,0.367,0.016v1.75c-0.292-0.021-0.505-0.031-0.641-0.031c-0.703,0-1.203,0.155-1.5,0.465  s-0.445,0.821-0.445,1.535V14H21.172z"/>
+<path d="M10.041,26.906V28H4.005v-1.094h2.146v-7.629L4.005,19.77v-1.094l3.015-0.95h0.991v9.181H10.041z"/>
+<path d="M17.656,26.811V28h-6.098v-0.745c0-0.711,0.123-1.342,0.369-1.894s0.549-1.021,0.909-1.412  c0.36-0.389,0.815-0.816,1.367-1.281c0.661-0.556,1.078-0.986,1.251-1.292s0.26-0.608,0.26-0.909c0-0.528-0.141-0.926-0.42-1.193  c-0.281-0.266-0.701-0.399-1.262-0.399c-0.593,0-1.311,0.152-2.153,0.458h-0.014v-1.217c0.884-0.278,1.745-0.417,2.584-0.417  c1.034,0,1.82,0.227,2.358,0.681c0.538,0.453,0.807,1.122,0.807,2.006c0,0.497-0.121,0.985-0.362,1.467  c-0.241,0.48-0.812,1.097-1.709,1.849c-0.501,0.424-0.894,0.777-1.176,1.06s-0.521,0.594-0.714,0.934  c-0.194,0.339-0.3,0.712-0.318,1.117H17.656z"/>
+<path d="M20.295,22.039c1.34,0,2.176-0.137,2.509-0.41s0.499-0.692,0.499-1.258c0-0.497-0.133-0.87-0.4-1.121  c-0.266-0.251-0.664-0.376-1.192-0.376c-0.465,0-1.119,0.116-1.962,0.349h-0.014V18.02c0.856-0.214,1.632-0.321,2.324-0.321  c1.044,0,1.827,0.21,2.352,0.629s0.786,1.048,0.786,1.887c0,0.579-0.157,1.077-0.472,1.493c-0.314,0.418-0.766,0.713-1.354,0.886  c0.638,0.114,1.127,0.382,1.467,0.804c0.339,0.421,0.509,0.948,0.509,1.582c0,1.044-0.304,1.826-0.913,2.348  c-0.607,0.522-1.521,0.783-2.737,0.783c-0.729,0-1.477-0.107-2.242-0.321v-1.189h0.014c0.894,0.224,1.598,0.335,2.112,0.335  c0.62,0,1.086-0.156,1.398-0.469c0.312-0.312,0.468-0.78,0.468-1.404c0-0.67-0.187-1.15-0.561-1.442s-1.237-0.438-2.591-0.438  V22.039z"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_change_cam_mode.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_change_cam_mode.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_change_cam_mode.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<circle cx="4.665" cy="8.688" r="1"/>
-<rect height="2" width="3.999" x="13" y="2"/>
-<path d="M12,16v12h15v-12h-15zm13,10h-11v-8h11v8z"/>
-<polygon points="29,19.37,29,21.08,27.52,20.22,26.04,19.37,27.52,18.51,29,17.66"/>
-<path d="M7.396,14.34l3.281,1.894c0.109-0.018,0.216-0.033,0.322-0.059v-1.17h2.078c0.763-0.777,1.236-1.84,1.236-3.014,0-2.377-1.935-4.313-4.313-4.313s-4.313,1.936-4.313,4.313c0,1.396,0.677,2.627,1.708,3.415v-1.064zm2.604-4.666c1.275,0,2.313,1.039,2.313,2.313,0,1.275-1.038,2.313-2.313,2.313s-2.313-1.038-2.313-2.313c0.004-1.28,1.041-2.316,2.316-2.316z"/>
-<polygon points="7.396,16.99,3,16.99,3,6.986,17,6.986,17,15,19,15,19,4.986,1,4.986,1,18.99,7.396,18.99"/>
-<polygon points="10.99,17.57,8.396,16.07,8.396,20.87,8.396,25.67,10.99,24.17"/>
-<rect height="1" width="8.999" x="15" y="19.01"/>
+</g>
+<circle cx="12" cy="9" r="3"/>
+<path d="M3,16c0-1.509,1.089-2.647,2.532-2.647c0.428,0,0.851,0.103,1.257,0.306l1.536,0.768c0.208-0.484,0.515-0.914,0.887-1.278  C7.879,12.249,7,10.725,7,9c0-2.757,2.243-5,5-5s5,2.243,5,5c0,1.13-0.391,2.162-1.025,3H23V4c0-1.104-0.896-2-2-2H8V1  c0-0.552-0.447-1-1-1H4C3.447,0,3,0.448,3,1v1C1.896,2,1,2.896,1,4v11c0,1.104,0.896,2,2,2V16z M18,4h3v2h-3V4z"/>
+<path d="M29.168,16.555L28,17.333V16c0-1.104-0.896-2-2-2H12c-1.104,0-2,0.896-2,2v11c0,1.104,0.896,2,2,2h14c1.104,0,2-0.896,2-2  v-4.333l1.168,0.778C29.626,23.75,30,23.55,30,23v-6C30,16.45,29.626,16.25,29.168,16.555z M18.5,26c-0.828,0-1.5-0.672-1.5-1.5  s0.672-1.5,1.5-1.5s1.5,0.672,1.5,1.5S19.328,26,18.5,26z M23.5,26c-0.828,0-1.5-0.672-1.5-1.5s0.672-1.5,1.5-1.5s1.5,0.672,1.5,1.5  S24.328,26,23.5,26z"/>
+<path d="M8.105,16.553l-2.211-1.105C5.402,15.201,5,15.45,5,16v8c0,0.55,0.402,0.799,0.895,0.553l2.211-1.105  C8.598,23.201,9,22.55,9,22v-4C9,17.45,8.598,16.799,8.105,16.553z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ciphering_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ciphering_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ciphering_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,8 +4,7 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M13.52,17.666C13.2,18.021,13,18.485,13,19c0,0.738,0.404,1.376,1,1.723V22c0,0.553,0.447,1,1,1s1-0.447,1-1v-1.277  c0.119-0.069,0.225-0.158,0.326-0.249L13.52,17.666z"/>
-<polygon points="20.854,25 7,25 7,15 10.853,15 7,11.147 7,12 4,12 4,28 23.854,28 "/>
-<path d="M11.413,7.264C12.062,5.93,13.419,5,15,5c2.206,0,4,1.794,4,4v3h-2.851l3,3H23v3.851l3,2.999V12h-3V9c0-4.4-3.6-8-8-8  c-2.67,0-5.04,1.33-6.495,3.356L11.413,7.264z"/>
-<rect height="35.827" transform="matrix(0.7063 -0.7079 0.7079 0.7063 -6.0767 14.6963)" width="1.868" x="13.74" y="-3.242"/>
+<path d="M11.414,7.263C12.063,5.929,13.42,5,15,5c2.205,0,4,1.794,4,4v3h-2.85L26,21.85V14c0-1.104-0.896-2-2-2h-1V9  c0-4.418-3.582-8-8-8c-2.682,0-5.049,1.324-6.501,3.349L11.414,7.263z"/>
+<path d="M16.326,20.473c-0.102,0.092-0.207,0.181-0.326,0.25V23c0,0.553-0.447,1-1,1s-1-0.447-1-1v-2.277  c-0.596-0.347-1-0.984-1-1.723c0-0.515,0.2-0.979,0.52-1.334L7,11.146V12H6c-1.104,0-2,0.896-2,2v12c0,1.104,0.896,2,2,2h17.854  L16.326,20.473z"/>
+<path d="M27.693,26.372c0.389,0.389,0.41,1.005,0.049,1.368c-0.363,0.363-0.979,0.343-1.367-0.046L2.307,3.625  C1.918,3.236,1.896,2.621,2.26,2.259c0.363-0.363,0.979-0.341,1.367,0.048L27.693,26.372z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_close_up.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_close_up.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_close_up.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M20.46,2.445l-2.465,6.77-3-8.215-2.994,8.215-2.465-6.77c-1.886,1.567-3.086,3.926-3.086,6.567,0,4.717,3.825,8.541,8.542,8.541s8.541-3.824,8.541-8.541c0-2.64-1.2-4.999-3.08-6.564z"/>
-<path d="M5.016,25.12c3.401,1.809,7.383,0.973,8.887-1.869l-12.32-6.55c-1.508,2.84,0.034,6.61,3.438,8.42z"/>
-<path d="M24.98,25.12c-3.402,1.809-7.385,0.973-8.889-1.869l12.33-6.549c1.51,2.84-0.03,6.61-3.44,8.42z"/>
-<rect height="11.94" width="3" x="13.5" y="17.06"/>
+</g>
+<path d="M24,9.5c0-2.192-0.887-4.185-2.33-5.692c-0.176-0.063-0.41-0.089-0.679,0.035l-1.033,3.445C19.831,7.71,19.441,8,19,8  s-0.831-0.29-0.958-0.713l-1.737-5.79C15.955,1.19,15.502,1,15,1s-0.955,0.19-1.305,0.497l-1.737,5.79C11.831,7.71,11.441,8,11,8  s-0.831-0.29-0.958-0.713L9.009,3.842C8.74,3.718,8.506,3.745,8.33,3.808C6.887,5.315,6,7.308,6,9.5c0,4.375,3.5,7.975,8,8.444V29h2  V17.944C20.5,17.475,24,13.875,24,9.5z"/>
+<path d="M25.842,17.461C25.652,17.163,25.329,17,24.999,17c-0.181,0-0.364,0.049-0.528,0.152l-8,5  c-0.227,0.142-0.388,0.367-0.446,0.628s-0.011,0.534,0.134,0.759c0.918,1.436,2.638,2.327,4.487,2.327  c1.144,0,2.271-0.335,3.262-0.968C26.57,23.193,27.42,19.928,25.842,17.461z"/>
+<path d="M13.529,22.285l-8-5c-0.164-0.103-0.348-0.151-0.528-0.151c-0.33,0-0.653,0.163-0.843,0.461  c-1.578,2.466-0.729,5.733,1.935,7.437C7.084,25.665,8.211,26,9.354,26c1.85,0,3.569-0.893,4.487-2.327  c0.145-0.225,0.192-0.498,0.134-0.759S13.756,22.428,13.529,22.285z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_collapse.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_collapse.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_collapse.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<path d="M2,2v26h26v-26h-26zm23,23h-20v-20h20v20z"/>
-<rect height="4" width="14" x="8" y="13"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-2 -2 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M24,0H2C0.896,0,0,0.896,0,2v22c0,1.104,0.896,2,2,2h22c1.104,0,2-0.896,2-2V2C26,0.896,25.104,0,24,0z M20,15H6v-4h14V15z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_communication.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_communication.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_communication.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="30" width="29.999"/>
-<path d="M19.675,3.48l-5.661,3.269c-0.279,0.117-0.592,0.042-0.732-0.196l-0.984-1.648c-0.002,0.001-0.002,0.006-0.004,0.007  c0-0.001,0-0.003,0-0.004c-0.861,0.447-2.783,1.709-3.99,2.916c-1.256,1.257-2.422,2.609-3.398,4.289c0,0-0.004,0.008-0.006,0.008  c0.008,0,0.014,0,0.021,0.002l2.096,1.342c0.264,0.17,0.318,0.543,0.123,0.828l-3.689,5.418c-0.195,0.283-0.566,0.377-0.83,0.205  c0,0-0.229-0.148-0.787-0.639c0,0,0,0-0.002,0c-0.301-0.267-0.314-0.365-0.604-0.711c-0.244-0.295-0.439-0.588-0.602-0.857  c0-0.002-0.004,0-0.004-0.002c-0.034-0.057-0.063-0.107-0.093-0.16c-0.004-0.008-0.008-0.016-0.01-0.02  c-0.301-0.537-0.43-0.932-0.43-0.932c-0.139-0.529-0.195-2.351,0.432-4.005c0.399-1.048,2.493-4.361,4.938-6.81  c2.445-2.448,6.25-4.884,7.924-5.389c1.674-0.505,3.002-0.427,3.396-0.286c0,0,1.021,0.333,1.945,1.18  c0.308,0.283,0.338,0.295,0.578,0.589c0,0.002,0,0.005,0,0.006c0-0.001,0-0.003-0.002-0.004c0.473,0.583,0.629,0.817,0.629,0.817  C20.085,2.958,19.968,3.312,19.675,3.48z"/>
-<path d="M26.773,11.223C24.634,9.085,22.02,8,18.999,8c-3.005,0-5.618,1.087-7.767,3.228C9.088,13.375,8,15.982,8,18.984  c0,3.014,1.086,5.633,3.227,7.783C13.363,28.912,15.979,30,18.999,30h0.269v-2.775h-0.269c-2.265,0-4.22-0.811-5.812-2.412  c-1.598-1.594-2.406-3.555-2.406-5.828c0-2.268,0.807-4.222,2.396-5.813c1.588-1.588,3.548-2.391,5.821-2.391  c2.266,0,4.232,0.811,5.848,2.409c1.619,1.604,2.441,3.553,2.441,5.794c0,0.979-0.162,1.875-0.496,2.738  c-0.426,1.086-0.994,1.613-1.738,1.613c-0.563,0-1.313-0.209-1.313-2.008v-8.082h-2.799v0.412c-0.662-0.439-1.494-0.662-2.486-0.662  c-1.646,0-2.978,0.615-3.951,1.832c-0.907,1.119-1.368,2.523-1.368,4.172c0,1.639,0.459,3.049,1.367,4.195  c0.99,1.252,2.32,1.887,3.952,1.887c1.258,0,2.32-0.395,3.17-1.174c0.748,1.42,1.9,2.141,3.428,2.141  c1.687,0,2.99-0.832,3.875-2.469c0.711-1.295,1.07-2.842,1.07-4.596C29.999,15.969,28.915,13.357,26.773,11.223z M18.456,15.74  c1.58,0,2.349,1.033,2.349,3.158c0,2.311-0.769,3.436-2.351,3.436c-1.591,0-2.366-1.09-2.366-3.334c0-0.875,0.188-1.602,0.574-2.221  C17.086,16.08,17.673,15.74,18.456,15.74z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<path d="M19.676,3.48l-5.662,3.268c-0.279,0.117-0.592,0.043-0.732-0.195l-0.984-1.648c-0.002,0-0.002,0.006-0.004,0.006V4.906  c-0.861,0.447-2.783,1.709-3.99,2.916c-1.256,1.258-2.422,2.609-3.398,4.289c0,0-0.004,0.008-0.006,0.008  c0.008,0,0.014,0,0.021,0.002l2.096,1.342c0.264,0.17,0.318,0.543,0.123,0.828l-3.689,5.418c-0.195,0.283-0.566,0.377-0.83,0.205  c0,0-0.229-0.148-0.787-0.639c0,0,0,0-0.002,0c-0.301-0.266-0.314-0.365-0.604-0.711c-0.244-0.295-0.439-0.588-0.602-0.857  l-0.004-0.002C0.588,17.65,0.559,17.6,0.529,17.547c-0.004-0.008-0.008-0.016-0.01-0.02c-0.301-0.537-0.43-0.932-0.43-0.932  c-0.139-0.529-0.195-2.35,0.432-4.004C0.92,11.543,3.014,8.23,5.459,5.781s6.25-4.885,7.924-5.389  c1.674-0.506,3.002-0.428,3.396-0.287c0,0,1.021,0.334,1.947,1.18c0.307,0.283,0.338,0.295,0.577,0.59v0.006  c0,0,0-0.004-0.001-0.004c0.473,0.582,0.628,0.816,0.628,0.816C20.086,2.959,19.969,3.313,19.676,3.48z"/>
+<path d="M26.775,11.223C24.635,9.086,22.02,8,19,8c-3.006,0-5.619,1.088-7.768,3.229C9.088,13.375,8,15.982,8,18.984  c0,3.014,1.086,5.633,3.227,7.783C13.363,28.912,15.979,30,19,30h0.268v-2.775H19c-2.266,0-4.221-0.811-5.813-2.412  c-1.598-1.594-2.406-3.555-2.406-5.828c0-2.268,0.807-4.223,2.396-5.813c1.588-1.588,3.547-2.391,5.822-2.391  c2.266,0,4.232,0.811,5.847,2.408c1.62,1.604,2.442,3.553,2.442,5.795c0,0.979-0.162,1.875-0.496,2.738  c-0.426,1.086-0.994,1.613-1.739,1.613c-0.562,0-1.312-0.209-1.312-2.008v-8.082h-2.799v0.412c-0.662-0.439-1.494-0.662-2.486-0.662  c-1.648,0-2.979,0.615-3.951,1.832c-0.908,1.119-1.369,2.523-1.369,4.172c0,1.639,0.459,3.049,1.367,4.195  c0.99,1.252,2.32,1.887,3.953,1.887c1.258,0,2.32-0.395,3.17-1.174c0.748,1.42,1.9,2.141,3.427,2.141  c1.687,0,2.991-0.832,3.875-2.469C29.64,22.285,30,20.738,30,18.984C30,15.969,28.916,13.357,26.775,11.223z M18.457,15.74  c1.58,0,2.347,1.033,2.347,3.158c0,2.311-0.767,3.436-2.349,3.436c-1.592,0-2.367-1.09-2.367-3.334c0-0.875,0.188-1.602,0.574-2.221  C17.086,16.08,17.674,15.74,18.457,15.74z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_conference.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_conference.svg	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M0,0v30h30v-30h-30zm28.24,26.99l-6.012-6.012-0.454,2.042,5.218,5.219h-24.37l5.535-5.534-0.454-2.042-5.942,5.941v-23.6l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202-2.479-1.04-3.137-2.756-3.311-3.69l-3.856-3.856h23.59l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738v24.36z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect height="3.519" width="17.65" x="6.177" y="13.25"/>
-<polygon points="9.706,25.59,20.29,25.59,22.06,17.65,7.941,17.65"/>
-<path d="M10.52,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766v-3.871c0.866,0.304,2.249,0.588,3.599,0.017,2.926-1.238,2.831-3.499,2.831-3.499s-1.41-1.298-4.335-0.06c-2.645,1.12-2.94,2.791-2.973,3.101h-0.01c-0.032-0.31-0.328-1.98-2.973-3.101-2.925-1.238-4.335,0.06-4.335,0.06s-0.102,2.261,2.825,3.499z"/>
-</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contact_all.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contact_all.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contact_all.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,7 +4,7 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M11,26c-1.104,0-2-0.896-2-2s0.896-2,2-2c0.718,0,1.343,0.381,1.695,0.949c0.083-0.055,0.167-0.109,0.262-0.171  c1.875-1.218,3.101-2.121,3.656-2.697c-0.025-0.025-0.044-0.056-0.069-0.081H4V2h14v4.68c0.638-0.346,1.318-0.577,2-0.65V3  c0-1.65-1.35-3-3-3H5C3.35,0,2,1.35,2,3v22c0,1.65,1.35,3,3,3h6V26z M7,25H4v-2h3V25z"/>
-<path d="M18.828,19.312c0.002,0.117,0.009,0.728,0.001,0.844c-0.005,0.079-0.032,0.164-0.061,0.249h4.464  c-0.028-0.085-0.056-0.17-0.061-0.249c-0.008-0.123,0-0.719,0-0.844c0.828-0.575,1.407-1.251,1.844-2.134  c0.808-1.634,0.375-5.479,0.375-5.479C25.391,9.994,23.196,8,21.525,8h-1.06c-1.67,0-3.869,1.994-3.869,3.698  c0,0-0.383,3.827,0.372,5.474C17.384,18.072,17.981,18.737,18.828,19.312z"/>
-<path d="M23.593,21.035L21,27.082l-2.592-6.047c-1.292,1.677-5.184,3.844-5.408,4.148V30h16v-4.813  C28.775,24.882,24.884,22.713,23.593,21.035z"/>
+<path d="M16,17.303c0-2.155,0.775-4.09,2-5.428V4H6v16h10.406C16.146,19.14,16,18.227,16,17.303z"/>
+<path d="M12.769,26.846C12.532,26.944,12.272,27,12,27c-1.104,0-2-0.896-2-2s0.896-2,2-2c1.061,0,1.92,0.828,1.987,1.872  c0.883-1.044,2.104-1.882,3.774-2.157c-0.391-0.512-0.723-1.092-0.992-1.715H5V3h14v7.988c0.607-0.43,1.282-0.73,2-0.878V3  c0-1.104-0.896-2-2-2H5C3.896,1,3,1.896,3,3v24c0,1.104,0.896,2,2,2h7.114C12.232,28.339,12.441,27.592,12.769,26.846z M8,26H5v-2h3  V26z"/>
+<path d="M14,30c0.016-0.232,0.448-4.95,4.398-5.354c0.908-0.02,1.999-0.459,1.999-1.633v-0.297c0-0.129-0.06-0.252-0.163-0.33  C18.898,21.393,18,19.352,18,17.303C18,14.377,19.794,12,22,12s4,2.377,4,5.303c0,2.049-0.898,4.09-2.238,5.084  c-0.101,0.078-0.162,0.201-0.162,0.33v0.297c0,1.292,1.31,1.633,1.999,1.633C29.553,25.05,29.982,29.768,30,30H14z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contacts.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contacts.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contacts.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M5,2v2H3v2h2v3H3v2h2v3H3v2h2v3H3v2h2v3H3v2h2v2h22V2H5z M24,25H8V5h16V25z"/>
-<path d="M14.371,15.227c0.002,0.086,0.007,0.53,0.001,0.614c-0.004,0.058-0.024,0.12-0.046,0.183c0-0.001,0.001-0.002,0.001-0.002  h3.347c0,0,0,0.001,0.001,0.001c-0.021-0.062-0.042-0.124-0.046-0.182c-0.007-0.09,0-0.523,0.001-0.614  c0.621-0.418,1.056-0.91,1.382-1.553c0.606-1.187,0.282-3.984,0.282-3.984C19.294,8.45,17.647,7,16.395,7H15.6  c-1.254,0-2.902,1.45-2.902,2.689c0,0-0.287,2.783,0.278,3.981C13.288,14.325,13.735,14.809,14.371,15.227z"/>
-<path d="M22,19.5c-0.169-0.222-3.088-1.801-4.056-3.02L16,21l-1.943-4.521c-0.968,1.22-3.888,2.797-4.057,3.019V23h12V19.5z"/>
+<rect height="11" width="2" x="26" y="4"/>
+<rect height="28" width="2" x="1" y="1"/>
+<path d="M23,1H5v28h18c1.105,0,2-0.896,2-2V3C25,1.895,24.105,1,23,1z M9,21c0.014-0.168,0.336-3.576,3.301-3.867  c0.68-0.014,1.5-0.332,1.5-1.18V15.74c0-0.094-0.047-0.184-0.123-0.24C12.674,14.783,12,13.309,12,11.83C12,9.717,13.346,8,15,8  s3,1.717,3,3.83c0,1.479-0.674,2.953-1.678,3.67c-0.076,0.057-0.121,0.146-0.121,0.24v0.213c0,0.934,0.98,1.18,1.498,1.18  C20.664,17.424,20.988,20.832,21,21H9z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_continuous_capture.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_continuous_capture.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_continuous_capture.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,7 +4,7 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M1,2v16h18v-16h-18zm15,13h-12v-10h12v10z"/>
-<polygon points="26,12,26,25,14,25,11,25,11,28,29,28,29,12"/>
-<polygon points="21,7,21,20,9,20,6,20,6,23,24,23,24,7"/>
+<path d="M28,12h-1v13H12v1c0,1.104,0.896,2,2,2h14c1.104,0,2-0.896,2-2V14C30,12.896,29.104,12,28,12z"/>
+<path d="M23,7h-1v13H7v1c0,1.104,0.896,2,2,2h14c1.104,0,2-0.896,2-2V9C25,7.896,24.104,7,23,7z"/>
+<path d="M18,2H4C2.896,2,2,2.896,2,4v12c0,1.104,0.896,2,2,2h14c1.104,0,2-0.896,2-2V4C20,2.896,19.104,2,18,2z M17,15H5V5h12V15z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M15,2C7.82,2,2,7.82,2,14.999c0,7.18,5.82,13,13,13s13-5.82,13-13C28,7.82,22.18,2,15,2z M15,24.999  c-5.514,0-10-4.486-10-10C5,9.486,9.486,5,15,5V24.999z"/>
+<path d="M15,2C7.82,2,2,7.82,2,15s5.82,13,13,13s13-5.82,13-13S22.18,2,15,2z M15,25C9.477,25,5,20.523,5,15S9.477,5,15,5V25z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_corrupted.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_corrupted.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_corrupted.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,7 +4,6 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="10,29 10,21 2,21 "/>
-<polygon points="11.484,17.257 16.484,11.257 11.691,8.381 15.382,1 2,1 2,20 5,20 5,4 11.646,4 9.074,9.144 13.453,11.771   8.453,17.771 13.987,21.091 11.31,26 11,26 11,29 11.952,29 16.662,20.363 "/>
-<path d="M17.618,1l-3.31,6.619l5.207,3.124l-5,6l4.822,2.894L14.23,29H28V1H17.618z M25,26h-6.855l3.868-7.091l-4.466-2.68l5-6  l-5.621-3.373L18.354,4H25V26z"/>
+<path d="M24,1h-6.382l-3.31,6.619l5.207,3.124l-5,6l4.822,2.894L14.23,29H24c1.104,0,2-0.896,2-2V3C26,1.895,25.104,1,24,1z"/>
+<path d="M16.662,20.363l-5.178-3.106l5-6l-4.793-2.876L15.382,1H6C4.896,1,4,1.895,4,3v19l7,7h0.951L16.662,20.363z M11,26.879  L6.121,22H9c1.104,0,2,0.895,2,2V26.879z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_email.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_email.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_email.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<path d="M9.293,14.96c0,1.567,0.373,2.805,1.121,3.712,0.747,0.907,1.668,1.36,2.762,1.36,0.608,0,1.148-0.108,1.626-0.32l1.918-1.918c0.072-0.123,0.146-0.239,0.216-0.373,0.012,0.041,0.029,0.076,0.041,0.115l2.424-2.423c0.02-1.68,0.336-4.327,0.953-7.96h-3.787c-2.206,0-3.97,0.692-5.291,2.078-1.317,1.382-1.977,3.292-1.977,5.722zm4.237-4.17c0.665-0.993,1.472-1.49,2.42-1.49h0.848l-0.506,4.006c-0.219,1.695-0.497,2.885-0.834,3.568-0.338,0.684-0.779,1.025-1.326,1.025-0.611,0-1.03-0.246-1.258-0.738-0.229-0.492-0.342-1.271-0.342-2.338,0-1.69,0.33-3.04,1-4.03z"/>
-<path d="M6.736,13.33c0-2.825,0.818-5.033,2.454-6.624s3.762-2.386,6.378-2.386c2.479,0,4.391,0.754,5.735,2.263,1.062,1.19,1.696,2.781,1.921,4.758,0.777-0.527,1.844-0.448,2.533,0.241l0.206,0.206c-0.173-2.918-1.066-5.232-2.691-6.935-1.82-1.903-4.41-2.855-7.77-2.855-3.373,0-6.157,1.019-8.354,3.056s-3.295,4.842-3.295,8.415c0,3.746,1.068,6.629,3.206,8.647,1.26,1.189,2.782,2.02,4.554,2.508l0.138-1.24c0.044-0.399,0.212-0.769,0.471-1.072-3.65-1.1-5.484-4.09-5.484-8.99z"/>
-<path d="M24.34,13l-10.6,10.61-0.707,6.364,6.364-0.707,10.61-10.6-5.66-5.66zm-5.65,14.14l-2.828-2.828,8.484-8.485,2.829,2.829-8.48,8.49z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-3.96 -2 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<polygon points="13.317,24.467 15.438,26.59 9.78,28 11.196,22.346 "/>
+<path d="M9.256,21.859c0.081-0.323,0.48-0.822,0.804-1.188c-2.09-0.273-3.729-1.016-4.905-2.242c-1.513-1.576-2.27-3.941-2.27-7.096  c0-2.807,0.815-5.011,2.447-6.61s3.755-2.399,6.371-2.399c2.488,0,4.404,0.754,5.749,2.263c1.344,1.509,2.017,3.648,2.017,6.419  c0,0.083-0.008,0.154-0.009,0.236l0.923-0.924c0.391-0.391,0.902-0.586,1.414-0.586c0.105,0,0.21,0.014,0.314,0.03  c-0.177-2.912-1.073-5.219-2.697-6.912C17.591,0.95,15.003,0,11.648,0C8.276,0,5.491,1.017,3.295,3.049  C1.099,5.082,0,7.889,0,11.471c0,3.756,1.066,6.641,3.199,8.654c1.542,1.456,3.478,2.377,5.795,2.781L9.256,21.859z"/>
+<path d="M12.715,5.154c-2.215,0-3.981,0.693-5.298,2.078C6.1,8.618,5.441,10.527,5.441,12.961c0,1.577,0.374,2.816,1.121,3.719  s1.668,1.354,2.762,1.354c0.812,0,1.511-0.189,2.099-0.567s1.142-1.06,1.661-2.044c0.163,0.577,0.416,1.055,0.747,1.448l1.886-1.886  c-0.009-0.027-0.021-0.045-0.028-0.075c-0.096-0.378-0.144-0.918-0.144-1.62c0-1.768,0.319-4.479,0.957-8.135H12.715z   M12.441,11.307c-0.219,1.714-0.499,2.908-0.841,3.582c-0.342,0.675-0.781,1.012-1.319,1.012c-0.602,0-1.019-0.241-1.251-0.725  c-0.232-0.482-0.349-1.267-0.349-2.352c0-1.695,0.333-3.039,0.998-4.033c0.665-0.993,1.472-1.49,2.42-1.49h0.848L12.441,11.307z"/>
+<polygon points="12.257,21.285 16.492,25.523 26.04,15.975 21.797,11.732 12.251,21.279 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_event.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_event.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_event.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,8 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="2" width="2" x="7" y="6"/>
-<rect height="2" width="10" x="10" y="6"/>
-<path d="M5,3h18v8.557c0.785-0.716,1.999-0.7,2.758,0.059L26,11.857V0H2v29h9.128l0.333-3H5V3z"/>
-<polygon points="26,29 26,25.515 22.515,29 "/>
-<path d="M24.343,13.029L13.736,23.636L13.029,30l6.364-0.707L30,18.687L24.343,13.029z M18.687,27.171l-2.828-2.828l8.484-8.485  l2.829,2.829L18.687,27.171z"/>
+<polygon points="17.277,26.467 19.396,28.59 13.74,30 15.156,24.346 "/>
+<polygon points="16.217,23.285 20.451,27.523 30,17.975 25.756,13.732 16.209,23.279 "/>
+<path d="M13.216,23.859c0.151-0.603,1.387-1.802,1.579-1.994l9.547-9.547c0.194-0.194,0.419-0.34,0.658-0.438V3c0-1.104-0.896-2-2-2  H5C3.896,1,3,1.896,3,3v24c0,1.104,0.896,2,2,2h6.929L13.216,23.859z M10,6h11v2H10V6z M9,8H7V6h2V8z"/>
+<path d="M21.865,28.938c-0.023,0.023-0.052,0.04-0.076,0.063H23c1.104,0,2-0.896,2-2v-1.197L21.865,28.938z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_message.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_message.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_message.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M11.749,23.386c0.05-0.452,0.252-0.872,0.573-1.193L13.515,21H4.414l6.115-6.115L14,18.355l3.471-3.471l1.08,1.08  l0.707-0.707l-1.08-1.08L24,8.355v2.677c0.619-0.107,1.279,0.075,1.758,0.553L27,12.828V4H1v20h10.681L11.749,23.386z M22.527,7  L14,15.527L5.473,7H22.527z M4,8.355l5.822,5.822L4,20V8.355z"/>
-<path d="M24.343,13L13.736,23.606l-0.707,6.364l6.364-0.707L30,18.657L24.343,13z M18.687,27.142l-2.828-2.828l8.484-8.485  l2.829,2.829L18.687,27.142z"/>
+<polygon points="8.268,16.726 0,9.818 0,23.547 "/>
+<path d="M0.127,7.318l11.308,9.449c0.46,0.354,0.907,0.555,1.402,0.566c0.021,0,0.093,0,0.113,0  c0.494-0.012,0.942-0.213,1.401-0.566l11.508-9.495C25.568,6.528,24.848,6,24,6H2C1.137,6,0.407,6.551,0.127,7.318z"/>
+<polygon points="17.277,26.467 19.398,28.59 13.74,30 15.156,24.346 "/>
+<polygon points="16.217,23.285 20.453,27.523 30,17.975 25.758,13.732 16.21,23.279 "/>
+<path d="M24.342,12.318c0.375-0.375,0.885-0.586,1.415-0.586c0,0,0,0,0.001,0c0.082,0,0.162,0.014,0.242,0.023V9.749l-8.271,6.824  l1.288,1.076L24.342,12.318z"/>
+<path d="M13.18,24.006c0.061-0.341,0.208-0.668,0.445-0.945c0.037-0.045,0.076-0.088,0.117-0.129l4.566-4.572l-1.363-1.14  l-1.321,1.09c-0.882,0.682-1.724,1.002-2.626,1.023l-0.023,0.001h-0.138c-0.948-0.022-1.791-0.343-2.621-0.98l-1.167-0.976  l-8.907,7.349C0.434,25.471,1.153,26,2,26h10.681L13.18,24.006z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_day_light_saving_time.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_day_light_saving_time.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_day_light_saving_time.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M14.95,8.815h0.005c3.328,0,6.036,2.705,6.042,6.031h1.5c-0.006-4.152-3.387-7.531-7.542-7.531h-0.005v1.496z"/>
-<polygon points="21.78,14.74,24.1,14.74,22.94,16.75,21.78,18.76,20.62,16.75,19.46,14.74"/>
-<path d="M15,1c-7.732,0-14,6.268-14,14,0,7.73,6.268,14,14,14,7.731,0,14-6.27,14-14,0-7.732-6.27-14-14-14zm0,25c-6.075,0-11-4.92-11-11,0-6.076,4.925-11,11-11s11,4.924,11,11c0,6.08-4.92,11-11,11z"/>
-<rect height="9" width="2" x="14.04" y="6.009"/>
-<rect height="9.001" transform="matrix(0.8281 0.5605 -0.5605 0.8281 9.3921 -7.8538)" width="2" x="16.5" y="6.888"/>
-<circle cx="15.03" cy="15.01" r="1"/>
+</g>
+<path d="M15,1C7.267,1,1,7.268,1,15c0,7.73,6.267,14,14,14c7.73,0,14-6.27,14-14C29,7.268,22.73,1,15,1z M15,26  C8.924,26,3.999,21.074,3.999,15C3.999,8.924,8.924,4,15,4c6.074,0,11,4.924,11,11C26,21.074,21.074,26,15,26z"/>
+<path d="M24.714,14.297h-0.026h-2.5v1.5h1.017c-0.164,1.705-0.851,3.255-1.896,4.498l-0.725-0.725l-1.061,1.061l1.768,1.768  l0.007-0.007l0.021,0.02c2.097-1.79,3.432-4.445,3.432-7.411C24.75,14.763,24.731,14.53,24.714,14.297z"/>
+<path d="M20.938,14.014h-4.906V6.008h-2v9h0.001c0,0.002-0.001,0.004-0.001,0.006c0,0.238,0.095,0.447,0.233,0.618l4.212,4.272  l1.414-1.414l-2.477-2.477h3.523V14.014z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_delete.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_delete.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_delete.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,6 +4,7 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M19,4V1h-8v3H5v3h20V4H19z M13,3h4v1h-4V3z"/>
-<path d="M6,29h18V8H6V29z M19,11h2v14h-2V11z M14,11h2v14h-2V11z M9,11h2v14H9V11z"/>
+<path d="M5,9v18c-0.001,1.104,0.894,2,1.999,2h16c1.104,0,2-0.896,2-2V9H5z M10.999,25h-2V12h2V25z M15.999,25h-2V12h2V25z   M20.999,25h-2V12h2V25z"/>
+<path d="M26.999,5.5c0,0.828-0.672,1.5-1.5,1.5h-21c-0.83,0-1.5-0.672-1.5-1.5l0,0c0-0.828,0.67-1.5,1.5-1.5h21  C26.327,4,26.999,4.672,26.999,5.5L26.999,5.5z"/>
+<path d="M17.999,1.995C17.996,1.445,17.551,1,17,1h-4.001c-0.552,0-1,0.448-1,1v1h6V1.995z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_details.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_details.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_details.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,15 +4,9 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="2" width="2" x="6" y="6"/>
-<rect height="2" width="9.941" x="9.059" y="6"/>
-<rect height="2" width="2" x="6" y="11"/>
-<rect height="2" width="2" x="6" y="16"/>
-<rect height="2" width="2" x="6" y="21"/>
-<path d="M9.059,23h0.71c-0.264-0.369-0.501-0.756-0.71-1.161V23z"/>
-<path d="M9.059,11v2h0.078c0.395-0.731,0.889-1.399,1.454-2H9.059z"/>
-<path d="M21.45,26.129C20.246,26.683,18.91,27,17.5,27c-1.516,0-2.944-0.366-4.217-1H4V3h18v6.137c1.171,0.633,2.188,1.509,3,2.554  V0H1v29h23.326C24.078,28.745,21.45,26.129,21.45,26.129z"/>
-<rect height="2" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -10.8558 27.5915)" width="4" x="25.878" y="25.9"/>
-<path d="M24.349,20.542C24.765,19.611,25,18.584,25,17.5c0-4.136-3.364-7.5-7.5-7.5S10,13.364,10,17.5s3.364,7.5,7.5,7.5  c1.596,0,3.074-0.505,4.291-1.358l2.552,2.551l2.828-2.828L24.349,20.542z M12,17.5c0-3.032,2.467-5.5,5.5-5.5s5.5,2.468,5.5,5.5  S20.533,23,17.5,23S12,20.532,12,17.5z"/>
-<polygon points="22,19 22,16 19,16 19,13 16,13 16,16 13,16 13,19 16,19 16,22 19,22 19,19 "/>
+<path d="M20.589,26.309c-1.112,0.479-2.319,0.736-3.567,0.736c-2.41,0-4.675-0.939-6.379-2.644C10.209,23.969,9.827,23.498,9.496,23  H8v-2h0.512C8.182,20.055,8,19.054,8,18.022C8,18.015,8.001,18.008,8.001,18H8v-2h0.235c0.245-1.071,0.676-2.087,1.29-3H8v-2h3.362  c1.599-1.294,3.574-2,5.66-2C19.25,9,21.349,9.811,23,11.277V3c0-1.104-0.896-2-2-2H3C1.896,1,1,1.896,1,3v24c0,1.105,0.896,2,2,2  h18c0.381,0,0.734-0.112,1.037-0.297l-0.518-0.518C21.006,27.672,20.691,27.017,20.589,26.309z M8,6h11v2H8V6z M7,23H5v-2h2V23z   M7,18H5v-2h2V18z M7,13H5v-2h2V13z M7,8H5V6h2V8z"/>
+<path d="M12.057,13.058c-2.742,2.742-2.742,7.188,0,9.93c2.742,2.743,7.188,2.743,9.93,0c2.744-2.742,2.744-7.188,0.002-9.931  C19.245,10.314,14.799,10.314,12.057,13.058z M20.568,21.568c-1.957,1.959-5.135,1.959-7.093,0c-1.959-1.958-1.959-5.133,0-7.093  c1.96-1.959,5.136-1.959,7.095-0.001C22.527,16.434,22.527,19.61,20.568,21.568z"/>
+<path d="M28.607,26.771l-2.836,2.837c0.521,0.522,1.368,0.522,1.891,0l0.945-0.945C29.131,28.141,29.131,27.294,28.607,26.771z"/>
+<path d="M25.771,23.934c-0.439-0.438-1.097-0.485-1.607-0.188l-0.81-0.81c-0.204,0.262-0.42,0.518-0.661,0.759  c-0.238,0.239-0.494,0.455-0.757,0.66l0.809,0.81c-0.298,0.512-0.249,1.169,0.189,1.607l1.891,1.892l2.837-2.837L25.771,23.934z"/>
+<path d="M19.834,17.157h-1.672v-1.673c0-0.554-0.449-1.004-1.003-1.004s-1.003,0.45-1.003,1.004v1.673h-1.672  c-0.555,0-1.004,0.449-1.004,1.003c0,0.553,0.449,1.003,1.004,1.003h1.672v1.672c0,0.554,0.449,1.003,1.003,1.003  s1.003-0.449,1.003-1.003v-1.672h1.672c0.555,0,1.004-0.45,1.004-1.003C20.838,17.606,20.389,17.157,19.834,17.157z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_dialer.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_dialer.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_dialer.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="5" width="5" x="12" y="2"/>
-<rect height="5" width="5" x="12" y="9"/>
-<rect height="5" width="5" x="12" y="16"/>
-<rect height="5" width="5" x="5" y="2"/>
-<rect height="5" width="5" x="5" y="9"/>
-<rect height="5" width="5" x="5" y="16"/>
-<rect height="5" width="5" x="19" y="2"/>
-<rect height="5" width="5" x="19" y="9"/>
-<rect height="5" width="5" x="19" y="16"/>
-<rect height="5" width="5" x="12" y="23"/>
+<path d="M10,7H4V4c0-1.104,0.896-2,2-2h4V7z"/>
+<path d="M20,7h6V4c0-1.104-0.896-2-2-2h-4V7z"/>
+<rect height="5" width="6" x="12" y="2"/>
+<rect height="5" width="6" x="12" y="9"/>
+<rect height="5" width="6" x="4" y="9"/>
+<rect height="5" width="6" x="20" y="9"/>
+<path d="M10,16H4v3c0,1.104,0.896,2,2,2h4V16z"/>
+<path d="M20,16h6v3c0,1.104-0.896,2-2,2h-4V16z"/>
+<rect height="5" width="6" x="12" y="16"/>
+<path d="M18,26c0,1.104-0.896,2-2,2h-2c-1.104,0-2-0.896-2-2v-3c0,0,0.896,0,2,0h2c1.104,0,2,0,2,0V26z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_disconnect.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_disconnect.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_disconnect.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,9 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="16.854,21 12.854,17 1,17 11,27 14,24.344 10.657,21 "/>
-<polygon points="25.15,21 28,21 28,17 21.149,17 "/>
-<polygon points="13.148,9 17.149,13 29,13 19,3 16,5.657 19.343,9 "/>
-<polygon points="4.853,9 2,9 2,13 8.853,13 "/>
-<rect height="35.827" transform="matrix(0.7063 -0.7079 0.7079 0.7063 -6.0767 14.6963)" width="1.868" x="13.74" y="-3.242"/>
+<path d="M21.15,17l3.986,3.986C26.176,20.914,27,20.059,27,19c0-1.104-0.896-2-2-2H21.15z"/>
+<path d="M12.854,17H4l0,0c-0.132,0-0.263,0.014-0.393,0.039c-0.057,0.012-0.108,0.033-0.163,0.049  c-0.07,0.021-0.142,0.037-0.21,0.064C3.17,17.18,3.111,17.217,3.051,17.25c-0.053,0.029-0.109,0.053-0.16,0.088  c-0.219,0.146-0.408,0.334-0.554,0.553c-0.032,0.049-0.056,0.102-0.083,0.152c-0.035,0.064-0.073,0.125-0.102,0.191  c-0.026,0.066-0.042,0.135-0.063,0.203c-0.017,0.057-0.039,0.111-0.051,0.172c-0.051,0.258-0.051,0.523,0,0.783  c0.012,0.059,0.034,0.113,0.051,0.17c0.021,0.068,0.036,0.137,0.063,0.203c0.028,0.066,0.066,0.127,0.102,0.191  c0.027,0.051,0.051,0.104,0.083,0.152c0.073,0.109,0.157,0.213,0.251,0.307l5.654,5.656c0.781,0.779,2.048,0.779,2.828,0  c0.781-0.781,0.781-2.049,0-2.83L8.828,21h8.025L12.854,17z"/>
+<path d="M17.15,13H26l0,0c0.132,0,0.263-0.014,0.393-0.04c0.057-0.011,0.108-0.032,0.163-0.048c0.07-0.021,0.142-0.037,0.21-0.065  c0.064-0.027,0.123-0.064,0.184-0.097c0.053-0.029,0.109-0.053,0.16-0.087c0.219-0.146,0.408-0.335,0.554-0.554  c0.032-0.049,0.056-0.102,0.083-0.152c0.035-0.063,0.073-0.125,0.102-0.191c0.026-0.066,0.042-0.135,0.063-0.202  c0.017-0.058,0.039-0.112,0.051-0.171c0.051-0.258,0.051-0.525,0-0.783c-0.012-0.059-0.034-0.114-0.051-0.171  c-0.021-0.067-0.036-0.136-0.063-0.202c-0.028-0.067-0.066-0.128-0.102-0.191c-0.027-0.051-0.051-0.104-0.083-0.152  c-0.073-0.11-0.157-0.213-0.251-0.307l-5.654-5.656c-0.781-0.781-2.048-0.781-2.828,0c-0.781,0.781-0.781,2.047,0,2.829L21.172,9  H13.15L17.15,13z"/>
+<path d="M8.854,13L4.867,9.013C3.826,9.083,3,9.941,3,11c0,1.104,0.896,2,2,2H8.854z"/>
+<path d="M3.627,2.306C3.238,1.917,2.623,1.896,2.26,2.258C1.896,2.621,1.918,3.236,2.307,3.625l24.068,24.071  c0.389,0.389,1.004,0.408,1.366,0.045s0.341-0.979-0.048-1.367L3.627,2.306z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drm_rights_expired.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drm_rights_expired.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drm_rights_expired.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,7 +4,7 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M11,5h6c0.553,0,1,0.447,1,1s-0.447,1-1,1h-5.851L19,14.851v-2.626c1.041-0.593,2.136-1.309,2.136-1.309  c0.529-0.418,0.915-1.316,0.858-1.996c0,0-0.68-4.737-1.039-5.313c0,0-1.628-2.606-7.067-2.606C9.759,1,7.98,2.492,7.361,3.213  l2.664,2.663C10.089,5.385,10.491,5,11,5z"/>
-<polygon points="17.785,21.932 15.061,19.208 14.572,19.71 15.846,21.081 14.568,22.456 16,23.846 16,24.278 14,26.691 12,24.279   12,16.147 9,13.147 9,15.998 10,15.998 10,25 13.315,29 14.684,29 18,25 18,23 17.365,22.384 "/>
-<rect height="35.827" transform="matrix(0.7076 -0.7066 0.7066 0.7076 -6.0779 14.6588)" width="1.866" x="13.741" y="-3.24"/>
+<path d="M27.693,26.372c0.389,0.389,0.41,1.005,0.048,1.368c-0.362,0.362-0.978,0.343-1.366-0.046L2.307,3.625  C1.918,3.236,1.896,2.621,2.26,2.258c0.363-0.363,0.979-0.341,1.367,0.048L27.693,26.372z"/>
+<path d="M17.15,13H18v0.85l1.768,1.767C19.906,15.446,20,15.237,20,15v-2.775c1.041-0.593,2.136-1.309,2.136-1.309  c0.529-0.418,0.915-1.316,0.858-1.996c0,0-0.68-4.737-1.039-5.313c0,0-1.628-2.606-7.067-2.606c-5.44,0-6.805,2.595-6.805,2.595  C8.053,3.644,8.02,3.732,7.986,3.836L17.15,13z M12,5h6c0.553,0,1,0.447,1,1s-0.447,1-1,1h-6c-0.553,0-1-0.447-1-1S11.447,5,12,5z"/>
+<path d="M15.695,19.842l1.15,1.239l-1.277,1.375L17,23.846v0.433l-2,2.413l-2-2.412v-7.133l-3-3V15c0,0.549,0.442,0.992,0.99,0.998  H11V16v9l3.315,4h1.368L19,25v-1.853L15.695,19.842z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drop_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drop_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drop_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M7.129,14.84c-0.006-0.09,0-0.523,0-0.614,0.621-0.419,1.057-0.91,1.383-1.552,0.605-1.188,0.281-3.985,0.281-3.985,0-1.245-1.647-2.695-2.898-2.695h-0.795c-1.254,0-2.903,1.45-2.903,2.689,0,0-0.287,2.783,0.279,3.981,0.311,0.654,0.76,1.139,1.395,1.556,0.002,0.085,0.007,0.529,0.002,0.614-0.078,1.22-3.673,3.39-3.873,3.66v3.5h11.5v-3.5c-0.2-0.26-4.295-2.44-4.371-3.66z"/>
-<path d="M11.02,12.17l2.82-2.818c-0.124-0.181-0.2-0.352-0.21-0.507-0.006-0.09,0-0.523,0-0.614,0.621-0.419,1.057-0.91,1.383-1.552,0.605-1.188,0.281-3.985,0.281-3.985,0-1.244-1.64-2.694-2.89-2.694h-0.8c-1.254,0-2.902,1.45-2.902,2.689,0,0-0.118,1.153-0.052,2.294,1.202,0.875,2.088,2.216,2.145,3.568,0.098,0.898,0.291,3.486-0.496,5.031-0.215,0.422-0.468,0.806-0.762,1.156,0.403,0.321,1.018,0.747,1.815,1.261h3.505l-3.82-3.83z"/>
-<path d="M24.26,17.11c0.001-0.137,0.002-0.266,0.003-0.314,0.814-0.549,1.385-1.194,1.814-2.037,0.795-1.559,0.369-5.229,0.369-5.229,0-1.626-2.16-3.53-3.805-3.53h-1.04c-1.645,0-3.81,1.904-3.81,3.53,0,0-0.043,0.425-0.071,1.04l6.54,6.54z"/>
-<path d="M30,22.85v-0.444c-0.079-0.104-0.616-0.434-1.328-0.884l1.33,1.32z"/>
-<path d="M18.41,19.56c-1.64,1.318-3.989,2.618-4.161,2.844v4.6h11.6l-7.44-7.44z"/>
-<rect height="20.98" transform="matrix(0.7066 -0.7076 0.7076 0.7066 -6.9576 21.0662)" width="1.867" x="20.99" y="8.434"/>
+<path d="M0,19.083c0.012-0.181,0.336-3.851,3.299-4.164c0.681-0.015,1.499-0.357,1.499-1.27v-0.23c0-0.101-0.045-0.196-0.122-0.258  C3.674,12.389,3,11.094,3,9.5c0-2.275,1.345-3.417,3-3.417c1.653,0,3,1.142,3,3.417c0,1.594-0.675,2.889-1.679,3.661  c-0.075,0.062-0.122,0.157-0.122,0.258v0.23c0,1.005,0.981,1.27,1.5,1.27c2.965,0.313,3.286,3.983,3.301,4.164H0z"/>
+<path d="M12.841,13.083l-1.519-1.519c-0.566-0.566-0.879-1.32-0.879-2.121s0.313-1.555,0.879-2.121  c0.462-0.462,1.051-0.744,1.686-0.836C13.621,5.721,14,4.694,14,3.5c0-2.275-1.347-3.417-3-3.417c-1.655,0-3,1.142-3,3.417  c0,1.594,0.674,2.889,1.676,3.661c0.077,0.062,0.122,0.157,0.122,0.258v0.23c0,0.093-0.014,0.175-0.029,0.256  C9.908,8.378,10,8.899,10,9.5c0,1.365-0.431,2.614-1.198,3.583H12.841z"/>
+<path d="M23.531,15.289C24.439,13.98,25,12.238,25,10.481C25,6.905,22.757,4,20,4c-1.889,0-3.535,1.363-4.386,3.371L23.531,15.289z"/>
+<path d="M17.872,18.114c-0.349,0.942-1.434,1.322-2.374,1.343C10.561,19.949,10.02,25.716,10,26h15.758L17.872,18.114z"/>
+<path d="M29.707,24.293c0.391,0.391,0.391,1.023,0,1.414l0,0c-0.391,0.391-1.023,0.391-1.414,0L12.736,10.15  c-0.391-0.391-0.391-1.023,0-1.414l0,0c0.391-0.391,1.024-0.391,1.415,0L29.707,24.293z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_edit.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_edit.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_edit.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M25.502,4.497c-3.124-3.124-6.923-4.391-8.485-2.828c-0.001,0.001-0.002,0.002-0.003,0.003L2.871,15.814l-0.008,0.07l0,0  l-0.019,0.173L1.489,28.445l-0.032,0.097l0.098-0.032l12.595-1.415l0.542-0.539c0,0,0,0,0-0.001l13.635-13.569  c0.001-0.001,0.002-0.002,0.004-0.003C29.893,11.42,28.626,7.621,25.502,4.497z M7.257,25.857l-3.13-3.131l0.656-5.995l0.082-0.082  c1.639,0.432,3.549,1.566,5.266,3.282c1.665,1.665,2.781,3.512,3.241,5.117l-0.137,0.137L7.257,25.857z M26.916,11.568  l-12.15,12.093c-0.459-1.606-1.575-3.456-3.241-5.123c-1.708-1.709-3.617-2.856-5.253-3.295L18.428,3.086  c0.355-0.355,2.922,0.087,5.66,2.825S27.269,11.216,26.916,11.568z"/>
+<path d="M28.85,8.575l-7.072-7.071c-0.78-0.78-2.047-0.78-2.828,0L6.222,14.232l9.899,9.899L28.85,11.403  C29.631,10.623,29.631,9.356,28.85,8.575z"/>
+<path d="M4.986,15.825c-0.014,0.043-0.04,0.079-0.051,0.123l-1.824,7.902l3.393,3.391l7.902-1.823  c0.044-0.011,0.08-0.037,0.123-0.05L4.986,15.825z"/>
+<polygon points="2.686,24.839 0.564,26.96 4.101,29.082 5.516,27.667 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="29,7.309,29,1.119,1,1.119,1,28.87,29,28.88,29,22.68,7.012,22.68,7.012,18.01,23.77,18.01,23.77,11.99,7.012,11.99,7.012,7.309"/>
+<polygon points="29,7.309 29,1.119 1,1.119 1,28.873 29,28.881 29,22.682 7.012,22.682 7.012,18.008 23.771,18.008 23.771,11.989   7.012,11.989 7.012,7.309 "/>
 <rect fill="none" height="30" width="30"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_attach.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_attach.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_attach.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="9.647,24.81,9.653,24.81,8.141,22.38,5.279,22.38,9.481,29.1,11.52,27.82,10.82,26.68"/>
-<polygon points="10.49,22.38,12.01,24.81,16.13,24.81,14.62,22.38"/>
-<polygon points="16.97,22.38,18.48,24.81,22.63,24.81,21.12,22.38"/>
-<polygon points="23.47,22.38,24.72,24.4,24.72,22.38"/>
-<polygon points="23.47,22.38,24.72,24.4,24.72,22.38"/>
-<polygon points="20.3,17.36,21.81,19.8,24.72,19.8,20.52,13.07,18.45,14.36,20.32,17.36"/>
-<polygon points="19.46,19.8,17.95,17.36,13.86,17.36,15.37,19.8"/>
-<polygon points="13.02,19.8,11.51,17.36,7.38,17.36,8.891,19.8"/>
-<polygon points="5.279,17.76,5.279,19.8,6.541,19.8"/>
-<polygon points="5.279,17.76,5.279,19.8,6.541,19.8"/>
-<polygon points="20.33,3.264,20.33,0.895,9.633,0.895,9.633,11.51,20.33,11.51,20.33,9.141,11.93,9.141,11.93,7.354,18.34,7.354,18.34,5.051,11.93,5.051,11.93,3.264"/>
-<polygon points="20.33,3.264,20.33,0.895,9.633,0.895,9.633,11.51,20.33,11.51,20.33,9.141,11.93,9.141,11.93,7.354,18.34,7.354,18.34,5.051,11.93,5.051,11.93,3.264"/>
 <rect fill="none" height="30" width="30"/>
+<polygon points="9.646,24.812 9.652,24.812 8.14,22.379 5.278,22.379 9.48,29.105 11.522,27.824 10.816,26.685 "/>
+<polygon points="10.491,22.377 12.007,24.812 16.132,24.812 14.617,22.377 "/>
+<polygon points="16.97,22.377 18.484,24.812 22.627,24.812 21.114,22.377 "/>
+<polygon points="23.466,22.377 24.721,24.395 24.721,22.377 "/>
+<polygon points="20.299,17.36 21.813,19.795 24.718,19.795 20.518,13.068 18.452,14.359 20.322,17.36 "/>
+<polygon points="19.461,19.795 17.949,17.36 13.859,17.363 15.372,19.795 "/>
+<polygon points="13.021,19.795 11.511,17.363 7.379,17.363 8.89,19.797 "/>
+<polygon points="5.278,17.764 5.278,19.797 6.54,19.797 "/>
+<polygon points="20.334,3.263 20.334,0.895 9.632,0.895 9.632,11.509 20.334,11.509 20.334,9.14 11.929,9.14 11.929,7.353   18.337,7.353 18.337,5.05 11.929,5.05 11.929,3.263 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_context.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_context.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_context.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="24.72,22.38,5.279,22.38,9.481,29.1,11.55,27.82,9.671,24.81,9.683,24.81,9.683,24.81,24.72,24.81"/>
-<polygon points="20.52,13.07,18.45,14.36,20.32,17.36,5.279,17.36,5.279,19.8,24.72,19.8"/>
-<polygon points="20.34,3.263,20.34,0.895,9.633,0.895,9.633,11.51,20.34,11.51,20.34,9.14,11.93,9.14,11.93,7.353,18.34,7.353,18.34,5.051,11.93,5.051,11.93,3.263"/>
 <rect fill="none" height="30" width="30"/>
+<polygon points="24.722,22.377 5.279,22.379 9.481,29.105 11.546,27.816 9.671,24.813 9.683,24.813 9.683,24.813 24.722,24.813 "/>
+<polygon points="20.519,13.068 18.453,14.359 20.323,17.361 5.279,17.362 5.279,19.797 24.719,19.795 "/>
+<polygon points="20.335,3.263 20.335,0.895 9.633,0.895 9.633,11.509 20.335,11.509 20.335,9.14 11.93,9.14 11.93,7.353   18.338,7.353 18.338,5.051 11.93,5.051 11.93,3.263 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_multipdp.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_multipdp.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_multipdp.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="20.52,13.03,18.46,14.32,20.32,17.33,17.27,17.33,14.59,13.03,12.52,14.32,14.39,17.33,5.279,17.33,5.279,19.76,24.72,19.76"/>
-<polygon points="9.48,29.07,11.55,27.78,9.68,24.78,12.73,24.78,15.41,29.07,17.48,27.78,15.6,24.78,24.72,24.78,24.72,22.34,5.279,22.34"/>
-<polygon points="20.34,3.297,20.34,0.928,9.633,0.928,9.633,11.54,20.34,11.54,20.34,9.175,11.93,9.175,11.93,7.387,18.34,7.387,18.34,5.085,11.93,5.085,11.93,3.297"/>
 <rect fill="none" height="30" width="30"/>
+<polygon points="20.521,13.034 18.455,14.324 20.324,17.328 17.271,17.328 14.59,13.034 12.523,14.324 14.394,17.328 5.279,17.328   5.279,19.762 24.722,19.761 "/>
+<polygon points="9.48,29.072 11.547,27.783 9.68,24.779 12.729,24.779 15.409,29.072 17.475,27.783 15.604,24.779 24.722,24.779   24.722,22.344 5.279,22.345 "/>
+<polygon points="20.336,3.297 20.336,0.928 9.633,0.928 9.633,11.544 20.336,11.544 20.336,9.175 11.931,9.175 11.931,7.387   18.34,7.387 18.34,5.085 11.931,5.085 11.931,3.297 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_suspended.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_suspended.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_suspended.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="24.72,22.28,24.72,24.72,20.32,24.72,20.32,24.72,14.34,24.72,16.38,22.28"/>
-<polygon points="5.279,22.28,10.58,22.28,8.524,24.72,5.279,24.72"/>
-<polygon points="24.72,17.27,24.72,19.7,18.53,19.7,20.56,17.27"/>
-<polygon points="5.279,19.7,5.279,17.27,14.8,17.27,12.75,19.7"/>
-<polygon points="21.42,14.55,21.5,14.61,21.45,14.67,10.38,27.86,9.381,29.05,7.515,27.48,8.938,25.79,19.63,13.04"/>
-<polygon points="20.34,3.321,20.34,0.952,9.633,0.952,9.633,11.57,20.34,11.57,20.34,9.199,11.93,9.199,11.93,7.411,18.34,7.411,18.34,5.109,11.93,5.109,11.93,3.321"/>
 <rect fill="none" height="30" width="30"/>
+<polygon points="24.722,22.285 24.722,24.719 20.315,24.719 20.317,24.719 14.341,24.719 16.375,22.285 "/>
+<polygon points="5.279,22.283 10.576,22.283 8.524,24.719 5.279,24.719 "/>
+<polygon points="24.722,17.268 24.722,19.702 18.53,19.702 20.564,17.268 "/>
+<polygon points="5.279,19.699 5.279,17.268 14.804,17.268 12.753,19.702 "/>
+<polygon points="21.421,14.546 21.5,14.607 21.448,14.668 10.38,27.857 9.381,29.049 7.515,27.482 8.938,25.787 19.631,13.043 "/>
+<polygon points="20.336,3.321 20.336,0.952 9.633,0.952 9.633,11.567 20.336,11.567 20.336,9.199 11.931,9.199 11.931,7.411   18.34,7.411 18.34,5.109 11.931,5.109 11.931,3.321 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_end_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_end_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_end_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M28.91,18.24l-7.671-2.057c-0.341-0.139-0.547-0.472-0.461-0.798l0.571-2.261c-0.002,0.001-0.008,0.001-0.01,0.001,0.001-0.001,0.002-0.002,0.002-0.003-1.125-0.355-3.859-0.922-5.933-0.923-2.159,0.001-4.325,0.161-6.604,0.766,0,0-0.009,0.002-0.012,0.002,0.006,0.007,0.012,0.013,0.017,0.02l0.648,2.953c0.081,0.374-0.194,0.738-0.608,0.816l-7.822,1.486c-0.412,0.076-0.811-0.162-0.891-0.537,0,0-0.068-0.325-0.126-1.224-0.001,0-0.001,0-0.001-0.002-0.031-0.489,0.042-0.586,0.092-1.13,0.043-0.466,0.126-0.885,0.219-1.254,0-0.001-0.003-0.003-0.002-0.005,0.019-0.074,0.039-0.145,0.059-0.216,0.002-0.009,0.005-0.018,0.006-0.025,0.203-0.72,0.43-1.17,0.43-1.17,0.338-0.572,1.855-2.187,3.813-3.068,1.239-0.572,5.882-1.621,10.09-1.622,4.205-0.001,9.565,1.174,11.44,2.178s2.946,2.212,3.165,2.671,0.59,1.164,0.658,2.688c0.023,0.509,0.037,0.543-0.01,1.002,0,0.003-0.003,0.004-0.003,0.007v-0.007c-0.094,0.907-0.161,1.243-0.161,1.243-0.1,0.36-0.5,0.56-0.9,0.46z"/>
+</g>
+<path d="M28.908,18.236l-7.671-2.057c-0.341-0.139-0.547-0.473-0.461-0.799l0.571-2.26c-0.002,0-0.008,0-0.01,0  c0.001,0,0.002-0.002,0.002-0.002c-1.125-0.355-3.859-0.922-5.933-0.924c-2.159,0.002-4.325,0.162-6.604,0.766  c0,0-0.009,0.002-0.012,0.002c0.006,0.008,0.012,0.014,0.017,0.02l0.648,2.953c0.081,0.375-0.194,0.738-0.608,0.816l-7.822,1.486  c-0.412,0.076-0.811-0.162-0.891-0.537c0,0-0.068-0.324-0.126-1.223l-0.001-0.002c-0.031-0.49,0.042-0.586,0.092-1.131  c0.043-0.465,0.126-0.885,0.219-1.254c0,0-0.003-0.002-0.002-0.004c0.019-0.074,0.039-0.145,0.059-0.217  c0.002-0.008,0.005-0.018,0.006-0.025c0.203-0.719,0.43-1.17,0.43-1.17c0.338-0.572,1.855-2.186,3.813-3.068  C5.867,9.049,10.514,8,14.718,8c4.205-0.002,9.565,1.174,11.438,2.178s2.946,2.211,3.165,2.67c0,0,0.59,1.164,0.658,2.688  c0.023,0.51,0.037,0.543-0.01,1.002l-0.003,0.004v-0.004c-0.094,0.908-0.161,1.244-0.161,1.244  C29.71,18.139,29.308,18.344,28.908,18.236z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_enter.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_enter.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_enter.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g>
 <rect fill="none" height="30" width="30"/>
-<polygon points="24,8,24,16,10,16,10,12,1,18,10,24,10,20,28,20,28,8"/>
+</g>
+<path d="M27,7c-1.104,0-2,0.896-2,2v6H11v-3c0-0.375-0.209-0.718-0.542-0.889C10.313,11.037,10.156,11,10,11  c-0.205,0-0.408,0.063-0.581,0.186l-7,5.001C2.156,16.374,2,16.678,2,17c0,0.323,0.156,0.626,0.419,0.814l7,5  C9.592,22.938,9.795,23,10,23c0.156,0,0.313-0.037,0.457-0.111C10.791,22.718,11,22.375,11,22v-3h16c1.104,0,2-0.896,2-2V9  C29,7.896,28.104,7,27,7z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exit.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exit.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exit.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="26.314,6.515 23.485,3.686 15,12.171 6.515,3.686 3.687,6.515 12.172,15 3.687,23.485 6.515,26.313 15,17.828   23.485,26.313 26.314,23.485 17.828,15 "/>
+<path d="M17.827,15l7.072-7.072c0.781-0.779,0.781-2.047,0-2.828c-0.78-0.779-2.047-0.779-2.828,0.002L15,12.173L7.929,5.102  C7.148,4.32,5.882,4.32,5.101,5.1C4.32,5.881,4.32,7.148,5.102,7.928L12.174,15l-7.072,7.072C4.32,22.852,4.32,24.119,5.101,24.9  c0.781,0.779,2.048,0.779,2.828-0.002L15,17.827l7.071,7.071c0.781,0.781,2.048,0.781,2.828,0.002c0.781-0.781,0.781-2.049,0-2.828  L17.827,15z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_expand.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_expand.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_expand.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<path d="M2,2v26h26v-26h-26zm23,23h-20v-20h20v20z"/>
-<polygon points="13,22,17,22,17,17,22,17,22,13,17,13,17,8,13,8,13,13,8,13,8,17,13,17"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-2 -2 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M24,0H2C0.896,0,0,0.896,0,2v22c0,1.104,0.896,2,2,2h22c1.104,0,2-0.896,2-2V2C26,0.896,25.104,0,24,0z M20,15h-5v5h-4v-5H6  v-4h5V6h4v5h5V15z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exposure.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exposure.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exposure.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M3,3v24h24v-24h-24zm21,18h-9v-3h9v3zm-18,3v-18h18l-18,18z"/>
-<rect height="3" width="9" x="7" y="10"/>
-<rect height="9" width="3" x="10" y="7"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<path d="M26,2H4C2.896,2,2,2.896,2,4v22c0,1.104,0.896,2,2,2h22c1.104,0,2-0.896,2-2V4C28,2.896,27.104,2,26,2z M25,21  c0,0.553-0.447,1-1,1h-7c-0.553,0-1-0.447-1-1v-1c0-0.553,0.447-1,1-1h7c0.553,0,1,0.447,1,1V21z M5,25V5h20L5,25z"/>
+<path d="M7,12h2v2c0,0.553,0.447,1,1,1h1c0.553,0,1-0.447,1-1v-2h2c0.553,0,1-0.448,1-1v-1c0-0.552-0.447-1-1-1h-2V7  c0-0.552-0.447-1-1-1h-1C9.447,6,9,6.448,9,7v2H7c-0.553,0-1,0.448-1,1v1C6,11.552,6.447,12,7,12z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<polygon points="4,10,4,5,11,5,11,2,1,2,1,10"/>
-<polygon points="4,20,1,20,1,28,11,28,11,25,4,25"/>
-<polygon points="26,10,29,10,29,2,19,2,19,5,26,5"/>
-<polygon points="26,20,26,25,19,25,19,28,29,28,29,20"/>
-<path d="M8.006,22.35l-0.006,1.2h14l-0.006-1.205s-4.371-2.604-4.81-4.053c-0.019-0.061-0.04-0.121-0.044-0.178v-0.738c0.001-0.023,0.001-0.059,0.001-0.072,0.819-0.553,1.394-1.201,1.824-2.049,0.8-1.568,0.372-5.262,0.372-5.262,0-1.635-2.173-3.549-3.827-3.549h-1.049c-1.654,0-3.831,1.914-3.831,3.549,0,0-0.38,3.676,0.368,5.256,0.411,0.865,1.002,1.504,1.841,2.055,0.003,0.113,0.009,0.699,0.002,0.811-0.005,0.076-0.032,0.156-0.061,0.238h0.018c-0.53,1.46-4.784,4-4.784,4z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-1 -2 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<polygon points="2,8 2,2.086 10,2.086 10,0 0,0 0,8 "/>
+<polygon points="2,18 0,18 0,26 10,26 10,24.086 2,24.086 "/>
+<polygon points="26,8 28,8 28,0 18,0 18,2.086 26,2.086 "/>
+<polygon points="26,18 26,24.086 18,24.086 18,26 28,26 28,18 "/>
+<path d="M6,22c0.016-0.232,0.448-4.951,4.398-5.354c0.908-0.02,1.999-0.459,1.999-1.633v-0.297c0-0.129-0.06-0.252-0.163-0.33  C10.898,13.393,10,11.352,10,9.303C10,6.377,11.794,4,14,4s4,2.377,4,5.303c0,2.049-0.898,4.09-2.238,5.084  c-0.101,0.078-0.162,0.201-0.162,0.33v0.297c0,1.291,1.31,1.633,1.999,1.633C21.553,17.049,21.982,21.768,22,22H6z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<path d="M10.93,15.08c0.023,0.059,0.044,0.121,0.07,0.175,0.411,0.865,1.002,1.503,1.841,2.054,0.003,0.113,0.009,0.699,0.002,0.811-0.005,0.076-0.032,0.156-0.061,0.238h0.018c-0.539,1.459-4.793,3.992-4.793,3.992l-0.007,1.2h11.4l-8.47-8.47z"/>
-<path d="M19.1,14.95c0.617-1.695,0.24-4.953,0.24-4.953,0-1.635-2.173-3.549-3.827-3.549h-1.049c-0.86,0-1.854,0.521-2.618,1.248l7.26,7.254z"/>
-<polygon points="4,20,1,20,1,28,11,28,11,25,4,25"/>
-<polygon points="26,10,29,10,29,2,19,2,19,5,26,5"/>
-<polygon points="9.148,5,11,5,11,2,6.148,2"/>
-<polygon points="1,5.148,1,10,4,10,4,8.148"/>
-<polygon points="29,24.85,29,20,26,20,26,21.85"/>
-<polygon points="20.85,25,19,25,19,28,23.85,28"/>
-<rect height="35.83" transform="matrix(0.7061 -0.7082 0.7082 0.7061 -6.212 15.0307)" width="1.867" x="14.07" y="-2.915"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-1 -2 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<polygon points="2,18 0,18 0,26 10,26 10,24.086 2,24.086 "/>
+<polygon points="26,8 28,8 28,0 18,0 18,2.086 26,2.086 "/>
+<polygon points="28,22.85 28,18 26,18 26,20.85 "/>
+<polygon points="20.939,24.086 18,24.086 18,26 22.854,26 "/>
+<path d="M17.386,12.236C17.776,11.346,18,10.326,18,9.303C18,6.377,16.206,4,14,4c-1.204,0-2.273,0.724-3.007,1.843L17.386,12.236z"/>
+<path d="M12.327,15.474c-0.247,0.828-1.152,1.156-1.929,1.173C6.448,17.049,6.016,21.768,6,22h12.854L12.327,15.474z"/>
+<polygon points="7.235,2.086 10,2.086 10,0 5.149,0 "/>
+<polygon points="0,3.146 0,8 2,8 2,5.146 "/>
+<path d="M26.693,24.372c0.389,0.389,0.41,1.006,0.048,1.369s-0.978,0.342-1.366-0.047L1.307,1.625  C0.918,1.236,0.896,0.621,1.26,0.258s0.979-0.341,1.367,0.048L26.693,24.372z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_failed.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_failed.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_failed.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="30" width="30"/>
-<path d="M23.041,9.079L9.08,23.041C10.74,24.266,12.783,25,15,25c5.514,0,10-4.486,10-10  C25,12.783,24.266,10.739,23.041,9.079z" fill="none"/>
-<path d="M20.92,6.958C19.26,5.733,17.217,4.999,15,4.999C9.486,4.999,5,9.485,5,15c0,2.216,0.733,4.26,1.958,5.919  L20.92,6.958z" fill="none"/>
-<path d="M15,1.999C7.82,1.999,2,7.819,2,15c0,7.18,5.82,13,13,13s13-5.82,13-13C28,7.819,22.18,1.999,15,1.999z M15,4.999  c2.217,0,4.26,0.734,5.92,1.959L6.958,20.919C5.733,19.26,5,17.216,5,15C5,9.485,9.486,4.999,15,4.999z M15,25  c-2.217,0-4.26-0.734-5.92-1.959L23.041,9.079C24.266,10.739,25,12.783,25,15C25,20.514,20.514,25,15,25z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-2 -2 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M13,0C5.832,0,0,5.832,0,13s5.832,13,13,13s13-5.832,13-13S20.168,0,13,0z M13,4c1.758,0,3.395,0.515,4.782,1.39  L5.39,17.782C4.514,16.395,4,14.758,4,13C4,8.037,8.037,4,13,4z M13,22c-1.758,0-3.395-0.515-4.782-1.39L20.611,8.218  C21.486,9.605,22,11.242,22,13C22,17.963,17.963,22,13,22z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<polygon points="15,22.9 7,27 8.5,18.316 2,12 10.982,10.9 15,3 19.018,10.9 28,12 21.5,18.316 23,27 "/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-1 -1 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M22.357,27c-0.208,0-0.416-0.064-0.592-0.193L14,21.103l-7.765,5.704C6.059,26.936,5.852,27,5.643,27  s-0.418-0.065-0.595-0.196c-0.353-0.261-0.493-0.721-0.349-1.135l3.174-9.044l-7.471-5.563c-0.346-0.258-0.487-0.708-0.352-1.117  C0.187,9.536,0.568,9.259,1,9.259h9.217l2.826-8.571C13.176,0.281,13.553,0.005,13.98,0c0.004,0,0.008,0,0.012,0  c0.177,0,0.345,0.047,0.492,0.13c0.219,0.115,0.392,0.311,0.473,0.558l2.826,8.571H27c0.432,0,0.813,0.277,0.949,0.686  c0.136,0.409-0.006,0.859-0.352,1.116l-7.471,5.564l3.174,9.044c0.146,0.414,0.004,0.874-0.349,1.135  C22.775,26.935,22.566,27,22.357,27L22.357,27z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites_remove.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites_remove.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites_remove.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-</g>
-<path d="M22.5,13c0.749,0,1.475,0.096,2.174,0.261L27,11l-8.982-1.1L14,2L9.982,9.9L1,11l6.5,6.316L6,26l7.004-3.59  C13.053,17.214,17.292,13,22.5,13z"/>
-<path d="M22.5,15c-4.136,0-7.5,3.364-7.5,7.5s3.364,7.5,7.5,7.5s7.5-3.364,7.5-7.5S26.636,15,22.5,15z M22.5,28  c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5s5.5,2.468,5.5,5.5S25.533,28,22.5,28z"/>
-<rect height="3" width="9" x="18" y="21"/>
+<path d="M14.177,21.23C15.001,17.113,18.643,14,23,14c0.206,0,0.407,0.017,0.609,0.031l3.988-2.971  c0.346-0.258,0.487-0.707,0.352-1.117C27.813,9.535,27.432,9.258,27,9.258h-9.217l-2.825-8.572  c-0.082-0.246-0.255-0.441-0.474-0.557C14.338,0.046,14.169,0,13.992,0c-0.004,0-0.008,0-0.012,0  c-0.428,0.004-0.804,0.281-0.938,0.686l-2.826,8.572H1c-0.431,0-0.813,0.277-0.949,0.686c-0.136,0.41,0.006,0.859,0.352,1.117  l7.471,5.563l-3.174,9.044c-0.145,0.414-0.004,0.875,0.35,1.135C5.225,26.934,5.434,27,5.644,27c0.208,0,0.415-0.064,0.592-0.194  L14,21.102L14.177,21.23z"/>
+<path d="M23,16c-3.865,0-7,3.135-7,7c0,3.867,3.135,7,7,7s7-3.133,7-7C30,19.135,26.865,16,23,16z M18,24v-2h10v2H18z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_filter.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_filter.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_filter.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,5 +4,5 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M23.663,4.066L25,2H3l9,13.91V29l4-3V15.909L18.529,12H23c2.209,0,4-1.791,4-4  C27,6.018,25.555,4.384,23.663,4.066z M21.323,4l-2.588,4H9.265L6.676,4H21.323z M23,10h-3.177l2.589-4H23c1.103,0,2,0.897,2,2  S24.103,10,23,10z" fill-rule="evenodd"/>
+<path d="M23.662,4.067l0.252-0.388C24.512,2.756,24.1,2,23,2H5  C3.9,2,3.488,2.756,4.086,3.679L12,15.91V29l4-3V15.909L18.529,12H23c2.209,0,4-1.791,4-4C27,6.018,25.555,4.384,23.662,4.067z   M9.264,8l-1.94-3h13.353l-1.94,3H9.264z M23,10h-3.176l2.588-4H23c1.103,0,2,0.897,2,2S24.103,10,23,10z" fill-rule="evenodd"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="18.21,20.57,21.18,10.92,13.57,10.92,15.86,3.5,11.4,3.5,8.436,13.15,16.04,13.15,13.76,20.57,10.43,20.57,16,26.5,21.56,20.57"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
+</g>
+<path d="M21,21h-2.869L22,10h-8.639l3.179-9h-5.302L7,13h8.639l-2.811,8H10c-0.396,0-0.756,0.234-0.916,0.598  c-0.159,0.363-0.089,0.785,0.179,1.078l5.5,6C14.952,28.883,15.22,29,15.5,29s0.548-0.117,0.737-0.324l5.5-6  c0.268-0.293,0.338-0.715,0.179-1.078C21.756,21.234,21.396,21,21,21z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_charging.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_charging.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_charging.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M1,14v15h11v-15h-11zm8,12h-5v-9h5v9z"/>
-<rect height="2" width="5" x="4" y="11"/>
-<polygon points="24.13,21,28,10,19.36,10,22.54,1,17.24,1,13,13,21.64,13,18.83,21,14,21,21.5,29,29,21"/>
+</g>
+<path d="M9,12c0-0.552-0.448-1-1-1H5c-0.553,0-1,0.448-1,1v1h5V12z"/>
+<path d="M10,14H9H4H3c-1.104,0-2,0.896-2,2v11c0,1.104,0.896,2,2,2h7c1.104,0,2-0.896,2-2V16C12,14.896,11.104,14,10,14z M9,20H4v-3  h5V20z"/>
+<path d="M27,21h-2.869L28,10h-8.639l3.179-9h-5.302L13,13h8.639l-2.811,8H16c-0.396,0-0.756,0.234-0.916,0.598  c-0.159,0.363-0.089,0.785,0.179,1.078l5.5,6C20.952,28.883,21.22,29,21.5,29s0.548-0.117,0.737-0.324l5.5-6  c0.268-0.293,0.338-0.715,0.179-1.078C27.756,21.234,27.396,21,27,21z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,9 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="35.83" transform="matrix(0.7061 -0.7082 0.7082 0.7061 -6.248 14.9445)" width="1.867" x="13.94" y="-2.915"/>
-<polygon points="19.84,15.81,21.88,10,14.03,10"/>
-<polygon points="13.44,9.416,16.42,1,11.12,1,9.527,5.499"/>
-<polygon points="7.362,11.63,6.878,13,8.732,13"/>
-<polygon points="13.75,18.02,12.71,21,7.878,21,15.38,29,19.9,24.17"/>
+<polygon points="19.957,15.808 22,10 14.15,10 "/>
+<polygon points="13.567,9.417 16.54,1 11.238,1 9.648,5.5 "/>
+<polygon points="7.484,11.63 7,13 8.854,13 "/>
+<path d="M13.875,18.021L12.828,21H10c-0.396,0-0.756,0.234-0.916,0.598c-0.159,0.363-0.089,0.785,0.179,1.078l5.5,6  C14.952,28.883,15.22,29,15.5,29s0.548-0.117,0.737-0.324l3.966-4.326L13.875,18.021z"/>
+<path d="M27.693,26.372c0.389,0.389,0.41,1.005,0.048,1.368c-0.362,0.362-0.978,0.343-1.366-0.046L2.307,3.625  C1.918,3.236,1.896,2.621,2.26,2.258c0.363-0.363,0.979-0.341,1.367,0.048L27.693,26.372z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_folder.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_folder.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_folder.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,5 +4,6 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M14,6v-3h-12v22h26v-19h-14zm11,16h-20v-16h6v3h14v13z"/>
+<path d="M3,8h24c0.732,0,1.409,0.211,2,0.557V7c0-1.105-0.896-2-2-2H13.028c-0.505-0.031-0.757-0.32-0.873-0.535L12,4  c-0.416-1.146-1.125-2-2.459-2H3C1.896,2,1,2.895,1,4v4.557C1.591,8.211,2.268,8,3,8z"/>
+<path d="M29,24c0,1.104-0.896,2-2,2H3c-1.104,0-2-0.896-2-2V12c0-1.105,0.896-2,2-2h24c1.104,0,2,0.895,2,2V24z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="5,26,16,15,5,4"/>
-<polygon points="27,15,16,4,16,15,16,26"/>
+<path d="M17,26c0.561,0,1.107-0.236,1.495-0.672l8-9c0.673-0.758,0.673-1.898,0-2.656l-8-9C18.107,4.236,17.561,4,17,4  c-0.238,0-0.479,0.043-0.711,0.131C15.514,4.426,15,5.17,15,6v18c0,0.83,0.514,1.574,1.289,1.869C16.521,25.957,16.762,26,17,26  L17,26z"/>
+<path d="M5,26c0.561,0,1.107-0.236,1.495-0.672l8-9c0.673-0.758,0.673-1.898,0-2.656l-8-9C6.107,4.236,5.561,4,5,4  C4.762,4,4.521,4.043,4.289,4.131C3.514,4.426,3,5.17,3,6v18c0,0.83,0.514,1.574,1.289,1.869C4.521,25.957,4.762,26,5,26L5,26z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_email.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_email.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_email.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M15,25v-1.232c-5.504-0.278-8.264-3.418-8.264-9.434,0-2.825,0.818-5.033,2.454-6.624s3.762-2.386,6.378-2.386c2.479,0,4.391,0.754,5.735,2.263s2.017,3.648,2.017,6.419c0,0.165-0.014,0.313-0.019,0.471l2.437,1.827c0.158-0.74,0.262-1.54,0.262-2.448,0-3.427-0.909-6.093-2.728-7.998s-4.41-2.862-7.77-2.862c-3.372,0-6.157,1.019-8.354,3.056s-3.295,4.842-3.295,8.415c0,3.746,1.068,6.629,3.206,8.647,2.072,1.957,4.843,2.957,8.298,3.017-0.23-0.33-0.36-0.72-0.36-1.14z"/>
-<path d="M11.28,10.23c-1.321,1.386-1.982,3.295-1.982,5.729,0,1.567,0.374,2.805,1.121,3.712s1.668,1.36,2.762,1.36c0.696,0,1.301-0.146,1.824-0.423v-1.61c0-0.205,0.04-0.398,0.097-0.584-0.274,0.314-0.593,0.484-0.964,0.484-0.61,0-1.03-0.246-1.258-0.738s-0.342-1.271-0.342-2.338c0-1.695,0.333-3.04,0.998-4.033s1.472-1.49,2.42-1.49h0.848l-0.506,4.006c-0.195,1.513-0.44,2.6-0.729,3.307,0.36-0.38,0.87-0.62,1.43-0.62h2.416c-0.013-0.217-0.02-0.451-0.02-0.711,0-1.668,0.319-4.38,0.957-8.135h-3.787c-2.21-0.001-3.97,0.692-5.29,2.075z"/>
-<polygon points="30,22,22,16,22,19,17,19,17,25,22,25,22,28"/>
+<path d="M16.566,7.154c-2.215,0-3.98,0.693-5.298,2.078c-1.317,1.386-1.976,3.295-1.976,5.729c0,1.577,0.373,2.816,1.121,3.719  c0.747,0.902,1.668,1.354,2.762,1.354c0.811,0,1.511-0.189,2.099-0.567s1.142-1.06,1.661-2.044c0.181,0.64,0.466,1.164,0.854,1.578  H20c0-0.41,0.089-0.808,0.245-1.173c-0.102-0.035-0.204-0.069-0.274-0.125c-0.191-0.15-0.335-0.415-0.431-0.793  s-0.144-0.918-0.144-1.62c0-1.768,0.318-4.479,0.957-8.135H16.566z M16.293,13.307c-0.219,1.714-0.499,2.908-0.841,3.582  C15.11,17.563,14.67,17.9,14.133,17.9c-0.602,0-1.019-0.241-1.251-0.725c-0.232-0.482-0.349-1.267-0.349-2.352  c0-1.695,0.332-3.04,0.998-4.033c0.665-0.993,1.472-1.49,2.42-1.49h0.848L16.293,13.307z"/>
+<path d="M14,22.681c-2.132-0.263-3.802-1.008-4.994-2.251c-1.514-1.576-2.27-3.941-2.27-7.096c0-2.807,0.815-5.011,2.447-6.61  c1.631-1.6,3.755-2.399,6.371-2.399c2.488,0,4.404,0.754,5.749,2.263c1.345,1.509,2.017,3.648,2.017,6.419  c0,1.207-0.149,2.204-0.436,3.007C22.923,16.012,22.961,16,23,16c0.701,0,1.384,0.248,1.923,0.697l0.281,0.234  C25.727,15.829,26,14.479,26,12.855c0-3.436-0.912-6.104-2.734-8.005C21.442,2.95,18.854,2,15.5,2c-3.373,0-6.157,1.017-8.354,3.049  c-2.197,2.033-3.295,4.84-3.295,8.422c0,3.756,1.066,6.641,3.199,8.654c1.791,1.691,4.111,2.662,6.949,2.934V22.681z"/>
+<path d="M23,30c0.229,0,0.457-0.079,0.641-0.231l6-5C29.868,24.578,30,24.297,30,24s-0.132-0.578-0.359-0.768l-6-5  C23.457,18.079,23.229,18,23,18c-0.144,0-0.289,0.031-0.424,0.095C22.225,18.259,22,18.612,22,19v2h-5c-0.553,0-1,0.448-1,1v4  c0,0.553,0.447,1,1,1h5v2c0,0.389,0.225,0.741,0.576,0.906C22.711,29.969,22.856,30,23,30L23,30z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_msg.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_msg.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_msg.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M5.414,21l6.115-6.115,3.47,3.48v-0.36c0-1.104,0.896-2,2-2h0.355l1.115-1.115,1.11,1.12h0.41v-1l-0.822-0.822,5.82-5.825v6.395l3,2.25v-13h-26v20h13v-3h-9.586zm18.12-14l-8.53,8.53-8.527-8.53h17.05zm-18.53,1.355l5.822,5.822-5.82,5.82v-11.64z"/>
-<polygon points="30,21,22,15,22,18,17,18,17,24,22,24,22,27"/>
+<polygon points="8.268,16.727 0,9.819 0,23.547 "/>
+<path d="M0.127,7.319l11.307,9.449c0.461,0.354,0.908,0.555,1.402,0.566c0.021,0,0.093,0,0.113,0  c0.494-0.012,0.943-0.213,1.402-0.566l11.508-9.495C25.567,6.529,24.848,6,24,6H2C1.136,6,0.406,6.551,0.127,7.319z"/>
+<path d="M17,19h2.074l-2.129-1.779l-1.321,1.09c-0.882,0.681-1.724,1.002-2.627,1.023h-0.023h-0.138  c-0.948-0.021-1.791-0.342-2.621-0.98l-1.167-0.975l-8.907,7.348C0.433,25.472,1.152,26,2,26h12v-4C14,20.346,15.346,19,17,19z"/>
+<path d="M21.73,16.282C22.12,16.099,22.562,16,23,16c0.701,0,1.384,0.248,1.923,0.697L26,17.596V9.75l-8.271,6.824l2.316,1.935  C20.207,17.547,20.83,16.702,21.73,16.282z"/>
+<path d="M23,30c0.229,0,0.457-0.079,0.641-0.231l6-5C29.868,24.578,30,24.297,30,24s-0.132-0.578-0.359-0.768l-6-5  C23.457,18.079,23.229,18,23,18c-0.144,0-0.289,0.031-0.424,0.095C22.225,18.259,22,18.612,22,19v2h-5c-0.553,0-1,0.448-1,1v4  c0,0.553,0.447,1,1,1h5v2c0,0.389,0.225,0.741,0.576,0.906C22.711,29.969,22.856,30,23,30L23,30z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_genres.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_genres.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_genres.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M14.18,10.2c0.559,0,0.954,0.538,1.188,0.989l0.728,1.406-1.15,1.151,1.159,1.401c0.223,0.27,0.445,0.515,0.681,0.75,0.296,0.297,0.625,0.552,0.969,0.77-1.075,0.782-2.249,1.651-3.119,2.521-1.016,1.015-1.342,2.373-1.657,3.687-0.337,1.404-0.656,2.73-1.724,3.799-0.231,0.231-0.386,0.251-0.523,0.251-1.333,0-3.588-2.265-4.55-3.231l-0.214-0.21-0.206-0.21c-0.966-0.961-3.227-3.213-3.229-4.546,0-0.139,0.019-0.294,0.249-0.524,1.069-1.067,2.397-1.387,3.802-1.724,1.313-0.315,2.668-0.641,3.683-1.652,0.942-0.942,1.294-1.738,1.577-2.379,0.243-0.552,0.42-0.95,1.1-1.631,0.39-0.4,0.84-0.63,1.22-0.63m13.68-8.421l-5.897,2.418s0.26,0.99-0.418,1.669l-4.405,4.405c-0.736-1.422-1.833-2.07-2.964-2.07-0.918,0-1.857,0.427-2.644,1.213-1.79,1.79-1.242,2.575-2.677,4.009-1.437,1.434-4.917,0.813-7.483,3.376-2.566,2.568,1.433,6.354,3.185,8.105,1.347,1.348,3.896,4.022,6.169,4.022,0.685,0,1.344-0.243,1.938-0.837,2.565-2.565,1.941-6.048,3.38-7.483,1.433-1.434,4.124-3.1,4.9-3.874,0.359-0.358,0.688-0.977,0.091-0.995-0.632-0.019-2.012-0.424-2.84-1.252-0.204-0.204-0.386-0.407-0.554-0.61l6.291-6.293c0.849-0.842,2.048-0.861,2.157-0.861h0.008l3.549-4.117-1.8-0.83z"/>
-<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-</g>
+<path d="M27.77,1.428l-5.896,2.416c0,0,0.26,0.992-0.418,1.67l-4.406,4.404c-0.734-1.422-1.832-2.07-2.963-2.07  c-0.918,0-1.857,0.428-2.645,1.213c-1.789,1.791-1.242,2.576-2.676,4.008c-1.439,1.436-4.918,0.814-7.484,3.377  c-2.566,2.568,1.432,6.354,3.186,8.105c1.346,1.348,3.896,4.021,6.168,4.021c0.686,0.002,1.344-0.242,1.938-0.836  c2.566-2.566,1.941-6.047,3.381-7.482c1.432-1.434,4.123-3.1,4.9-3.875c0.357-0.357,0.688-0.977,0.09-0.996  c-0.631-0.018-2.012-0.422-2.84-1.25c-0.203-0.205-0.387-0.408-0.555-0.611l6.291-6.293c0.85-0.842,2.049-0.859,2.156-0.859  c0.006,0,0.008,0,0.008,0l3.551-4.117L27.77,1.428z M13,17.502c-1.105,0-2-0.896-2-2s0.895-2,2-2c1.104,0,2,0.896,2,2  S14.104,17.502,13,17.502z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="9.914" width="8" x="11" y="5"/>
-<rect height="2" width="12" x="9.041" y="2.021"/>
-<path d="M15,9.633c-4.417,0-8,4.198-8,9.375h16c0-5.18-3.58-9.377-8-9.377z"/>
-<rect height="14.25" width="2" x="14.02" y="13.77"/>
+</g>
+<path d="M19,2h-8C9.896,2,9,2.896,9,4h12C21,2.896,20.104,2,19,2z"/>
+<path d="M18.87,12H19V5h-8v7h0.13C8.668,13.364,7,15.986,7,19c0,0.553,0.447,1,1,1h6v8c0,0.553,0.447,1,1,1s1-0.447,1-1v-8h6  c0.553,0,1-0.447,1-1C23,15.986,21.332,13.364,18.87,12z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="2" width="12" x="9.041" y="2.021"/>
-<path d="M22.99,18.84c-0.051-3.396-1.641-6.347-3.99-7.942v-5.9h-8v1.852l11.99,11.99z"/>
-<path d="M8.87,13.02c-1.161,1.62-1.87,3.7-1.87,5.99h7.021v9.014h2v-7.85l-7.15-7.15z"/>
-<rect height="35.83" transform="matrix(0.7061 -0.7082 0.7082 0.7061 -6.2123 15.031)" width="1.867" x="14.07" y="-2.915"/>
+</g>
+<path d="M19,2h-8C9.896,2,9,2.896,9,4h12C21,2.896,20.105,2,19,2z"/>
+<path d="M19,5h-8v1.85l11.988,11.988c-0.059-2.944-1.701-5.499-4.117-6.838H19V5z"/>
+<path d="M7,19c0,0.553,0.448,1,1,1h6v8c0,0.553,0.447,1,1,1s1-0.447,1-1v-7.854l-6.719-6.719C7.875,14.868,7,16.828,7,19z"/>
+<path d="M27.694,26.373L3.628,2.307C3.239,1.918,2.624,1.896,2.261,2.259C1.897,2.621,1.919,3.236,2.308,3.625l24.068,24.07  c0.389,0.389,1.004,0.408,1.366,0.045S28.083,26.762,27.694,26.373z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_go.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_go.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_go.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="27,15,15,6,15,11,4,11,4,19,15,19,15,24"/>
+<path d="M26.316,13.494l-8-6.999C17.945,6.17,17.475,6,17,6c-0.28,0-0.563,0.059-0.827,0.18C15.459,6.504,15,7.217,15,8.002  L15.002,11H6c-1.104,0-2,0.896-2,2v4c0,1.104,0.896,2,2,2h9.007l0.002,3.002c0.001,0.784,0.46,1.496,1.175,1.82  C16.447,23.941,16.729,24,17.008,24c0.477,0,0.947-0.17,1.318-0.496l7.992-7C26.752,16.125,27,15.576,27,15  C27,14.423,26.751,13.875,26.316,13.494z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,7 +4,7 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="10" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -4.2124 42.9407)" width="6.001" x="3.787" y="17.34"/>
-<rect height="10" transform="matrix(0.7071 0.7071 -0.7071 0.7071 11.3431 -13.8113)" width="5.999" x="19.34" y="1.786"/>
-<polygon points="19.28,16.92,20.93,15.27,13.86,8.201,10.15,8.731,7.494,6.079,6.08,7.493,8.731,10.15,8.201,13.86,15.27,20.93,16.92,19.28,17.39,24.46,20.22,21.64,23.05,24.46,24.46,23.05,21.64,20.22,24.46,17.39"/>
+<path d="M27.748,3.707l-2.121-2.122c-0.781-0.781-2.047-0.781-2.828,0L16.436,7.95l4.949,4.95l6.363-6.364  C28.529,5.754,28.529,4.488,27.748,3.707z"/>
+<path d="M1.586,22.799c-0.781,0.781-0.781,2.047,0,2.828l2.121,2.121c0.781,0.781,2.047,0.781,2.828,0l6.364-6.363l-4.95-4.949  L1.586,22.799z"/>
+<path d="M23.506,19.264c0.268-0.268,0.361-0.664,0.242-1.023c-0.12-0.359-0.433-0.621-0.808-0.674l-2.97-0.424l0.707-0.707  c0.391-0.391,0.391-1.024,0-1.415l-6.364-6.364c-0.236-0.236-0.575-0.339-0.903-0.273L9.697,8.282L7.831,6.417  c-0.391-0.39-1.024-0.39-1.415,0c-0.39,0.391-0.39,1.024,0,1.415l1.866,1.865l0.101,3.714c-0.064,0.328,0.037,0.667,0.273,0.903  l6.365,6.364c0.39,0.391,1.023,0.391,1.414,0l0.707-0.707l0.424,2.969c0.054,0.376,0.314,0.688,0.674,0.809  c0.359,0.119,0.756,0.025,1.023-0.242l1.414-1.414l2.828,2.828l1.414-1.414l-2.828-2.828L23.506,19.264z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,11 +4,11 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="10" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -4.2124 42.9407)" width="6.001" x="3.787" y="17.343"/>
-<rect height="10" transform="matrix(0.7071 0.7071 -0.7071 0.7071 11.3431 -13.8113)" width="5.999" x="19.344" y="1.786"/>
-<polygon points="20.176,16.025 20.93,15.271 13.858,8.201 12.539,8.39 "/>
-<polygon points="23.004,18.854 24.465,17.394 21.251,17.102 "/>
-<polygon points="17.101,21.248 17.394,24.464 18.855,23.002 "/>
-<polygon points="8.39,12.537 8.201,13.857 15.272,20.929 16.027,20.174 "/>
-<rect height="35.827" transform="matrix(0.7063 -0.7079 0.7079 0.7063 -6.0767 14.6963)" width="1.868" x="13.74" y="-3.242"/>
+<path d="M27.748,3.707l-2.121-2.122c-0.781-0.781-2.047-0.781-2.828,0L16.436,7.95l4.949,4.95l6.363-6.364  C28.529,5.754,28.529,4.488,27.748,3.707z"/>
+<path d="M1.586,22.798c-0.781,0.781-0.781,2.048,0,2.829l2.121,2.121c0.781,0.781,2.047,0.781,2.828,0l6.364-6.364l-4.95-4.949  L1.586,22.798z"/>
+<path d="M23.459,19.31l0.047-0.047c0.268-0.268,0.361-0.664,0.242-1.023c-0.12-0.359-0.433-0.62-0.808-0.674l-1.428-0.203  L23.459,19.31z"/>
+<path d="M20.631,16.482l0.047-0.047c0.391-0.391,0.391-1.023,0-1.414l-6.364-6.364c-0.236-0.236-0.575-0.339-0.903-0.273  l-0.902-0.024L20.631,16.482z"/>
+<path d="M17.361,21.509l0.205,1.431c0.054,0.376,0.314,0.688,0.674,0.808c0.359,0.12,0.756,0.026,1.023-0.242l0.047-0.047  L17.361,21.509z"/>
+<path d="M8.359,12.505l0.023,0.905c-0.064,0.328,0.037,0.667,0.273,0.903l6.365,6.364c0.39,0.391,1.023,0.391,1.414,0l0.047-0.047  L8.359,12.505z"/>
+<path d="M27.693,26.373c0.389,0.389,0.41,1.004,0.048,1.367s-0.978,0.344-1.366-0.045L2.307,3.625  C1.918,3.236,1.896,2.621,2.26,2.258c0.363-0.363,0.979-0.341,1.367,0.048L27.693,26.373z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_group.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_group.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_group.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M24.155,14.925c-0.009-0.146,0-0.75,0.003-0.896c0.947-0.685,1.361-1.57,1.861-2.618c0.926-1.938,0.587-6.022,0.587-6.022  C26.606,3.367,24.183,1,22.269,1h-1.214c-1.253,0-2.89,1.015-3.874,2.282c2.34,0.791,4.678,3.135,4.758,5.621  c0.108,0.996,0.446,4.888-0.639,7.017c-0.438,0.86-0.994,1.603-1.683,2.243c0.582,0.637,2.014,1.676,4.27,3.099  c1.084,0.683,1.411,0.889,1.707,1.28L26,23.078V25h4v-5.72C30,19.28,24.273,16.909,24.155,14.925z"/>
-<path d="M4,23.073l0.407-0.536c0.296-0.391,0.622-0.597,1.704-1.277c2.242-1.411,3.67-2.445,4.261-3.083  c-0.731-0.662-1.288-1.417-1.714-2.314c-1.002-2.12-0.705-5.979-0.611-6.944c0.071-2.494,2.42-4.848,4.768-5.638  C11.827,2.014,10.188,1,8.936,1H7.722C5.807,1,3.38,3.367,3.38,5.388c0,0-0.29,4.066,0.575,6.022  c0.475,1.067,0.918,1.963,1.889,2.645c0.003,0.14,0.012,0.733,0.004,0.87C5.729,16.909,0,19.276,0,19.276V25h4V23.073z"/>
-<path d="M17.916,19.221L15,25.816l-2.915-6.596C10.631,21.049,6.253,23.413,6,23.746V29h18v-5.25  C23.747,23.416,19.369,21.05,17.916,19.221z"/>
-<path d="M12.557,17.34c0.003,0.128,0.01,0.794,0.002,0.921c-0.006,0.087-0.036,0.179-0.068,0.271h5.021  c-0.031-0.093-0.062-0.185-0.067-0.271c-0.009-0.135-0.001-0.784,0.001-0.921c0.931-0.628,1.583-1.365,2.073-2.328  c0.908-1.782,0.423-5.978,0.423-5.978c0-1.858-2.47-4.034-4.35-4.034h-1.191c-1.88,0-4.354,2.176-4.354,4.034  c0,0-0.431,4.175,0.419,5.972C10.932,15.988,11.604,16.714,12.557,17.34z"/>
+<path d="M10.299,17.467c0.053-0.006,0.277-0.016,0.332-0.021C9.006,15.738,8,13.139,8,10.48c0-3.686,1.954-6.82,4.67-7.988  C11.854,0.986,10.515,0,9,0C6.519,0,4.5,2.641,4.5,5.892c0,2.276,1.011,4.544,2.514,5.648c0.117,0.087,0.184,0.224,0.184,0.367  v0.329c0,1.305-1.227,1.793-2.249,1.814C0.504,14.499,0.018,19.741,0,20h5.387C6.514,18.701,8.1,17.686,10.299,17.467z"/>
+<path d="M22,10.48c0,2.66-1.008,5.26-2.638,6.968c0.046,0.005,0.091,0.009,0.137,0.009c0.066,0,0.132,0.003,0.198,0.01  c2.21,0.221,3.803,1.229,4.932,2.533H30c-0.021-0.259-0.504-5.501-4.951-5.949c-0.776,0-2.25-0.378-2.25-1.814v-0.329  c0-0.144,0.07-0.28,0.184-0.367c1.507-1.104,2.518-3.372,2.518-5.648C25.5,2.641,23.481,0,21,0c-1.515,0-2.854,0.986-3.67,2.492  C20.046,3.66,22,6.795,22,10.48z"/>
+<path d="M5,26c0.02-0.285,0.561-6.051,5.498-6.543c1.136-0.025,2.5-0.563,2.5-1.996v-0.363c0-0.158-0.074-0.309-0.205-0.404  C11.123,15.479,10,12.984,10,10.48C10,6.904,12.242,4,15,4s5,2.904,5,6.48c0,2.504-1.123,4.998-2.797,6.213  c-0.127,0.096-0.205,0.246-0.205,0.404v0.363c0,1.58,1.639,1.996,2.501,1.996C24.439,19.949,24.977,25.715,25,26H5z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hard_disk.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hard_disk.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hard_disk.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,6 +4,6 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M24,1H6C4.9,1,4,1.9,4,3v24c0,1.1,0.9,2,2,2h18c1.1,0,2-0.9,2-2V3C26,1.9,25.1,1,24,1z M14,27H6v-8.695  c0.81,1.153,1.844,2.131,3.025,2.901L12,16v6.563c0.646,0.184,1.311,0.324,2,0.387V27z M24,27h-8v-3h8V27z M15,21  c-0.688,0-1.356-0.084-2-0.23V16c0-0.453-0.305-0.851-0.743-0.967C12.171,15.011,12.085,15,12,15c-0.353,0-0.687,0.187-0.868,0.504  l-1.929,3.375C7.246,17.229,6,14.761,6,12c0-4.971,4.029-9,9-9s9,4.029,9,9S19.971,21,15,21z"/>
 <path d="M15,9c-1.654,0-3,1.346-3,3s1.346,3,3,3s3-1.346,3-3S16.654,9,15,9z M15,13c-0.551,0-1-0.448-1-1s0.449-1,1-1s1,0.448,1,1  S15.551,13,15,13z"/>
+<path d="M24,1H6C4.9,1,4,1.9,4,3v24c0,1.1,0.9,2,2,2h18c1.1,0,2-0.9,2-2V3C26,1.9,25.1,1,24,1z M14,27H6v-8.695  c0.811,1.152,1.844,2.131,3.025,2.901L12,16v6.563c0.646,0.184,1.311,0.324,2,0.387V27z M24,27h-8v-3h8V27z M15,21  c-0.688,0-1.355-0.084-2-0.23V16c0-0.453-0.305-0.851-0.743-0.967C12.172,15.011,12.085,15,12,15c-0.353,0-0.688,0.187-0.868,0.504  l-1.929,3.375C7.246,17.229,6,14.761,6,12c0-4.971,4.029-9,9-9s9,4.029,9,9S19.971,21,15,21z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hd.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hd.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hd.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M0.998,3v24h28V3H0.998z M25.998,24h-22V6h22V24z"/>
-<path d="M14.057,10.632v8.736H12.44V15.12H9.943v4.248H8.332v-8.736h1.611v3.492h2.496v-3.492H14.057z"/>
-<path d="M15.785,10.632h2.484c1.141,0,1.991,0.338,2.555,1.014c0.563,0.676,0.844,1.742,0.844,3.199  c0,1.594-0.296,2.746-0.889,3.457c-0.592,0.712-1.486,1.066-2.687,1.066h-2.309L15.785,10.632L15.785,10.632z M17.396,11.628v6.731  h0.731c0.608,0,1.073-0.244,1.392-0.734c0.319-0.49,0.479-1.395,0.479-2.71c0-1.168-0.156-2.008-0.469-2.52  c-0.313-0.512-0.787-0.768-1.424-0.768L17.396,11.628L17.396,11.628z"/>
+</g>
+<path d="M18.635,11.46h-0.509v6.332h0.532c0.542,0,0.942-0.21,1.224-0.644c0.296-0.455,0.445-1.33,0.445-2.602  c0-1.125-0.147-1.938-0.439-2.416C19.612,11.68,19.202,11.46,18.635,11.46z"/>
+<path d="M27,4H3C1.896,4,1,4.896,1,6v18c0,1.104,0.896,2,2,2h24c1.104,0,2-0.896,2-2V6C29,4.896,28.104,4,27,4z M14.786,19.2h-2.018  v-4.248h-2.096V19.2H8.661v-9.137h2.012v3.492h2.096v-3.492h2.018V19.2z M21.463,18.062c-0.629,0.755-1.584,1.139-2.84,1.139h-2.509  v-9.137h2.685c1.197,0,2.108,0.366,2.708,1.086c0.591,0.709,0.891,1.829,0.891,3.327C22.397,16.111,22.083,17.316,21.463,18.062z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_history.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_history.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_history.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,15 +4,6 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="2" width="2" x="6" y="6"/>
-<rect height="2" width="10" x="9" y="6"/>
-<rect height="2" width="2" x="6" y="11"/>
-<rect height="2" width="10" x="9" y="11"/>
-<rect height="2" width="2" x="6" y="16"/>
-<rect height="2" width="2" x="6" y="21"/>
-<path d="M9,21v2h4.025C13.017,22.833,13,22.669,13,22.5c0-0.512,0.052-1.01,0.131-1.5H9z"/>
-<path d="M15.591,16H9v2h5.137C14.531,17.269,15.025,16.601,15.591,16z"/>
-<path d="M4,26V3h18v10.025C22.166,13.017,22.331,13,22.5,13c0.866,0,1.702,0.127,2.5,0.345V0H1v29h14.591  c-0.813-0.865-1.468-1.879-1.914-3H4z"/>
-<path d="M22.5,15c-4.136,0-7.5,3.364-7.5,7.5s3.364,7.5,7.5,7.5s7.5-3.364,7.5-7.5S26.636,15,22.5,15z M22.5,28  c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5s5.5,2.468,5.5,5.5S25.533,28,22.5,28z"/>
-<polygon points="23,22 23,18 21,18 21,22 21,24 23,24 27,24 27,22 "/>
+<path d="M14,23H9v-2h5.232c0.247-1.087,0.687-2.102,1.289-3H9v-2h8.355c1.545-1.248,3.508-2,5.645-2c0.338,0,0.672,0.022,1,0.059V3  c0-1.104-0.896-2-2-2H4C2.896,1,2,1.896,2,3v24c0,1.104,0.896,2,2,2h12.311C14.879,27.406,14,25.307,14,23z M9,6h11v2H9V6z M9,11h11  v2H9V11z M8,23H6v-2h2V23z M8,18H6v-2h2V18z M8,13H6v-2h2V13z M8,8H6V6h2V8z"/>
+<path d="M23,16c-3.865,0-7,3.135-7,7c0,3.867,3.135,7,7,7s7-3.133,7-7C30,19.135,26.865,16,23,16z M22,23.992v-0.016v-1.98v-4.004h2  v4.004h4v1.996H22z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hold_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hold_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hold_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M28.91,10.03l-7.671,2.057c-0.341,0.139-0.547,0.472-0.461,0.798l0.571,2.261c-0.002-0.001-0.008-0.001-0.01-0.001,0.001,0.001,0.002,0.002,0.002,0.003-1.125,0.355-3.859,0.922-5.933,0.923-2.159-0.001-4.325-0.161-6.604-0.766,0,0-0.009-0.002-0.012-0.002,0.006-0.007,0.012-0.013,0.017-0.02l0.648-2.953c0.081-0.374-0.194-0.738-0.608-0.816l-7.822-1.486c-0.412-0.076-0.811,0.162-0.891,0.537,0,0-0.068,0.325-0.126,1.224-0.001,0-0.001,0-0.001,0.002-0.031,0.489,0.042,0.586,0.092,1.13,0.043,0.466,0.126,0.885,0.219,1.254,0,0.001-0.003,0.003-0.002,0.005,0.019,0.074,0.039,0.145,0.059,0.216,0.002,0.009,0.005,0.018,0.006,0.025,0.203,0.72,0.43,1.17,0.43,1.17,0.338,0.572,1.855,2.187,3.813,3.068,1.244,0.559,5.891,1.607,10.1,1.608,4.205,0.001,9.565-1.174,11.44-2.178s2.946-2.212,3.165-2.671,0.59-1.164,0.658-2.688c0.023-0.509,0.037-0.543-0.01-1.002,0-0.003-0.003-0.004-0.003-0.007v0.007c-0.094-0.907-0.161-1.243-0.161-1.243-0.12-0.35-0.52-0.549-0.92-0.44z"/>
+</g>
+<path d="M28.908,10.027l-7.672,2.057c-0.34,0.139-0.546,0.473-0.46,0.799l0.571,2.26c-0.002,0-0.008,0-0.01,0  c0.001,0,0.002,0.002,0.002,0.002c-1.125,0.355-3.859,0.922-5.933,0.924c-2.159-0.002-4.325-0.162-6.604-0.766  c0,0-0.009-0.002-0.012-0.002c0.006-0.008,0.012-0.014,0.017-0.02l0.648-2.953c0.081-0.375-0.194-0.738-0.608-0.816l-7.822-1.486  c-0.412-0.076-0.811,0.162-0.891,0.537c0,0-0.068,0.324-0.126,1.223H0.008c-0.032,0.492,0.042,0.588,0.092,1.133  c0.043,0.465,0.125,0.885,0.219,1.254c0,0-0.003,0.002-0.002,0.004c0.019,0.074,0.039,0.145,0.059,0.217  C0.377,14.4,0.38,14.41,0.381,14.418c0.203,0.719,0.429,1.17,0.429,1.17c0.339,0.572,1.856,2.186,3.813,3.068  c1.244,0.559,5.891,1.607,10.095,1.607c4.205,0.002,9.565-1.174,11.437-2.178c1.873-1.004,2.946-2.211,3.166-2.67  c0,0,0.59-1.164,0.657-2.688c0.024-0.51,0.038-0.543-0.009-1.002l-0.003-0.008v0.008c-0.094-0.908-0.161-1.244-0.161-1.244  C29.71,10.125,29.308,9.92,28.908,10.027z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_home.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,5 +4,6 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M29,14l-14-13-14,13,3,3v12h22v-12l3-2.999zm-6.46,0h-15.08l7.539-7,7.54,7zm0.46,12h-5v-7h-6v7h-5v-10h16v10z"/>
+<path d="M4,17.75V26c0,1.104,0.896,2,2,2h18c1.104,0,2-0.896,2-2v-8.271L15,8L4,17.75z M18,19v7h-6v-7c0-1.104,0.896-2,2-2h2  C17.104,17,18,17.896,18,19z"/>
+<path d="M27.346,11.52l-11-10C15.964,1.173,15.482,1,15,1s-0.964,0.173-1.346,0.52l-11,10C2.238,11.899,2,12.437,2,13  s0.238,1.102,0.654,1.48L4,15.703v0.047L15,6l11,9.729v-0.026l1.346-1.223C27.762,14.102,28,13.563,28,13  S27.762,11.899,27.346,11.52z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M25.34,17.21v2.332h1.691v2.277c-0.228,0.082-0.528,0.148-1.005,0.148-1.754,0-2.802-1.453-2.802-3.889,0-1.189,0.382-5.021,4.613-3.446l0.46,0.289,0.536-2.296s-0.991-0.788-2.648-0.788c-2.989,0-5.13,2.537-5.005,6.31,0.188,5.582,3.314,6.182,4.773,6.182,1.977,0,3.043-0.787,3.043-0.787v-6.332h-3.647z"/>
-<path d="M12.68,5.949h6.298v3.392h-3.878v2.937s4.93-0.916,4.631,6.4c0,0,0.152,5.113-3.726,5.584-1.121,0.139-3.352-0.305-3.352-0.305l0.026-3.436s4.743,1.521,4.743-2.199c0-3.982-4.743-2.626-4.743-2.626v-9.741z"/>
-<rect height="2.625" width="2.144" x="8.896" y="21.54"/>
-<path d="M6.864,14.16c0.727-0.922,1.144-2.201,1.144-3.72,0-1.288-0.417-4.766-3.377-4.766-2.039,0-3.266,1.814-3.266,1.814l0.755,3.327s1.138-1.578,2.245-1.578c0.545,0,1.199,0.266,1.199,1.552,0,1.524-1.21,1.86-1.67,1.86h-1.291v3.435h1.295c0.33,0,2.188,0.4,2.015,2.369-0.331,3.822-3.281,1.695-3.613,1.373l-0.562-0.559-0.738,3.37s1.095,1.631,3.228,1.631c2.848,0,4.159-2.992,4.159-5.771,0-1.85-0.58-3.43-1.523-4.33z"/>
 <rect fill="none" height="30" width="30"/>
+<path d="M25.343,17.212v2.331h1.691v2.277c-0.228,0.082-0.528,0.149-1.005,0.149c-1.754,0-2.802-1.454-2.802-3.889  c0-1.19,0.382-5.022,4.613-3.446l0.46,0.288l0.536-2.296c0,0-0.991-0.788-2.648-0.788c-2.989,0-5.13,2.537-5.005,6.311  c0.188,5.581,3.314,6.182,4.773,6.182c1.977,0,3.043-0.788,3.043-0.788v-6.331H25.343z"/>
+<path d="M12.681,5.949h6.298v3.392h-3.878v2.937c0,0,4.93-0.916,4.631,6.4c0,0,0.152,5.113-3.726,5.585  c-1.121,0.138-3.352-0.306-3.352-0.306l0.026-3.436c0,0,4.743,1.521,4.743-2.199c0-3.982-4.743-2.626-4.743-2.626V5.949z"/>
+<rect height="2.625" width="2.144" x="8.896" y="21.537"/>
+<path d="M6.864,14.156c0.727-0.923,1.144-2.202,1.144-3.721c0-1.288-0.417-4.766-3.377-4.766c-2.039,0-3.266,1.814-3.266,1.814  l0.755,3.327c0,0,1.138-1.578,2.245-1.578c0.545,0,1.199,0.266,1.199,1.552c0,1.524-1.21,1.86-1.67,1.86H2.603v3.436h1.295  c0.33,0,2.188,0.399,2.015,2.368c-0.331,3.823-3.281,1.695-3.613,1.373l-0.562-0.558L1,22.627c0,0,1.095,1.631,3.228,1.631  c2.848,0,4.159-2.992,4.159-5.771C8.387,16.635,7.807,15.061,6.864,14.156z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_attach.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_attach.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_attach.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="8.182,22.26,5.341,22.26,9.513,28.94,11.54,27.67"/>
-<polygon points="10.52,22.26,12.02,24.68,16.12,24.68,14.61,22.26"/>
-<polygon points="16.95,22.26,18.45,24.68,22.56,24.68,21.06,22.26"/>
-<polygon points="23.4,22.26,24.64,24.26,24.64,22.26"/>
-<polygon points="21.76,19.7,24.64,19.7,20.47,13.02,18.42,14.3"/>
-<polygon points="19.42,19.7,17.92,17.28,13.86,17.28,15.36,19.7"/>
-<polygon points="13.03,19.7,11.53,17.28,7.427,17.28,8.927,19.7"/>
-<polygon points="5.341,17.68,5.341,19.7,6.594,19.7"/>
-<path d="M22.18,7.594v1.319h1.179v1.291c-0.159,0.045-0.368,0.083-0.699,0.083-1.218,0-1.942-0.823-1.942-2.201,0-0.674,0.261-2.843,3.199-1.952l0.32,0.164,0.374-1.299s-0.691-0.447-1.841-0.447c-2.076,0-3.559,1.437-3.474,3.575,0.13,3.16,2.3,3.499,3.311,3.499,1.373,0,2.112-0.448,2.112-0.448v-3.576h-2.538z"/>
-<path d="M13.39,1.219h4.371v1.917h-2.691v1.663s3.421-0.518,3.215,3.622c0,0,0.107,2.896-2.588,3.165-0.778,0.079-2.327-0.174-2.327-0.174l0.021-1.946s3.291,0.862,3.291-1.245c0-2.252-3.291-1.487-3.291-1.487v-5.523z"/>
-<rect height="1.487" width="1.486" x="10.76" y="10.04"/>
-<path d="M9.353,5.866c0.506-0.523,0.79-1.249,0.79-2.107,0-0.728-0.288-2.7-2.343-2.7-1.415,0-2.266,1.029-2.266,1.029l0.527,1.883s0.788-0.896,1.557-0.896c0.379,0,0.828,0.152,0.828,0.879,0,0.866-0.836,1.051-1.158,1.051h-0.891v1.946h0.897c0.232,0,1.52,0.223,1.402,1.342-0.231,2.167-2.279,0.961-2.51,0.777l-0.393-0.315-0.512,1.903s0.761,0.925,2.245,0.925c1.977,0,2.885-1.693,2.885-3.266,0-1.045-0.4-1.936-1.057-2.448z"/>
 <rect fill="none" height="30" width="30"/>
+<polygon points="8.182,22.262 5.341,22.262 9.513,28.939 11.54,27.668 "/>
+<polygon points="10.517,22.26 12.021,24.679 16.116,24.679 14.613,22.26 "/>
+<polygon points="16.948,22.26 18.453,24.679 22.565,24.679 21.063,22.26 "/>
+<polygon points="23.398,22.26 24.644,24.264 24.644,22.26 "/>
+<polygon points="21.757,19.697 24.642,19.697 20.471,13.018 18.42,14.301 "/>
+<polygon points="19.422,19.697 17.921,17.281 13.86,17.281 15.362,19.697 "/>
+<polygon points="13.027,19.697 11.529,17.281 7.427,17.281 8.927,19.698 "/>
+<polygon points="5.341,17.682 5.341,19.698 6.594,19.698 "/>
+<path d="M22.182,7.594v1.319h1.179v1.291c-0.159,0.045-0.368,0.083-0.699,0.083c-1.218,0-1.942-0.823-1.942-2.201  c0-0.674,0.261-2.843,3.199-1.952l0.32,0.164l0.374-1.299c0,0-0.691-0.447-1.841-0.447c-2.076,0-3.559,1.437-3.474,3.575  c0.13,3.16,2.3,3.499,3.311,3.499c1.373,0,2.112-0.448,2.112-0.448V7.594H22.182z"/>
+<path d="M13.393,1.219h4.371v1.917h-2.691v1.663c0,0,3.421-0.518,3.215,3.622c0,0,0.107,2.896-2.588,3.165  c-0.778,0.079-2.327-0.174-2.327-0.174l0.021-1.946c0,0,3.291,0.862,3.291-1.245c0-2.252-3.291-1.487-3.291-1.487V1.219z"/>
+<rect height="1.487" width="1.486" x="10.765" y="10.043"/>
+<path d="M9.353,5.866c0.506-0.523,0.79-1.249,0.79-2.107c0-0.728-0.288-2.7-2.343-2.7c-1.415,0-2.266,1.029-2.266,1.029l0.527,1.883  c0,0,0.788-0.896,1.557-0.896c0.379,0,0.828,0.152,0.828,0.879c0,0.866-0.836,1.051-1.158,1.051H6.394v1.946h0.897  c0.232,0,1.52,0.223,1.402,1.342c-0.231,2.167-2.279,0.961-2.51,0.777L5.79,8.755l-0.512,1.903c0,0,0.761,0.925,2.245,0.925  c1.977,0,2.885-1.693,2.885-3.266C10.408,7.269,10.006,6.378,9.353,5.866z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_context.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_context.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_context.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="24.72,22.22,5.481,22.22,9.64,28.88,11.68,27.6,9.827,24.63,9.839,24.63,9.839,24.63,24.72,24.63"/>
-<polygon points="20.56,13,18.52,14.28,20.37,17.25,5.481,17.26,5.481,19.66,24.72,19.66"/>
-<path d="M22.12,7.638v1.314h1.176v1.287c-0.156,0.045-0.365,0.083-0.697,0.083-1.211,0-1.936-0.821-1.936-2.193,0-0.672,0.261-2.834,3.19-1.947l0.32,0.164,0.37-1.295s-0.688-0.447-1.833-0.447c-2.073,0-3.55,1.433-3.463,3.563,0.128,3.151,2.293,3.489,3.301,3.489,1.366,0,2.104-0.447,2.104-0.447v-3.562h-2.525z"/>
-<path d="M13.37,1.285h4.357v1.911h-2.687v1.656s3.413-0.515,3.208,3.611c0,0,0.106,2.887-2.58,3.154-0.775,0.079-2.318-0.175-2.318-0.175l0.02-1.938s3.28,0.86,3.28-1.241c0-2.244-3.28-1.482-3.28-1.482v-5.494z"/>
-<rect height="1.482" width="1.482" x="10.74" y="10.08"/>
-<path d="M9.341,5.917c0.501-0.521,0.79-1.245,0.79-2.101,0-0.726-0.289-2.691-2.339-2.691-1.407,0-2.258,1.026-2.258,1.026l0.527,1.876s0.785-0.893,1.552-0.893c0.378,0,0.826,0.152,0.826,0.877,0,0.861-0.834,1.048-1.154,1.048h-0.892v1.938h0.892c0.231,0,1.517,0.223,1.397,1.337-0.229,2.161-2.27,0.958-2.499,0.775l-0.393-0.313-0.51,1.897s0.761,0.921,2.24,0.921c1.968,0,2.873-1.688,2.873-3.255,0-1.042-0.398-1.928-1.049-2.438z"/>
 <rect fill="none" height="30" width="30"/>
+<path d="M22.125,7.638v1.314h1.176v1.287c-0.156,0.045-0.365,0.083-0.697,0.083c-1.211,0-1.936-0.821-1.936-2.193  c0-0.672,0.261-2.834,3.19-1.947l0.32,0.164l0.37-1.295c0,0-0.688-0.447-1.833-0.447c-2.073,0-3.55,1.433-3.463,3.563  c0.128,3.151,2.293,3.489,3.301,3.489c1.366,0,2.104-0.447,2.104-0.447V7.638H22.125z"/>
+<polygon points="24.722,22.217 5.481,22.22 9.64,28.876 11.683,27.601 9.827,24.629 9.839,24.629 9.839,24.629 24.722,24.629 "/>
+<polygon points="20.562,13.005 18.518,14.283 20.368,17.254 5.481,17.256 5.481,19.664 24.719,19.662 "/>
+<path d="M13.367,1.285h4.357v1.911h-2.687v1.656c0,0,3.413-0.515,3.208,3.611c0,0,0.106,2.887-2.58,3.154  c-0.775,0.079-2.318-0.175-2.318-0.175l0.02-1.938c0,0,3.28,0.86,3.28-1.241c0-2.244-3.28-1.482-3.28-1.482V1.285z"/>
+<rect height="1.482" width="1.482" x="10.745" y="10.079"/>
+<path d="M9.341,5.917c0.501-0.521,0.79-1.245,0.79-2.101c0-0.726-0.289-2.691-2.339-2.691c-1.407,0-2.258,1.026-2.258,1.026  L6.06,4.027c0,0,0.785-0.893,1.552-0.893c0.378,0,0.826,0.152,0.826,0.877c0,0.861-0.834,1.048-1.154,1.048H6.392v1.938h0.892  c0.231,0,1.517,0.223,1.397,1.337c-0.229,2.161-2.27,0.958-2.499,0.775L5.789,8.796l-0.51,1.897c0,0,0.761,0.921,2.24,0.921  c1.968,0,2.873-1.688,2.873-3.255C10.393,7.313,9.992,6.427,9.341,5.917z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_multipdp.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_multipdp.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_multipdp.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="20.47,13.06,18.42,14.34,20.28,17.32,17.24,17.32,14.58,13.06,12.53,14.34,14.39,17.32,5.341,17.32,5.341,19.74,24.64,19.74"/>
-<polygon points="9.512,28.89,11.56,27.61,9.71,24.63,12.74,24.63,15.4,28.89,17.45,27.61,15.59,24.63,24.64,24.63,24.64,22.21,5.341,22.21"/>
-<path d="M22.18,7.645v1.318h1.179v1.291c-0.159,0.044-0.368,0.083-0.699,0.083-1.218,0-1.943-0.822-1.943-2.201,0-0.674,0.262-2.843,3.2-1.953l0.32,0.164,0.374-1.299s-0.691-0.447-1.841-0.447c-2.076,0-3.559,1.437-3.474,3.574,0.13,3.161,2.3,3.5,3.311,3.5,1.373,0,2.112-0.449,2.112-0.449v-3.575h-2.538z"/>
-<path d="M13.39,1.271h4.371v1.917h-2.691v1.662s3.421-0.518,3.215,3.622c0,0,0.107,2.898-2.588,3.166-0.778,0.077-2.327-0.174-2.327-0.174l0.021-1.945s3.291,0.862,3.291-1.246c0-2.251-3.291-1.487-3.291-1.487v-5.521z"/>
-<rect height="1.487" width="1.486" x="10.76" y="10.09"/>
-<path d="M9.353,5.917c0.506-0.523,0.79-1.248,0.79-2.108,0-0.729-0.288-2.7-2.343-2.7-1.413,0-2.264,1.029-2.264,1.029l0.529,1.884s0.786-0.897,1.554-0.897c0.38,0,0.83,0.153,0.83,0.88,0,0.865-0.837,1.052-1.158,1.052h-0.894v1.945h0.897c0.232,0,1.52,0.224,1.402,1.342-0.231,2.167-2.28,0.964-2.51,0.777l-0.393-0.313-0.512,1.902s0.761,0.924,2.245,0.924c1.977,0,2.884-1.693,2.884-3.265,0-1.047-0.4-1.937-1.057-2.448z"/>
 <rect fill="none" height="30" width="30"/>
+<polygon points="20.471,13.062 18.42,14.344 20.276,17.324 17.245,17.324 14.584,13.062 12.532,14.344 14.389,17.324 5.341,17.325   5.341,19.742 24.642,19.74 "/>
+<polygon points="9.512,28.893 11.563,27.611 9.71,24.629 12.737,24.629 15.397,28.893 17.448,27.611 15.592,24.629 24.642,24.629   24.642,22.213 5.341,22.213 "/>
+<path d="M22.182,7.645v1.318h1.179v1.291c-0.159,0.044-0.368,0.083-0.699,0.083c-1.218,0-1.943-0.822-1.943-2.201  c0-0.674,0.262-2.843,3.2-1.953l0.32,0.164l0.374-1.299c0,0-0.691-0.447-1.841-0.447c-2.076,0-3.559,1.437-3.474,3.574  c0.13,3.161,2.3,3.5,3.311,3.5c1.373,0,2.112-0.449,2.112-0.449V7.645H22.182z"/>
+<path d="M13.393,1.271h4.371v1.917h-2.691V4.85c0,0,3.421-0.518,3.215,3.622c0,0,0.107,2.898-2.588,3.166  c-0.778,0.077-2.327-0.174-2.327-0.174l0.021-1.945c0,0,3.291,0.862,3.291-1.246c0-2.251-3.291-1.487-3.291-1.487V1.271z"/>
+<rect height="1.487" width="1.486" x="10.765" y="10.092"/>
+<path d="M9.353,5.917c0.506-0.523,0.79-1.248,0.79-2.108c0-0.729-0.288-2.7-2.343-2.7c-1.413,0-2.264,1.029-2.264,1.029l0.529,1.884  c0,0,0.786-0.897,1.554-0.897c0.38,0,0.83,0.153,0.83,0.88c0,0.865-0.837,1.052-1.158,1.052H6.394v1.945h0.897  c0.232,0,1.52,0.224,1.402,1.342c-0.231,2.167-2.28,0.964-2.51,0.777L5.79,8.808L5.278,10.71c0,0,0.761,0.924,2.245,0.924  c1.977,0,2.884-1.693,2.884-3.265C10.407,7.318,10.006,6.428,9.353,5.917z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_suspended.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_suspended.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_suspended.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="24.64,22.19,24.64,24.61,14.34,24.6,16.36,22.19"/>
-<polygon points="5.342,22.19,10.6,22.19,8.563,24.6,5.342,24.6"/>
-<polygon points="24.64,17.21,24.64,19.63,18.5,19.62,20.52,17.21"/>
-<polygon points="5.342,19.62,5.342,17.21,14.8,17.21,12.76,19.62"/>
-<polygon points="21.39,14.63,9.415,28.9,7.564,27.35,19.59,13.01"/>
-<path d="M22.18,7.633v1.318h1.179v1.29c-0.159,0.044-0.368,0.082-0.699,0.082-1.218,0-1.943-0.823-1.943-2.2,0-0.675,0.262-2.843,3.2-1.953l0.32,0.165,0.374-1.299s-0.691-0.448-1.841-0.448c-2.076-0.002-3.559,1.436-3.474,3.573,0.13,3.16,2.3,3.499,3.311,3.499,1.373,0,2.112-0.447,2.112-0.447v-3.577h-2.537z"/>
-<path d="M13.39,1.257h4.371v1.917h-2.691v1.661s3.421-0.517,3.215,3.623c0,0,0.107,2.897-2.588,3.165-0.778,0.08-2.327-0.175-2.327-0.175l0.021-1.945s3.291,0.863,3.291-1.245c0-2.252-3.291-1.487-3.291-1.487v-5.506z"/>
-<rect height="1.487" width="1.486" x="10.77" y="10.08"/>
-<path d="M9.354,5.904c0.506-0.524,0.79-1.247,0.79-2.107,0-0.73-0.288-2.7-2.343-2.7-1.415,0-2.266,1.029-2.266,1.029l0.527,1.883s0.788-0.896,1.557-0.896c0.379,0,0.828,0.152,0.828,0.88,0,0.864-0.836,1.05-1.158,1.05h-0.89v1.945h0.897c0.232,0,1.52,0.225,1.402,1.342-0.231,2.167-2.28,0.962-2.51,0.778l-0.393-0.315-0.512,1.903s0.761,0.925,2.245,0.925c1.977,0,2.884-1.695,2.884-3.267,0-1.047-0.4-1.936-1.056-2.449z"/>
 <rect fill="none" height="30" width="30"/>
+<polygon points="24.645,22.191 24.645,24.607 14.341,24.605 16.359,22.188 "/>
+<polygon points="5.342,22.188 10.605,22.188 8.563,24.605 5.342,24.605 "/>
+<polygon points="24.645,17.211 24.645,19.627 18.497,19.623 20.519,17.211 "/>
+<polygon points="5.342,19.623 5.342,17.211 14.799,17.211 12.761,19.623 "/>
+<polygon points="21.393,14.627 9.415,28.904 7.564,27.35 19.593,13.014 "/>
+<path d="M22.183,7.633v1.318h1.179v1.29c-0.159,0.044-0.368,0.082-0.699,0.082c-1.218,0-1.943-0.823-1.943-2.2  c0-0.675,0.262-2.843,3.2-1.953l0.32,0.165l0.374-1.299c0,0-0.691-0.448-1.841-0.448c-2.076-0.002-3.559,1.436-3.474,3.573  c0.13,3.16,2.3,3.499,3.311,3.499c1.373,0,2.112-0.447,2.112-0.447V7.633H22.183z"/>
+<path d="M13.394,1.257h4.371v1.917h-2.691v1.661c0,0,3.421-0.517,3.215,3.623c0,0,0.107,2.897-2.588,3.165  c-0.778,0.08-2.327-0.175-2.327-0.175l0.021-1.945c0,0,3.291,0.863,3.291-1.245c0-2.252-3.291-1.487-3.291-1.487V1.257z"/>
+<rect height="1.487" width="1.486" x="10.766" y="10.08"/>
+<path d="M9.354,5.904c0.506-0.524,0.79-1.247,0.79-2.107c0-0.73-0.288-2.7-2.343-2.7c-1.415,0-2.266,1.029-2.266,1.029l0.527,1.883  c0,0,0.788-0.896,1.557-0.896c0.379,0,0.828,0.152,0.828,0.88c0,0.864-0.836,1.05-1.158,1.05H6.395v1.945h0.897  c0.232,0,1.52,0.225,1.402,1.342c-0.231,2.167-2.28,0.962-2.51,0.778L5.791,8.793l-0.512,1.903c0,0,0.761,0.925,2.245,0.925  c1.977,0,2.884-1.695,2.884-3.267C10.408,7.306,10.007,6.417,9.354,5.904z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_img_quality.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_img_quality.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_img_quality.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="3.375" width="3.375" x="24.38" y="13.31"/>
-<rect height="3.375" width="3.375" x="19.69" y="7.781"/>
-<rect height="3.375" width="3.375" x="19.69" y="18.84"/>
-<rect height="3.375" width="3.375" x="19.69" y="13.31"/>
-<polygon points="18.38,5.625,18.38,2.25,15,2.25,2.25,15,15,27.75,18.38,27.75,18.38,24.38,15,24.38,15,22.22,18.38,22.22,18.38,18.84,15,18.84,15,16.69,18.38,16.69,18.38,13.31,15,13.31,15,11.16,18.38,11.16,18.38,7.781,15,7.781,15,5.625"/>
+</g>
+<polygon points="15,3 1,15.5 15,28 15,27 18,27 18,24 15,24 15,22 18,22 18,19 15,19 15,17 18,17 18,14 15,14 15,12 18,12 18,9   15,9 15,7 18,7 18,4 15,4 "/>
+<rect height="3" width="3" x="20" y="9"/>
+<rect height="3" width="3" x="20" y="14"/>
+<rect height="3" width="3" x="25" y="14"/>
+<rect height="3" width="3" x="20" y="19"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_import.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_import.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_import.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<polygon points="26,6 26,1 20,1 20,6 17,6 23,14 29,6 "/>
-<path d="M21,21H7V3h11.006V1H8C6.35,1,5,2.35,5,4v22c0,1.65,1.35,3,3,3h12c1.65,0,3-1.35,3-3v-8.865l-2-2.667V21z M10,26H7v-2h3V26z   M14,27c-1.104,0-2-0.896-2-2s0.896-2,2-2c1.105,0,2,0.896,2,2S15.105,27,14,27z M21,26h-3v-2h3V26z"/>
+</g>
+<path d="M19.697,14.924l-5.002-6.003C14.246,8.38,14,7.699,14,7c0-0.434,0.097-0.871,0.279-1.266C14.775,4.678,15.842,4,17,4H8v16  h12v-4.785C19.896,15.121,19.788,15.033,19.697,14.924z"/>
+<path d="M22,16c-0.348,0-0.681-0.076-1-0.189V21H7V3h10V1H7C5.896,1,5,1.896,5,3v24c0,1.104,0.896,2,2,2h14c1.104,0,2-0.896,2-2  V15.811C22.682,15.924,22.348,16,22,16z M10,26H7v-2h3V26z M14,27c-1.104,0-2-0.896-2-2s0.896-2,2-2s2,0.896,2,2S15.104,27,14,27z   M21,26h-3v-2h3V26z"/>
+<path d="M16,7c0,0.229,0.079,0.457,0.231,0.641l5,6C21.422,13.868,21.703,14,22,14s0.578-0.132,0.768-0.359l5-6  C27.921,7.457,28,7.229,28,7c0-0.144-0.031-0.289-0.095-0.424C27.741,6.225,27.388,6,27,6h-2V1c0-0.553-0.448-1-1-1h-4  c-0.553,0-1,0.447-1,1v5h-2c-0.389,0-0.741,0.225-0.906,0.576C16.031,6.711,16,6.856,16,7L16,7z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_info.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_info.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_info.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M15,1.702c-7.182,0-13,5.818-13,13s5.818,13,13,13,13-5.818,13-13-5.82-13-13-13zm0,3.672c1.576,0,2.854,1.204,2.854,2.688s-1.277,2.688-2.854,2.688-2.854-1.203-2.854-2.688,1.28-2.688,2.85-2.688zm4.12,18.04h-8.229v-1.443h1.123v-7.612h-1.123v-1.444h7.107v9.057h1.121v1.426z"/>
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-2.002 -1.701 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M13,0C5.818,0,0,5.818,0,13s5.818,13,13,13s13-5.818,13-13S20.182,0,13,0z M13,3.672c1.576,0,2.854,1.205,2.854,2.689  S14.576,9.049,13,9.049s-2.854-1.203-2.854-2.688S11.424,3.672,13,3.672z M17.113,21.705H8.885v-1.443h1.123v-7.613H8.885v-1.443  h7.107v9.057h1.121V21.705z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_iso.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_iso.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_iso.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,7 +4,7 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M2.854,21.55v-1.512h1.081v-10.08h-1.081v-1.512h4.588v1.512h-1.082v10.08h1.081v1.512h-4.587z"/>
-<path d="M11.58,21.69c-0.955,0-1.896-0.12-2.821-0.36v-1.564c1.014,0.275,1.913,0.413,2.698,0.413,0.744,0,1.325-0.167,1.745-0.501,0.418-0.334,0.628-0.809,0.628-1.424,0-0.58-0.173-1.035-0.519-1.366s-0.987-0.764-1.925-1.297c-1.025-0.574-1.717-1.152-2.074-1.736-0.357-0.582-0.536-1.246-0.536-1.99,0-1.184,0.396-2.072,1.191-2.668,0.793-0.594,1.829-0.892,3.106-0.892,0.926,0,1.778,0.088,2.558,0.264v1.529c-0.826-0.188-1.594-0.281-2.303-0.281-0.645,0-1.16,0.152-1.547,0.457s-0.58,0.727-0.58,1.266c0,0.521,0.168,0.939,0.506,1.253,0.336,0.313,0.912,0.695,1.727,1.146,1.125,0.627,1.878,1.233,2.259,1.819s0.571,1.245,0.571,1.978c0,1.318-0.391,2.307-1.174,2.967-0.79,0.65-1.96,0.98-3.52,0.98z"/>
-<path d="M22.36,21.69c-1.582,0-2.772-0.554-3.573-1.661-0.799-1.107-1.199-2.845-1.199-5.212,0-2.227,0.4-3.868,1.199-4.926,0.801-1.058,1.991-1.587,3.573-1.587,1.594,0,2.79,0.544,3.591,1.63,0.799,1.088,1.199,2.715,1.199,4.883,0,2.361-0.401,4.098-1.204,5.207-0.81,1.11-2.01,1.66-3.59,1.66zm0-1.51c0.732,0,1.29-0.383,1.675-1.146,0.383-0.766,0.575-2.17,0.575-4.215,0-1.852-0.19-3.147-0.571-3.889s-0.94-1.112-1.679-1.112c-0.732,0-1.291,0.354-1.675,1.06s-0.575,2.02-0.575,3.941c0,1.893,0.19,3.26,0.571,4.1,0.37,0.84,0.93,1.26,1.67,1.26z"/>
+<path d="M2.854,21.553v-1.512h1.08V9.959h-1.08V8.447h4.588v1.512H6.359v10.082h1.082v1.512H2.854z"/>
+<path d="M11.58,21.693c-0.955,0-1.895-0.121-2.82-0.361v-1.564c1.014,0.275,1.912,0.414,2.697,0.414  c0.744,0,1.326-0.168,1.746-0.502c0.418-0.334,0.627-0.809,0.627-1.424c0-0.58-0.172-1.035-0.518-1.365  c-0.346-0.332-0.988-0.764-1.926-1.297c-1.025-0.574-1.717-1.152-2.074-1.736c-0.357-0.582-0.535-1.246-0.535-1.99  c0-1.184,0.396-2.072,1.191-2.668c0.793-0.594,1.828-0.893,3.105-0.893c0.926,0,1.779,0.088,2.559,0.264V10.1  c-0.826-0.188-1.594-0.281-2.303-0.281c-0.645,0-1.16,0.152-1.547,0.457s-0.58,0.727-0.58,1.266c0,0.521,0.168,0.939,0.506,1.254  c0.336,0.313,0.912,0.695,1.727,1.146c1.125,0.627,1.877,1.232,2.258,1.818s0.572,1.246,0.572,1.979  c0,1.318-0.391,2.307-1.174,2.967C14.311,21.363,13.139,21.693,11.58,21.693z"/>
+<path d="M22.355,21.693c-1.582,0-2.771-0.555-3.572-1.662c-0.799-1.107-1.199-2.844-1.199-5.211c0-2.227,0.4-3.869,1.199-4.926  c0.801-1.059,1.99-1.588,3.572-1.588c1.594,0,2.791,0.545,3.591,1.631c0.8,1.088,1.2,2.715,1.2,4.883  c0,2.361-0.402,4.098-1.205,5.207C25.139,21.139,23.943,21.693,22.355,21.693z M22.355,20.182c0.732,0,1.291-0.383,1.675-1.146  c0.384-0.766,0.575-2.17,0.575-4.215c0-1.852-0.189-3.148-0.57-3.889c-0.382-0.742-0.941-1.113-1.68-1.113  c-0.732,0-1.291,0.354-1.674,1.061c-0.385,0.705-0.576,2.02-0.576,3.941c0,1.893,0.191,3.26,0.572,4.1  C21.059,19.762,21.617,20.182,22.355,20.182z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_italic.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_italic.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_italic.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,5 +4,5 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon fill-rule="evenodd" points="11,3,11,6,14,6,10,24,7,24,7,27,20,27,20,24,17,24,21,6,24,6,24,3"/>
+<path d="M23.5,3h-12C10.672,3,10,3.672,10,4.5S10.672,6,11.5,6H14l-4,18H7.5C6.672,24,6,24.672,6,25.5S6.672,27,7.5,27h12  c0.828,0,1.5-0.672,1.5-1.5S20.328,24,19.5,24H17l4-18h2.5C24.328,6,25,5.328,25,4.5S24.328,3,23.5,3z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_join_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_join_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_join_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M10.21,8.109c0.054,0.038,0.102,0.08,0.158,0.117,0.002,0.085,0.007,0.529,0.002,0.614-0.004,0.053-0.023,0.109-0.042,0.166,0.089,1.067,0.151,3.104-0.483,4.349-0.273,0.539-0.615,1.011-1.033,1.424,0.305,0.294,0.856,0.707,1.623,1.221h6.824c-0.354-0.427-0.67-0.879-0.912-1.389-0.469-0.993-0.623-2.394-0.651-3.634-1.034-0.719-2.032-1.543-2.069-2.137-0.006-0.09,0-0.523,0-0.614,0.621-0.419,1.057-0.91,1.383-1.552,0.605-1.188,0.281-3.985,0.281-3.985,0-1.242-1.64-2.692-2.89-2.692h-0.8c-1.254,0-2.902,1.45-2.902,2.689,0,0-0.172,1.68,0.018,2.992,0.761,0.665,1.314,1.533,1.494,2.428z"/>
-<path d="M19.99,15.8c0.003,0.112,0.009,0.695,0.001,0.807-0.005,0.076-0.032,0.158-0.061,0.24,0-0.001,0.002-0.002,0.002-0.003h4.393c-0.027-0.081-0.055-0.162-0.06-0.237-0.007-0.118-0.001-0.687,0.001-0.807,0.814-0.549,1.385-1.194,1.814-2.037,0.795-1.559,0.369-5.229,0.369-5.229,0-1.626-2.16-3.53-3.805-3.53h-1.04c-1.645,0-3.81,1.904-3.81,3.53,0,0-0.376,3.652,0.367,5.225,0.4,0.86,0.99,1.49,1.83,2.04z"/>
-<path d="M24.68,17.44l-2.552,5.771-2.551-5.771c-0.549,0.688-1.57,1.464-2.574,2.146v6.41h13v-4.594c-0.23-0.3-4.06-2.37-5.33-3.97z"/>
-<path d="M7.129,14.84c-0.006-0.09,0-0.523,0-0.614,0.621-0.419,1.057-0.91,1.383-1.552,0.605-1.188,0.281-3.985,0.281-3.985,0-1.245-1.647-2.695-2.898-2.695h-0.795c-1.254,0-2.903,1.45-2.903,2.689,0,0-0.287,2.783,0.279,3.981,0.311,0.654,0.76,1.139,1.395,1.556,0.002,0.085,0.007,0.529,0.002,0.614-0.062,0.98-2.734,2.58-3.873,3.31v3.85h1.454l7.665-5.078c-1.004-0.7-1.953-1.5-1.99-2.08z"/>
-<polygon points="11,18.08,2,23.54,11,29,11,26,15,26,15,21,11,21"/>
+</g>
+<path d="M13.136,8.827c-0.463-0.143-0.937-0.479-0.937-1.177V7.419c0-0.1,0.047-0.196,0.122-0.257C13.325,6.389,14,5.094,14,3.5  c0-2.276-1.346-3.417-3-3.417c-1.655,0-3,1.141-3,3.417c0,1.593,0.674,2.889,1.676,3.661c0.078,0.062,0.122,0.157,0.122,0.257V7.65  c0,0.083-0.014,0.157-0.026,0.231C9.914,8.357,10,8.893,10,9.5c0,1.365-0.431,2.615-1.198,3.583h4.528  C13.121,12.242,13,11.367,13,10.481C13,9.915,13.048,9.362,13.136,8.827z"/>
+<path d="M30,26c-0.023-0.284-0.561-6.051-5.501-6.543c-0.862,0-2.501-0.416-2.501-1.996v-0.362c0-0.158,0.078-0.309,0.205-0.404  C23.877,15.479,25,12.985,25,10.481C25,6.905,22.758,4,20,4s-5,2.905-5,6.481c0,2.504,1.123,4.998,2.793,6.213  c0.131,0.096,0.205,0.246,0.205,0.404v0.362c0,1.435-1.364,1.972-2.5,1.996c-0.26,0.025-0.5,0.074-0.735,0.127  C15.509,20.131,16,21.006,16,22v4H30z"/>
+<path d="M5.079,16.695C5.618,16.246,6.3,16,7,16c0.436,0,0.875,0.098,1.271,0.282C9.322,16.774,10,17.841,10,19h1.992  c-0.063-0.576-0.526-3.788-3.293-4.08c-0.519,0-1.5-0.266-1.5-1.27v-0.231c0-0.101,0.047-0.196,0.122-0.257  C8.325,12.389,9,11.094,9,9.5c0-2.276-1.346-3.417-3-3.417c-1.655,0-3,1.141-3,3.417c0,1.593,0.674,2.888,1.676,3.662  c0.078,0.061,0.122,0.156,0.122,0.257v0.231c0,0.912-0.817,1.254-1.499,1.27C0.336,15.232,0.012,18.902,0,19.084h2.213L5.079,16.695  z"/>
+<path d="M7,30c-0.229,0-0.457-0.079-0.641-0.231l-6-5C0.132,24.578,0,24.297,0,24s0.132-0.578,0.359-0.768l6-5  C6.543,18.079,6.771,18,7,18c0.144,0,0.289,0.031,0.424,0.094C7.775,18.259,8,18.611,8,19v2h5c0.553,0,1,0.448,1,1v4  c0,0.553-0.447,1-1,1H8v2c0,0.389-0.225,0.741-0.576,0.906C7.289,29.969,7.144,30,7,30L7,30z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_landscape.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_landscape.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_landscape.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30" x="0.002"/>
-</g>
-<path d="M29,28c0.002-0.07,0.006-0.141,0.006-0.211,0-6.719-2.422-12.16-5.41-12.16-1.65,0-3.125,1.667-4.117,4.286-1.57-7.04-4.9-11.92-8.78-11.92-5.234,0-9.488,8.881-9.703,20h28z"/>
-<circle cx="23.5" cy="4.891" r="2.891"/>
-<circle cx="23.5" cy="7.438" r="2.5"/>
-<path d="M29,6.438c0,1.381-1.119,2.5-2.5,2.5h-6c-1.381,0-2.5-1.119-2.5-2.5s1.119-2.5,2.5-2.5h6c1.38,0,2.5,1.119,2.5,2.5z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<path d="M23.591,15.625c-1.65,0-3.125,1.667-4.117,4.286C17.911,12.875,14.577,8,10.704,8c-5.233,0-9.488,8.881-9.703,20h27.994  c0.002-0.07,0.006-0.141,0.006-0.211C29.001,21.07,26.579,15.625,23.591,15.625z"/>
+<path d="M20.501,8.938h1.011c0.457,0.604,1.174,1,1.989,1s1.532-0.396,1.989-1h1.011c1.381,0,2.5-1.119,2.5-2.5s-1.119-2.5-2.5-2.5  h-0.283C25.822,2.812,24.762,2,23.501,2s-2.321,0.812-2.717,1.938h-0.283c-1.381,0-2.5,1.119-2.5,2.5S19.12,8.938,20.501,8.938z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_last_result.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_last_result.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_last_result.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,7 +4,7 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="4" width="20" x="7" y="18"/>
-<path d="M16.655,10c-0.415,1.519-1.196,2.885-2.246,4H27v-4H16.655z"/>
-<path d="M15,7.5C15,3.364,11.636,0,7.5,0S0,3.364,0,7.5S3.364,15,7.5,15S15,11.636,15,7.5z M7.5,2C10.532,2,13,4.467,13,7.5  c0,0.579-0.092,1.137-0.258,1.662c-0.934-1.73-2.69-2.95-4.742-3.135V3L2.026,6.982C2.288,4.191,4.643,2,7.5,2z M2,7.5  c0-0.163,0.011-0.324,0.024-0.483L8,11V8.055c1.742,0.239,3.122,1.593,3.395,3.324C10.398,12.38,9.021,13,7.5,13  C4.468,13,2,10.533,2,7.5z"/>
+<path d="M7,20c0-1.104,0.896-2,2-2h16c1.104,0,2,0.896,2,2l0,0c0,1.104-0.896,2-2,2H9C7.896,22,7,21.104,7,20L7,20z"/>
+<path d="M25,10h-8.23c-0.344,1.516-1.072,2.882-2.074,4H25c1.104,0,2-0.896,2-2S26.104,10,25,10z"/>
+<path d="M15,8c0,1.101-0.26,2.138-0.713,3.063c-1.889-3.864-4.746-4.169-5.953-4.103V6V4L3,8l5.334,4v-2V8.957  c0.533-0.074,3.057-0.172,4.59,4.017C11.66,14.226,9.921,15,8,15c-3.865,0-7-3.134-7-7s3.135-7,7-7C11.867,1,15,4.134,15,8z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="4" width="2" x="14" y="0"/>
-<rect height="4" width="6" x="12" y="26"/>
-<path d="M15,6.214c-5.002,0-8.495,3.298-8.495,8.019,0,0.695,0,2.539,4.627,8.769l0.899,1.213h5.95l0.899-1.213c4.624-6.23,4.624-8.074,4.624-8.769,0-4.718-3.49-8.016-8.5-8.016zm1.47,15.01h-2.932s-4.035-5.436-4.035-6.982c0-3.355,2.464-5.021,5.5-5.019,3.038-0.002,5.5,1.663,5.5,5.019,0,1.54-4.03,6.98-4.03,6.98z"/>
-<rect height="2" width="4" y="10"/>
-<rect height="2" width="4" x="26" y="10"/>
-<rect height="4" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -0.7621 5.2862)" width="2" x="5" y="1.563"/>
-<rect height="4" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 38.4511 23.053)" width="2" x="23" y="1.563"/>
+</g>
+<path d="M5.045,12.991C5.1,12.32,5.21,11.682,5.362,11.073C5.249,11.029,5.129,11,5,11l-3,0c-0.552,0-1,0.448-1,1s0.448,1,1,1h3  C5.016,13,5.029,12.992,5.045,12.991z"/>
+<path d="M7.539,6.955c0.455-0.49,0.963-0.928,1.525-1.303L6.618,3.204C6.276,2.862,5.684,2.902,5.293,3.293S4.862,4.277,5.204,4.618  L7.539,6.955z"/>
+<path d="M15,4c0.341,0,0.673,0.017,1,0.042V0.833C16,0.373,15.553,0,15,0s-1,0.373-1,0.833v3.208C14.327,4.017,14.659,4,15,4z"/>
+<path d="M22.38,6.863l2.238-2.24c0.345-0.344,0.308-0.94-0.083-1.331s-0.986-0.428-1.331-0.083l-2.368,2.37  C21.404,5.947,21.918,6.38,22.38,6.863z"/>
+<path d="M28,11l-3.172,0c-0.07,0-0.131,0.026-0.197,0.04c0.157,0.621,0.27,1.273,0.324,1.96H28c0.552,0,1-0.448,1-1S28.552,11,28,11  z"/>
+<path d="M23,14.1C23,8.577,19.419,6,15,6s-8,2.577-8,8.1c0,3.092,1.393,5.822,3.243,7.629L11,24l0,0h8l0,0l0.757-2.271  C21.607,19.922,23,17.191,23,14.1z M15,9c2.281,0,5,0.885,5,5.1c0,3.986-3.288,6.9-5,6.9s-5-2.914-5-6.9C10,9.885,12.719,9,15,9z"/>
+<path d="M11,27c0,1.104,0.896,2,2,2h4c1.104,0,2-0.896,2-2v-2h-8V27z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<rect fill="none" height="30" width="30"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="3.75" width="5.25" x="12.33" y="21.75"/>
-<path d="M11.13,8.065c0.958-0.876,2.313-1.317,3.822-1.315,2.901-0.002,5.25,1.612,5.25,4.861,0,0.715-0.877,2.285-1.793,3.734l1.641,1.641c1.595-2.465,2.402-4.267,2.402-5.375,0-4.252-3.012-7.111-7.506-7.111-2.239,0-4.111,0.713-5.424,1.958l1.614,1.618z"/>
-<path d="M15.22,18.38h-1.666s-1.937-2.652-3.063-4.727l-2.979-2.981c-0.035,0.308-0.058,0.621-0.058,0.944,0,1.482,1.441,4.205,4.283,8.093l0.674,0.922h5.057l-2.25-2.24z"/>
-<rect height="33.24" transform="matrix(-0.7062 0.708 -0.708 -0.7062 36.1343 15.0037)" width="1.4" x="14.25" y="-1.62"/>
+</g>
+<path d="M11,26c0,1.104,0.896,2,2,2h4c1.104,0,2-0.896,2-2v-2h-8V26z"/>
+<path d="M15,8c2.281,0,5,0.885,5,5.1c0,0.839-0.152,1.626-0.397,2.354l2.293,2.292C22.574,16.363,23,14.789,23,13.1  C23,7.577,19.419,5,15,5c-1.73,0-3.328,0.401-4.637,1.214l2.221,2.22C13.354,8.113,14.203,8,15,8z"/>
+<path d="M18.853,23l-3.137-3.137C15.459,19.953,15.217,20,15,20c-1.543,0-4.356-2.369-4.9-5.753l-2.953-2.954  C7.053,11.857,7,12.456,7,13.1c0,3.092,1.393,5.822,3.243,7.629L11,23H18.853z"/>
+<path d="M27.694,26.373L3.628,2.307c-0.389-0.389-1.004-0.41-1.367-0.048S1.919,3.236,2.308,3.625l24.068,24.07  c0.389,0.389,1.004,0.408,1.366,0.045S28.083,26.762,27.694,26.373z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M24.64,2.317c-1.588,1.121-4.315,2.698-5.496,2.698h-0.004c-0.271-0.031-0.67-0.292-1.092-0.568-0.836-0.548-1.982-1.299-3.654-1.31-0.963,0-2.313,0.739-3.456,1.504l5.146,13.32c0.676-1.401,1.627-3.068,2.503-3.689,0.306-0.218,1.161-0.649,1.849-0.995,0.693-0.351,1.294-0.653,1.648-0.878,2.91-1.868,3.971-8.409,4.082-9.149l0.33-2.251-1.86,1.317z"/>
-<polygon points="8.435,3.566,3.5,5.465,4.802,8.84,5.583,8.539,12.58,26.66,15.88,29,16.74,25.07"/>
+</g>
+<path d="M8.74,6.406C8.351,5.373,7.197,4.85,6.163,5.239L4.291,5.943c-1.033,0.39-1.556,1.543-1.166,2.577  c0.389,1.034,1.543,1.556,2.576,1.167l0,0l6.695,17.781c0.389,1.033,1.543,1.557,2.576,1.168c1.033-0.391,1.557-1.543,1.166-2.577  L8.74,6.406z"/>
+<path d="M25.938,1c0,0-3.622,4.569-5.846,4.338c-3.146-0.326-3.652-4.104-9.832-0.572l4.932,13.102c0,0,2.104-2.928,3.975-3.633  C21.039,13.529,26.654,11.416,25.938,1z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location_collection.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location_collection.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location_collection.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M17.59,10.22c-0.906,0.64-2.466,1.541-3.142,1.541h-0.002c-0.154-0.018-0.383-0.167-0.623-0.324-0.479-0.314-1.133-0.742-2.09-0.749-0.551,0-1.32,0.422-1.975,0.859l2.935,7.61c0.387-0.801,0.93-1.753,1.432-2.108,0.176-0.124,0.664-0.371,1.057-0.568,0.396-0.2,0.738-0.373,0.942-0.502,1.664-1.067,2.27-4.806,2.332-5.228l0.193-1.287-1.06,0.757z"/>
-<polygon points="8.333,10.93,5.513,12.02,6.257,13.95,6.704,13.77,10.7,24.13,12.59,25.47,13.08,23.22"/>
-<polygon points="5.999,1,5.999,4,26,4,26,24,29,24,29,1"/>
-<path d="M1,29h23v-23h-23v23zm3-20h17v17h-17v-17z"/>
+</g>
+<path d="M27,1H8C6.896,1,6,1.896,6,3v1h20v17v3h1c1.104,0,2-0.896,2-2V3C29,1.896,28.104,1,27,1z"/>
+<path d="M22,6H3C1.896,6,1,6.896,1,8v19c0,1.104,0.896,2,2,2h19c1.104,0,2-0.896,2-2V8C24,6.896,23.104,6,22,6z M12.201,27.543  c-0.73,0.274-1.547-0.095-1.822-0.826L5.645,14.143c-0.73,0.275-1.547-0.094-1.821-0.824c-0.275-0.731,0.095-1.547,0.825-1.822  l1.323-0.498c0.731-0.275,1.547,0.094,1.822,0.824l5.232,13.898C13.302,26.451,12.932,27.268,12.201,27.543z M15.167,17.358  c-1.323,0.499-2.811,2.569-2.811,2.569l-3.488-9.265c4.37-2.498,4.729,0.173,6.952,0.404C17.395,11.23,19.955,8,19.955,8  C20.462,15.365,16.49,16.86,15.167,17.358z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_log.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_log.svg	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M0,0v30h30v-30h-30zm28.24,26.99l-6.012-6.012-0.454,2.042,5.218,5.219h-24.37l5.535-5.534-0.454-2.042-5.942,5.941v-23.6l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202-2.479-1.04-3.137-2.756-3.311-3.69l-3.856-3.856h23.59l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738v24.36z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect height="3.519" width="17.65" x="6.177" y="13.25"/>
-<polygon points="9.706,25.59,20.29,25.59,22.06,17.65,7.941,17.65"/>
-<path d="M10.52,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766v-3.871c0.866,0.304,2.249,0.588,3.599,0.017,2.926-1.238,2.831-3.499,2.831-3.499s-1.41-1.298-4.335-0.06c-2.645,1.12-2.94,2.791-2.973,3.101h-0.01c-0.032-0.31-0.328-1.98-2.973-3.101-2.925-1.238-4.335,0.06-4.335,0.06s-0.102,2.261,2.825,3.499z"/>
-</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_low_light.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_low_light.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_low_light.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="4" width="2" x="14" y="0"/>
-<rect height="4" width="6" x="12" y="26"/>
-<path d="M15,6.215c-5.001,0-8.495,3.297-8.495,8.019,0,0.694,0,2.538,4.627,8.769l0.898,1.213h5.951l0.898-1.213c4.625-6.23,4.625-8.074,4.625-8.769,0-4.718-3.49-8.015-8.5-8.015zm1.47,15h-2.931s-4.036-5.435-4.036-6.981c0-3.355,2.463-5.021,5.5-5.019,3.037-0.002,5.5,1.663,5.5,5.019,0,1.54-4.03,6.98-4.03,6.98z"/>
-<rect height="4" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -0.7621 5.2862)" width="2" x="5" y="1.563"/>
-<rect height="4" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 38.4511 23.053)" width="2" x="23" y="1.563"/>
+</g>
+<path d="M7.539,6.955c0.455-0.49,0.963-0.929,1.525-1.304L6.618,3.204C6.276,2.862,5.684,2.902,5.293,3.293S4.862,4.277,5.204,4.618  L7.539,6.955z"/>
+<path d="M15,4c0.341,0,0.673,0.017,1,0.041V0.833C16,0.373,15.553,0,15,0s-1,0.373-1,0.833v3.208C14.327,4.017,14.659,4,15,4z"/>
+<path d="M22.379,6.863l2.239-2.24c0.345-0.344,0.308-0.939-0.083-1.33s-0.986-0.428-1.331-0.084l-2.368,2.37  C21.404,5.947,21.918,6.38,22.379,6.863z"/>
+<path d="M23,14.1C23,8.577,19.419,6,15,6s-8,2.577-8,8.1c0,3.091,1.393,5.822,3.243,7.629L11,24h8l0.757-2.271  C21.607,19.922,23,17.19,23,14.1z M15,9c2.281,0,5,0.885,5,5.1c0,3.986-3.288,6.9-5,6.9s-5-2.914-5-6.9C10,9.885,12.719,9,15,9z"/>
+<path d="M11,27c0,1.104,0.896,2,2,2h4c1.104,0,2-0.896,2-2v-2h-8V27z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_horizontal.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_horizontal.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_horizontal.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,5 +4,5 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M19,10h-18v4h18c3.309,0,6,2.691,6,6h4c0-5.51-4.49-10-10-10z"/>
+<path d="M19,10H3c-1.104,0-2,0.896-2,2s0.896,2,2,2h16c3.309,0,6,2.691,6,6c0,1.104,0.896,2,2,2s2-0.896,2-2  C29,14.486,24.514,10,19,10z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_vertical.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_vertical.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_vertical.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,5 +4,5 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M10,11v18h4v-18c0-3.309,2.691-6,6-6v-4c-5.51,0-10,4.486-10,10z"/>
+<path d="M20,1c-5.514,0-10,4.486-10,10v16c0,1.104,0.896,2,2,2s2-0.896,2-2V11c0-3.309,2.691-6,6-6c1.104,0,2-0.896,2-2  S21.104,1,20,1z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_memory_in_use.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_memory_in_use.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_memory_in_use.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,7 +4,5 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M18.24,1h-14.24v28h22v-20.24l-7.76-7.758zm4.76,25h-16v-22h10l6,6v16z"/>
-<polygon points="16.75,5,16,5,16,7,14,7,14,5,12,5,12,7,10,7,10,5,8,5,8,15,22,15,22,10.25"/>
-<rect height="2" width="14" x="8" y="23"/>
+<path d="M24,1H12c-1.1,0-2.637,0.637-3.414,1.414L5.414,5.586C4.637,6.363,4,7.9,4,9v4h1v3H4v11c0,1.1,0.9,2,2,2h18c1.1,0,2-0.9,2-2  V3C26,1.9,25.1,1,24,1z M18,3h2v5h-2V3z M14,3h2v5h-2V3z M10,3h2v5h-2V3z M6,7h2v5H6V7z M23,26H7v-4h16V26z M24,8h-2V3h2V8z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_mute.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_mute.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_mute.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="30" width="30"/>
-<path d="M12.39,8.243l4.364-4.364c1.17-1.17,3.073-1.17,4.242,0l2.13,2.121c1.169,1.17,1.169,3.073,0,4.243l-4.363,4.363,1.414,1.414,4.363-4.363c1.953-1.953,1.953-5.118,0-7.071l-2.121-2.121c-1.953-1.953-5.119-1.953-7.071,0l-4.364,4.364,1.41,1.421z"/>
-<path d="M17,12.5c0-1.93-1.57-3.5-3.5-3.5-0.109,0-0.212,0.021-0.318,0.032l3.786,3.785c0.01-0.11,0.03-0.21,0.03-0.32z"/>
-<path d="M20,26h-5v-4.808l1.023-1.022-9.19-9.19-1.387,1.388c-0.791,0.791-1.245,1.782-1.396,2.81l-0.019,0.019,0.016,0.016c-0.209,1.499,0.245,3.074,1.398,4.228l2.121,2.121c1.153,1.153,2.728,1.607,4.227,1.398l0.016,0.016,0.019-0.019c0.059-0.009,0.117-0.007,0.175-0.017v3.05h-5c-0.553,0-1,0.447-1,1v2h15v-2c0-0.55-0.45-1-1-1z"/>
-<rect height="35.83" transform="matrix(0.7066 -0.7076 0.7076 0.7066 -6.1479 14.8607)" width="1.867" x="13.91" y="-3.069"/>
+<path d="M27.693,26.372c0.389,0.389,0.41,1.005,0.048,1.368c-0.362,0.362-0.978,0.343-1.366-0.046L2.307,3.625  C1.918,3.236,1.896,2.621,2.26,2.258c0.363-0.362,0.979-0.34,1.367,0.049L27.693,26.372z"/>
+<path d="M25.799,6.65L20.85,1.701c-1.172-1.172-3.071-1.172-4.243,0L11.26,7.049l3.545,3.545c0.514,0.075,1.009,0.302,1.404,0.697  c0.395,0.396,0.623,0.891,0.697,1.404l3.545,3.546l5.348-5.348C26.971,9.722,26.971,7.822,25.799,6.65z"/>
+<path d="M7.08,11.228l-3.201,3.201c-1.172,1.172-1.172,3.071,0,4.243l4.949,4.949c1.172,1.172,3.071,1.172,4.243,0l3.201-3.201  L7.08,11.228z"/>
+<path d="M18.997,27H15v-3.894l-1.222,1.222c-0.5,0.5-1.114,0.835-1.778,1.016V27H7.981C6.948,27,6.107,27.784,6,28.787V30h15v-1  C21,27.896,20.104,27,18.997,27z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_unmute.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_unmute.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_unmute.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="30" width="30"/>
-<path d="M24.56,4.586l-2.121-2.121c-1.953-1.953-5.119-1.953-7.071,0l-4.95,4.95-1.42-1.415-2.121,2.121,1.414,1.415-2.828,2.828c-0.791,0.791-1.245,1.782-1.396,2.81l-0.019,0.019,0.016,0.016c-0.209,1.499,0.245,3.074,1.398,4.228l2.121,2.121c1.153,1.153,2.728,1.607,4.227,1.398l0.016,0.016,0.019-0.019c0.059-0.009,0.117-0.007,0.175-0.017v3.06h-5c-0.553,0-1,0.447-1,1v2h15v-2c0-0.553-0.447-1-1-1h-5v-4.808l2.464-2.464,1.414,1.414,2.121-2.121-1.414-1.414,4.95-4.95c1.96-1.956,1.96-5.121,0.01-7.074zm-11.04,9.914c-1.104,0-2-0.896-2-2s0.896-2,2-2,2,0.896,2,2-0.89,2-2,2zm9.62-4.26l-4.95,4.95-1.419-1.42c0.155-0.396,0.248-0.823,0.248-1.273,0-1.93-1.57-3.5-3.5-3.5-0.45,0-0.878,0.093-1.273,0.248l-0.42-0.419,4.95-4.95c1.17-1.17,3.073-1.17,4.242,0l2.12,2.121c1.17,1.17,1.17,3.073,0,4.24z"/>
+<path d="M25.799,6.65L20.85,1.701c-1.172-1.172-3.071-1.172-4.243,0L11.26,7.049l3.545,3.545c0.514,0.076,1.009,0.303,1.404,0.697  c0.395,0.396,0.623,0.891,0.697,1.404l3.545,3.547l5.348-5.348C26.971,9.723,26.971,7.822,25.799,6.65z"/>
+<path d="M16.767,13.971c-0.122,0.313-0.306,0.604-0.558,0.855c-0.977,0.977-2.559,0.977-3.535,0c-0.977-0.975-0.977-2.559,0-3.535  c0.252-0.252,0.544-0.436,0.855-0.557L9.138,6.342l-2.12,2.121l1.414,1.414L3.879,14.43c-1.172,1.172-1.172,3.07,0,4.242  l4.949,4.949c1.172,1.172,3.071,1.172,4.243,0l4.552-4.551l1.414,1.414l2.121-2.121L16.767,13.971z"/>
+<path d="M18.997,27H15v-3.893l-1.222,1.221c-0.5,0.5-1.114,0.836-1.778,1.016V27H7.981C6.948,27,6.107,27.785,6,28.787V30h15v-1  C21,27.896,20.104,27,18.997,27z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_minus.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_minus.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_minus.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g>
 <rect fill="none" height="30" width="30"/>
-<rect height="4" width="22" x="4" y="13"/>
+</g>
+<path d="M24,13c1.104,0,2,0.896,2,2l0,0c0,1.105-0.896,2-2,2H6c-1.104,0-2-0.895-2-2l0,0c0-1.104,0.896-2,2-2H24z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_missed_call_unseen.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_missed_call_unseen.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_missed_call_unseen.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<path d="M22,14L13,2L4,14h5v6c0,4.418,3.582,8,8,8h5v-5h-3c-1.103,0-2-0.897-2-2v-7H22z"/>
-<rect height="3.615" transform="matrix(0.9029 -0.4298 0.4298 0.9029 -0.8692 12.117)" width="6.284" x="23.244" y="6.175"/>
-<rect height="6.285" transform="matrix(0.9206 0.3906 -0.3906 0.9206 3.0913 -8.0028)" width="3.615" x="19.413" y="0.456"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-3 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M18,23.051V23h-3c-1.103,0-2-0.898-2-2v-7.007l3.002-0.002c0.784-0.001,1.496-0.46,1.82-1.175  C17.941,12.553,18,12.271,18,11.992c0-0.477-0.17-0.947-0.496-1.318l-7-7.992C10.125,2.248,9.576,2,9,2  C8.423,2,7.875,2.249,7.494,2.684l-6.999,8C0.17,11.055,0,11.525,0,12c0,0.28,0.059,0.563,0.18,0.827  C0.504,13.541,1.217,14,2.002,14L5,13.998V20c0,4.418,3.582,8,8,8h5v-0.051c1.141-0.231,2-1.24,2-2.449S19.141,23.282,18,23.051z"/>
+<rect height="3.615" transform="matrix(0.903 -0.4296 0.4296 0.903 -1.1617 10.8206)" width="6.283" x="20.244" y="6.176"/>
+<rect height="3.615" transform="matrix(0.3908 -0.9205 0.9205 0.3908 7.7888 18.9653)" width="6.283" x="15.08" y="1.791"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mobile.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mobile.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mobile.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,5 +4,6 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M21,1H9C7.35,1,6,2.35,6,4v22c0,1.65,1.35,3,3,3h12c1.65,0,3-1.35,3-3V4C24,2.35,22.65,1,21,1z M11,26H8v-2h3V26z M15,27  c-1.104,0-2-0.896-2-2s0.896-2,2-2c1.105,0,2,0.896,2,2S16.105,27,15,27z M22,26h-3v-2h3V26z M22,21H8V3h14V21z"/>
+<rect height="16" width="12" x="9" y="4"/>
+<path d="M22,1H8C6.896,1,6,1.896,6,3v24c0,1.104,0.896,2,2,2h14c1.105,0,2-0.896,2-2V3C24,1.896,23.105,1,22,1z M11,26H8v-2h3V26z   M15,27c-1.104,0-2-0.896-2-2s0.896-2,2-2c1.105,0,2,0.896,2,2S16.105,27,15,27z M22,26h-3v-2h3V26z M22,21H8V3h14V21z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mono_recognize_song.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mono_recognize_song.svg	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<path d="M23,5L13,2v17.357C12.31,19.129,11.549,19,10.75,19C7.574,19,5,21.016,5,23.5S7.574,28,10.75,28S17,25.984,17,23.5  c0-0.168,0-13.449,0-13.449L23,12V5z"/>
-<path d="M20,17.014v-1.581C21.043,15.145,21.975,15,22.795,15c1.363,0,2.405,0.279,3.124,0.838C26.64,16.396,27,17.219,27,18.31  c0,0.459-0.104,0.93-0.311,1.412c-0.21,0.48-0.705,1.118-1.488,1.916c-0.573,0.576-0.957,1.007-1.149,1.291  c-0.192,0.286-0.29,0.614-0.29,0.989v0.836h-2.297v-0.965c0-0.619,0.136-1.156,0.407-1.609c0.271-0.453,0.689-0.953,1.257-1.498  c0.598-0.589,0.967-1.037,1.108-1.342c0.142-0.307,0.212-0.607,0.212-0.901c0-0.613-0.171-1.073-0.516-1.379  c-0.343-0.306-0.858-0.46-1.546-0.46C21.718,16.6,20.923,16.737,20,17.014z M22.613,29c-0.398,0-0.735-0.142-1.013-0.428  c-0.278-0.283-0.416-0.629-0.416-1.033s0.138-0.747,0.416-1.029c0.277-0.283,0.614-0.423,1.013-0.423s0.735,0.14,1.014,0.423  c0.277,0.282,0.415,0.625,0.415,1.029s-0.139,0.75-0.421,1.033C23.342,28.858,23.006,29,22.613,29z"/>
-</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_more.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_more.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_more.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<circle cx="4.5" cy="14.5" r="3.5"/>
-<circle cx="15.5" cy="14.5" r="3.5"/>
-<circle cx="25.5" cy="14.5" r="3.5"/>
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-1 -11 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<circle cx="3.5" cy="3.5" r="3.5"/>
+<circle cx="14.5" cy="3.5" r="3.5"/>
+<circle cx="24.5" cy="3.5" r="3.5"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_music_albums.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_music_albums.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_music_albums.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M10.5,22c1.934,0,3.5-1.344,3.5-3v-7.333L18,13V9l-6-2v9.3c-0.456-0.187-0.961-0.3-1.5-0.3C8.566,16,7,17.343,7,19  C7,20.656,8.566,22,10.5,22z"/>
-<path d="M23,6h1V5.268V3H1v24h23v-2.268V24h-1V6z M20,24H4V6h16V24z"/>
-<path d="M25,6.079V7h-1v16h1v0.921c2.449-2.195,4-5.372,4-8.921S27.449,8.274,25,6.079z"/>
+<path d="M24,6V5c0-1.104-0.896-2-2-2H3C1.896,3,1,3.896,1,5v20c0,1.104,0.896,2,2,2h19c1.104,0,2-0.896,2-2v-1h-2V6H24z M18,11.615  c0,0.176-0.08,0.341-0.217,0.45c-0.104,0.083-0.362,0.127-0.362,0.127c-0.042,0-0.083-0.005-0.126-0.014l-3.348-0.741  c0,2.301,0,7.889,0,7.966c0,1.434-1.779,2.597-3.618,2.597S7,20.837,7,19.403c0-1.433,1.49-2.596,3.329-2.596  c0.462,0,0.903,0.074,1.303,0.206v-6.552V8.153V7.577c0-0.175,0.079-0.341,0.216-0.451C11.952,7.044,12.08,7,12.211,7  c0.041,0,0.084,0.005,0.125,0.014l5.211,1.153C17.812,8.227,18,8.46,18,8.73V11.615z"/>
+<path d="M25.799,6.859C25.477,7.532,24.795,8,24,8v14c0.795,0,1.477,0.468,1.799,1.141C27.779,21,29,18.146,29,15  S27.779,9,25.799,6.859z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_new_event.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_new_event.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_new_event.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,6 +2,6 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <rect fill="none" height="30" width="30"/>
-<polygon points="18.88,18,21.13,1,8.867,1,11.12,18"/>
-<path d="M15,19c-2.756,0-5,2.243-5,5,0,2.756,2.244,5,5,5s4.999-2.244,4.999-5c0-2.76-2.24-5-5-5z"/>
+<path d="M11.965,17.67c0.902-0.425,1.907-0.67,2.97-0.67c1.103,0,2.142,0.264,3.071,0.719C18.544,17.385,18.898,16.775,19,16l2-13  c0-1.104-0.896-2-2-2h-8C9.896,1,9,1.896,9,3l2,13C11.139,16.694,11.464,17.312,11.965,17.67z"/>
+<circle cx="14.935" cy="24" r="5"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_next.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_next.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_next.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="20,4 20,15 20,26 24,26 24,4 "/>
-<polygon points="6,26 20,15 6,4 "/>
+<path d="M20,24c0,1.104,0.896,2,2,2l0,0c1.104,0,2-0.896,2-2V6c0-1.104-0.896-2-2-2l0,0c-1.104,0-2,0.896-2,2V24z"/>
+<path d="M8,26c0.484,0,0.963-0.176,1.338-0.514l10-9C19.76,16.107,20,15.566,20,15s-0.24-1.107-0.662-1.486l-10-9  C8.963,4.176,8.484,4,8,4C7.725,4,7.447,4.057,7.187,4.173C6.465,4.494,6,5.21,6,6v18c0,0.79,0.465,1.506,1.187,1.827  C7.447,25.943,7.725,26,8,26L8,26z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<path d="M15.25,15c0-5.596,3.541-10.35,8.5-12.18-1.4-0.521-2.92-0.82-4.5-0.82-7.18,0-13,5.82-13,13s5.821,13,13,13c1.584,0,3.096-0.297,4.5-0.816-4.96-1.83-8.5-6.58-8.5-12.18z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-6 -2 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M9.257,13c0-5.596,3.642-10.35,8.743-12.185C16.555,0.301,15.002,0,13.37,0C5.984,0,0,5.819,0,13c0,7.18,5.984,13,13.37,13  c1.632,0,3.185-0.295,4.63-0.816C12.898,23.353,9.257,18.596,9.257,13z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night_portrait.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night_portrait.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night_portrait.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="30" width="30"/>
-<path d="M22.443,18.261c-0.01-0.135-0.002-0.785,0-0.922c0.932-0.627,1.584-1.365,2.074-2.328c0.908-1.781,0.422-5.977,0.422-5.977  C24.939,7.175,22.471,5,20.59,5h-1.191c-1.879,0-4.354,2.176-4.354,4.035c0,0-0.43,4.174,0.42,5.971  c0.467,0.982,1.139,1.709,2.092,2.334c0.002,0.129,0.01,0.795,0.002,0.922c-0.117,1.822-6.258,5.09-6.559,5.484V29h2.988v-2h2v2h8  v-2h2v2H29v-5.25C28.699,23.353,22.559,20.083,22.443,18.261z"/>
-<path d="M6.143,8.5c0-3.229,2.023-5.971,4.857-7.029C10.197,1.173,9.334,1,8.428,1C4.324,1,1,4.357,1,8.5S4.324,16,8.428,16  c0.906,0,1.77-0.17,2.572-0.471C8.166,14.472,6.143,11.728,6.143,8.5z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-1 -1 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M5.143,7.5c0-3.229,2.023-5.971,4.857-7.029C9.197,0.174,8.334,0,7.428,0C3.324,0,0,3.357,0,7.5S3.324,15,7.428,15  c0.906,0,1.77-0.17,2.572-0.471C7.166,13.473,5.143,10.729,5.143,7.5z"/>
+<path d="M8,27c0.02-0.284,0.561-6.051,5.498-6.543c1.136-0.024,2.5-0.562,2.5-1.996v-0.362c0-0.158-0.074-0.309-0.205-0.404  C14.123,16.479,13,13.985,13,11.481C13,7.905,15.242,5,18,5s5,2.905,5,6.481c0,2.504-1.123,4.998-2.797,6.213  c-0.127,0.096-0.205,0.246-0.205,0.404v0.362c0,1.58,1.639,1.996,2.501,1.996C27.439,20.949,27.977,26.716,28,27H8z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_all.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_all.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_all.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,12 +4,6 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="11,29 11,21 3,21 "/>
-<rect height="2" width="2" x="9" y="14"/>
-<rect height="2" width="9" x="12" y="14"/>
-<rect height="2" width="2" x="9" y="9"/>
-<rect height="2" width="9" x="12" y="9"/>
-<polygon points="6,5 8,5 8,2 3,2 3,20 6,20 "/>
-<polygon points="22,2 22,5 24,5 24,26 12,26 12,29 27,29 27,2 "/>
-<rect height="5" width="10" x="10"/>
+<path d="M24,3h-3v2c0,1.104-0.896,2-2,2h-8C9.896,7,9,6.104,9,5V3H6C4.896,3,4,3.896,4,5v17l7,7h13c1.104,0,2-0.896,2-2V5  C26,3.896,25.104,3,24,3z M8,11h2v2H8V11z M8,16h2v2H8V16z M11,26.879L6.121,22H9c1.104,0,2,0.896,2,2V26.879z M22,18H11v-2h11V18z   M22,13H11v-2h11V13z"/>
+<path d="M11,6h8c0.552,0,1-0.447,1-1V2c0-0.553-0.448-1-1-1h-8c-0.552,0-1,0.447-1,1v3C10,5.553,10.448,6,11,6z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_collections.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_collections.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_collections.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,11 +4,6 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="5.999,1 5.999,4 26,4 26,24 29,24 29,1 "/>
-<polygon points="1,21 4,21 4,9 21,9 21,26 9,26 9,29 24,29 24,6 1,6 "/>
-<polygon points="8,29 8,22 1,22 "/>
-<rect height="2" width="2" x="7" y="17"/>
-<rect height="2" width="8" x="10" y="17"/>
-<rect height="2" width="2" x="7" y="12"/>
-<rect height="2" width="8" x="10" y="12"/>
+<path d="M27,1H8C6.896,1,6,1.896,6,3v1h20v17v3h1c1.104,0,2-0.896,2-2V3C29,1.896,28.104,1,27,1z"/>
+<path d="M22,6H3C1.896,6,1,6.896,1,8v14l7,7h14c1.104,0,2-0.896,2-2V8C24,6.896,23.104,6,22,6z M5,11h2v2H5V11z M5,16h2v2H5V16z   M8,26.879L3.121,22H6c1.104,0,2,0.896,2,2V26.879z M20,18H8v-2h12V18z M20,13H8v-2h12V13z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_offline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_offline.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_offline.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon fill="none" points="20.22,5.712,13.87,5.712,13.87,12.74,20.22,7.489"/>
-<polygon fill="none" points="4.585,5.712,4.585,7.453,10.79,12.69,10.79,5.712"/>
-<path d="M1.509,2.634v6.247l9.281,7.836v10.59h3.079v-10.58l9.43-7.788v-6.305h-21.79zm3.076,4.819v-1.741h6.205v6.98l-6.205-5.237zm9.285-1.741h6.349v1.776l-6.349,5.249v-7.028z"/>
-<polygon points="28.6,17.96,26.54,15.9,22.72,19.73,18.9,15.9,16.83,17.96,20.66,21.79,16.83,25.61,18.9,27.67,22.72,23.85,26.54,27.67,28.6,25.61,24.78,21.79"/>
-<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.639"/>
-<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.639"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<path d="M1.001,2.061v6.457l9.591,8.098v10.943h3.182V16.625l9.744-8.049V2.061H1.001z M4.18,7.041V5.242h6.412v7.213L4.18,7.041z   M13.773,5.242h6.561v1.836l-6.561,5.424V5.242z"/>
+<polygon points="29,17.903 26.87,15.773 22.919,19.725 18.968,15.773 16.835,17.901 20.787,21.854 16.835,25.806 18.968,27.938   22.919,23.986 26.87,27.938 29,25.806 25.049,21.854 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_online_support.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_online_support.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_online_support.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<polygon points="9.49,8.148 17.801,10.801 19.199,8 13.601,6.601 "/>
-<path d="M15,1C7.267,1,1,7.267,1,15c0,0.278,0.025,0.55,0.042,0.824c0.045-0.025,0.082-0.062,0.13-0.083l4.591-2.088  c-0.423-1.019,0.124-3.402,0.441-3.792c0.328-0.4,2.885-2.153,2.885-2.153L8.76,7.233C8.538,6.758,9.964,6.102,9.964,6.102  c0.548,0.367,0.912,0,0.912,0l0.146-0.366l-0.146-0.546l1.132-1.405l1.082-0.25c0.624-0.103,1.259-0.171,1.911-0.171  c1.384,0,2.705,0.255,3.936,0.7l-1.136,1.136l1.398,1.401l1.401-1.401l-0.772-0.771c3.815,1.754,6.528,5.505,6.777,9.915  c-0.795-1.197-1.602-3.495-1.602-3.495l-1.788-0.328L21.608,9.9l0.913,1.239l0.656-0.291c0,0,0.804,0.767,0.766,1.021  c-0.034,0.258-1.237,1.424-1.237,1.424l-1.057,0.377l-1.391-1.145l-1.06-0.874l0.656,1.569l0.878,0.913c0,0,1.534-0.219,1.753-0.037  c0.22,0.181-0.293,1.572-0.293,1.572l-2.557,2.626l-0.253,2.627c-1.426,0.734-1.571,1.859-1.571,1.859s-0.365-0.069-1.313,0.991  c-0.95,1.057-1.973,0.78-1.973,0.78c-1.206,0-1.425-0.78-1.425-1.037c0-0.107-0.212-0.519-0.457-1.004  c0.017,0.693-0.313,1.353-0.901,1.731c-0.329,0.212-0.706,0.318-1.083,0.318c-0.345,0-0.69-0.089-1-0.268l-0.866-0.501l-0.839,1.453  c-0.129,0.752-0.032,1.416,0.099,1.899C10.103,28.319,12.47,29,15,29c7.733,0,14-6.267,14-14S22.733,1,15,1z M24.172,22.484  c-0.474,0.579-1.002,1.112-1.575,1.593l-1.185-1.067l1.399-2.801l1.989,0.392L24.172,22.484z"/>
-<path d="M6.062,24.525l2-3.464l2.599,1.5L9.83,14L2,17.562l2.598,1.5l-2,3.464c0,0-1.938,5.475,4.063,6.475  C6.66,29,5.463,27.051,6.062,24.525z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 -2 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M15,0C8.112,0,2.491,5.361,2.043,12.137l3.571-1.765c0.054-1.057,0.374-2.246,0.589-2.511  c0.211-0.256,1.328-1.063,2.109-1.613l7.998,2.551L17.711,6l-5.601-1.4L8.989,5.775c0.058-0.039,0.1-0.068,0.1-0.068L8.759,5.232  C8.54,4.76,9.964,4.102,9.964,4.102c0.548,0.365,0.912,0,0.912,0l0.146-0.365l-0.146-0.547l0.677-0.842  C12.641,1.996,13.797,1.799,15,1.799c1.26,0,2.465,0.219,3.596,0.605l-0.797,0.795l1.4,1.4l1.326-1.326  c2.934,1.678,5.043,4.641,5.546,8.119c-0.585-1.176-1.067-2.545-1.067-2.545L23.215,8.52L21.61,7.9l0.913,1.238l0.656-0.291  c0,0,0.802,0.768,0.766,1.021c-0.036,0.258-1.239,1.424-1.239,1.424l-1.055,0.377l-1.393-1.145l-1.058-0.873l0.657,1.566  l0.876,0.914c0,0,1.533-0.219,1.752-0.037c0.22,0.182-0.291,1.572-0.291,1.572l-2.557,2.627l-0.255,2.627  c-1.424,0.732-1.57,1.859-1.57,1.859s-0.365-0.068-1.314,0.99c-0.948,1.059-1.972,0.781-1.972,0.781  c-1.204,0-1.423-0.781-1.423-1.039c0-0.254-1.205-2.225-1.205-2.885c0-0.656,0.365-1.459,0.365-1.459  c0.072-0.949-0.949-3.502-0.949-3.502h-0.787l0.395,6.139c0.07,1.106-0.469,2.156-1.409,2.74C9.034,22.844,8.487,23,7.928,23  c-0.477,0-0.947-0.114-1.371-0.332l-0.078,0.135C8.762,24.789,11.737,26,15,26c7.18,0,13-5.82,13-13S22.18,0,15,0z M22.116,21.643  l-0.703-0.635l1.4-2.799l1.884,0.371C24.022,19.748,23.152,20.789,22.116,21.643z"/>
+<path d="M8.463,12.739c-0.021-0.333-0.209-0.634-0.498-0.802c-0.154-0.089-0.328-0.134-0.5-0.134c-0.152,0-0.304,0.034-0.443,0.104  l-6.465,3.196C0.227,15.268,0.012,15.6,0,15.968s0.181,0.714,0.5,0.898l1.859,1.073l-1.494,2.586c0,0-1.938,5.475,4.063,6.475  c0,0-1.197-1.949-0.598-4.475l1.492-2.586l1.605,0.927C7.583,20.955,7.756,21,7.928,21c0.184,0,0.367-0.051,0.528-0.15  c0.313-0.195,0.493-0.546,0.47-0.914L8.463,12.739z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_options_menu.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_options_menu.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_options_menu.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="28.5,7,15,25,1.5,7"/>
+<g>
 <rect fill="none" height="30" width="30"/>
+</g>
+<path d="M27,7c0-0.334-0.084-0.668-0.25-0.97C26.396,5.395,25.727,5,25,5H5C4.273,5,3.604,5.395,3.25,6.03C3.084,6.332,3,6.666,3,7  c0,0.369,0.102,0.736,0.305,1.061l9.999,16C13.67,24.645,14.311,25,15,25s1.33-0.355,1.696-0.939l9.999-16  C26.898,7.736,27,7.369,27,7L27,7z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_organize.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_organize.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_organize.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="12,13,8.526,13,8.526,10,1,15.03,8.526,20,8.526,17,12,17"/>
-<polygon points="18,17,21.47,17,21.47,20,29,14.97,21.47,10,21.47,13,18,13"/>
-<polygon points="17,12,17,8.526,20,8.526,14.97,1,10,8.526,13,8.526,13,12"/>
-<polygon points="13,18,13,21.47,10,21.47,15.03,29,20,21.47,17,21.47,17,18"/>
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
+<path d="M19.781,6.375l-4-5C15.592,1.139,15.303,1,15,1c-0.305,0-0.592,0.139-0.781,0.375l-4,5c-0.24,0.301-0.287,0.712-0.121,1.059  C10.266,7.779,10.615,8,11,8h2v4h4V8h2c0.385,0,0.734-0.221,0.9-0.566C20.068,7.087,20.021,6.676,19.781,6.375z"/>
+<path d="M23.625,19.781l5-4C28.861,15.592,29,15.304,29,15s-0.139-0.592-0.375-0.781l-5-4c-0.301-0.24-0.713-0.287-1.059-0.12  S22,10.615,22,11v2h-4v4h4v2c0,0.385,0.221,0.734,0.566,0.901S23.324,20.021,23.625,19.781z"/>
+<path d="M6.375,19.781l-5-4C1.139,15.592,1,15.304,1,15s0.139-0.592,0.375-0.781l5-4c0.301-0.24,0.711-0.287,1.059-0.12  C7.779,10.266,8,10.615,8,11v2h4v4H8v2c0,0.385-0.221,0.734-0.566,0.901C7.086,20.068,6.676,20.021,6.375,19.781z"/>
+<path d="M10.219,23.625l4,5C14.408,28.861,14.695,29,15,29c0.303,0,0.592-0.139,0.781-0.375l4-5c0.24-0.301,0.287-0.712,0.119-1.059  C19.734,22.221,19.385,22,19,22h-2v-4h-4v4h-2c-0.385,0-0.734,0.221-0.902,0.566C9.932,22.913,9.979,23.324,10.219,23.625z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_outbox.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_outbox.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_outbox.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g>
 <rect fill="none" height="30" width="30"/>
-<polygon points="26,20 26,24 4,24 4,20 1,20 1,29 2,29 4,29 26,29 28,29 29,29 29,20 "/>
-<polygon points="11,19 19,19 19,11 23,11 15,1 7,11 11,11 "/>
+</g>
+<path d="M21.799,9.4l-6-8C15.611,1.148,15.314,1,15,1s-0.611,0.148-0.801,0.4l-6,8c-0.227,0.303-0.264,0.708-0.094,1.047  S8.621,11,9,11h3v6c0,0.553,0.447,1,1,1h4c0.553,0,1-0.447,1-1v-6h3c0.379,0,0.725-0.214,0.895-0.553S22.027,9.703,21.799,9.4z"/>
+<path d="M25.5,17c-0.828,0-1.5,0.672-1.5,1.5V21H6v-2.5C6,17.672,5.328,17,4.5,17S3,17.672,3,18.5V21v3.5V26h24v-1.5V21v-2.5  C27,17.672,26.328,17,25.5,17z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pause.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pause.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pause.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<path d="M12,23.5c0,1.381-1.119,2.5-2.5,2.5l0,0C8.119,26,7,24.881,7,23.5v-17C7,5.119,8.119,4,9.5,4l0,0C10.881,4,12,5.119,12,6.5  V23.5z"/>
+<path d="M23,23.5c0,1.381-1.119,2.5-2.5,2.5l0,0c-1.381,0-2.5-1.119-2.5-2.5v-17C18,5.119,19.119,4,20.5,4l0,0  C21.881,4,23,5.119,23,6.5V23.5z"/>
 <rect fill="none" height="30" width="30"/>
-</g>
-<rect height="22" width="4" x="7" y="4"/>
-<rect height="22" width="4" x="19" y="4"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_attach.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_attach.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_attach.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon fill="none" points="10.94,4.257,13.74,6.627,13.74,3.691,10.94,3.691"/>
-<polygon fill="none" points="15.86,3.691,15.86,6.66,18.74,4.276,18.74,3.691"/>
-<path d="M8.826,1.578v3.663l4.916,4.153v5.738h2.115v-5.73l4.994-4.128v-3.694h-12.02zm7.034,5.082v-2.969h2.879v0.584l-2.88,2.385zm-2.12-0.033l-2.807-2.37v-0.566h2.805v2.936h0.002z"/>
-<polygon points="16.74,22.22,18.21,24.58,22.22,24.58,20.76,22.22"/>
-<polygon points="10.48,22.22,11.94,24.58,15.93,24.58,14.47,22.22"/>
-<polygon points="23.03,22.22,24.25,24.17,24.25,22.22"/>
-<polygon points="9.66,24.58,9.667,24.58,8.199,22.22,5.432,22.22,9.496,28.73,11.48,27.49,10.79,26.39"/>
-<polygon points="19.97,17.36,21.43,19.72,24.24,19.72,20.18,13.21,18.18,14.46,19.99,17.36"/>
-<polygon points="19.15,19.72,17.69,17.36,13.74,17.37,15.2,19.72"/>
-<polygon points="5.432,17.76,5.432,19.72,6.655,19.72"/>
-<polygon points="12.92,19.72,11.46,17.37,7.463,17.37,8.929,19.72"/>
-<rect fill="none" height="29.03" width="29.03" x="0.323" y="0.639"/>
-<rect fill="none" height="29.03" width="29.03" x="0.323" y="0.639"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<polygon fill="none" points="10.966,3.738 13.867,6.188 13.867,3.154 10.966,3.154 "/>
+<polygon fill="none" points="16.053,3.154 16.053,6.222 19.027,3.758 19.027,3.154 "/>
+<path d="M8.787,0.971v3.785l5.08,4.291v5.93h2.186V9.056l5.16-4.267V0.971H8.787z M16.053,6.222V3.154h2.975v0.604L16.053,6.222z   M13.867,6.188l-2.901-2.449V3.154h2.899v3.033H13.867z"/>
+<polygon points="16.967,22.301 18.484,24.736 22.629,24.736 21.115,22.301 "/>
+<polygon points="10.493,22.302 12.005,24.736 16.129,24.736 14.616,22.301 "/>
+<polygon points="23.467,22.301 24.721,24.319 24.721,22.301 "/>
+<polygon points="9.648,24.736 9.655,24.736 8.139,22.302 5.279,22.302 9.479,29.029 11.527,27.748 10.818,26.607 "/>
+<polygon points="20.301,17.285 21.813,19.719 24.719,19.719 20.518,12.992 18.451,14.283 20.32,17.285 "/>
+<polygon points="19.459,19.719 17.947,17.285 13.86,17.287 15.374,19.719 "/>
+<polygon points="5.279,17.688 5.279,19.721 6.543,19.721 "/>
+<polygon points="13.022,19.719 11.511,17.287 7.378,17.287 8.893,19.721 "/>
+<rect fill="none" height="30" width="30"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_context.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_context.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_context.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="24.67,22.22,5.854,22.22,9.92,28.73,11.92,27.48,10.11,24.58,10.12,24.58,10.12,24.58,24.67,24.58"/>
-<polygon points="20.6,13.21,18.6,14.46,20.41,17.37,5.854,17.37,5.854,19.72,24.67,19.72"/>
-<polygon fill="none" points="11.36,4.258,14.17,6.627,14.17,3.692,11.36,3.692"/>
-<polygon fill="none" points="16.28,3.692,16.28,6.661,19.16,4.277,19.16,3.692"/>
-<path d="M9.249,1.578v3.663l4.917,4.154v5.738h2.115v-5.728l4.992-4.128v-3.696h-12.02zm7.031,5.083v-2.969h2.879v0.585l-2.88,2.384zm-2.11-0.034l-2.807-2.369v-0.566h2.804v2.935h0.006z"/>
-<rect fill="none" height="29.03" width="29.03" x="0.746" y="0.639"/>
-<rect fill="none" height="29.03" width="29.03" x="0.746" y="0.639"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<polygon points="24.721,22.301 5.279,22.303 9.48,29.029 11.545,27.74 9.673,24.736 9.685,24.736 9.682,24.736 24.721,24.736 "/>
+<polygon points="20.52,12.992 18.452,14.285 20.321,17.285 5.279,17.287 5.279,19.721 24.72,19.72 "/>
+<polygon fill="none" points="10.967,3.74 13.868,6.188 13.868,3.154 10.967,3.154 "/>
+<polygon fill="none" points="16.053,3.154 16.053,6.223 19.028,3.76 19.028,3.154 "/>
+<path d="M8.787,0.971v3.785l5.081,4.293v5.93h2.185V9.056l5.16-4.267V0.971H8.787z M16.053,6.223V3.154h2.976V3.76L16.053,6.223z   M13.868,6.188L10.967,3.74V3.154h2.898v3.033H13.868z"/>
+<rect fill="none" height="30" width="30"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_multipdp.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_multipdp.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_multipdp.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon fill="none" points="10.75,4.258,13.56,6.627,13.56,3.691,10.75,3.691"/>
-<polygon fill="none" points="15.68,3.691,15.68,6.661,18.55,4.277,18.55,3.691"/>
-<path d="M8.642,1.577v3.664l4.918,4.154v5.738h2.115v-5.728l4.993-4.129v-3.696h-12.03zm7.038,5.084v-2.97h2.88v0.586l-2.88,2.384zm-2.12-0.034l-2.808-2.369v-0.567h2.805v2.935,0.001z"/>
-<polygon points="20,13.3,18,14.55,19.8,17.46,5.247,17.46,5.247,19.81,24.06,19.81"/>
-<polygon points="9.313,28.73,11.31,27.48,9.503,24.58,12.46,24.58,15.05,28.73,17.05,27.48,15.24,24.58,24.06,24.58,24.06,22.22,5.247,22.22"/>
-<rect fill="none" height="29.03" width="29.03" x="0.14" y="0.639"/>
-<rect fill="none" height="29.03" width="29.03" x="0.14" y="0.639"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<polygon fill="none" points="10.967,3.739 13.868,6.188 13.868,3.154 10.967,3.154 "/>
+<polygon fill="none" points="16.054,3.154 16.054,6.223 19.029,3.76 19.029,3.154 "/>
+<path d="M8.786,0.969v3.786l5.082,4.294v5.93h2.186V9.055l5.16-4.266v-3.82H8.786z M16.054,6.223V3.154h2.976V3.76L16.054,6.223z   M13.868,6.188l-2.901-2.448V3.154h2.898v3.033H13.868z"/>
+<polygon points="20.52,13.085 18.452,14.375 20.322,17.379 5.278,17.379 5.278,19.813 24.721,19.811 "/>
+<polygon points="9.48,29.029 11.545,27.741 9.676,24.737 12.727,24.737 15.409,29.029 17.475,27.741 15.605,24.737 24.721,24.737   24.721,22.301 5.278,22.304 "/>
+<rect fill="none" height="30" width="30"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_suspended.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_suspended.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_suspended.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon fill="none" points="19.27,4.229,16.46,6.598,16.46,3.663,19.27,3.663"/>
-<polygon fill="none" points="14.34,3.663,14.34,6.632,11.46,4.247,11.46,3.663"/>
-<path d="M21.38,1.548v3.664l-4.918,4.154v5.74h-2.115v-5.737l-4.994-4.13v-3.695h12.03zm-7.04,5.084v-2.969h-2.881v0.585l2.88,2.384zm2.12-0.034l2.803-2.369v-0.566h-2.803v2.935z"/>
-<polygon points="24.77,22.22,24.77,24.57,20.51,24.57,20.51,24.57,14.72,24.57,16.69,22.22"/>
-<polygon points="5.954,22.22,11.08,22.22,9.095,24.57,5.954,24.57"/>
-<polygon points="24.77,17.36,24.77,19.72,18.78,19.72,20.75,17.36"/>
-<polygon points="5.954,19.72,5.954,17.36,15.17,17.36,13.19,19.72"/>
-<polygon points="21.57,14.73,21.65,14.79,21.6,14.85,10.89,27.61,9.923,28.76,8.117,27.25,9.493,25.61,19.84,13.27"/>
-<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.639"/>
-<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.639"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<polygon fill="none" points="19.034,3.709 16.132,6.157 16.132,3.124 19.034,3.124 "/>
+<polygon fill="none" points="13.947,3.124 13.947,6.192 10.971,3.729 10.971,3.124 "/>
+<path d="M21.214,0.939v3.785l-5.082,4.294v5.931h-2.185V9.025L8.786,4.758V0.939H21.214z M13.947,6.192V3.124h-2.977v0.604  L13.947,6.192z M16.132,6.157l2.897-2.448V3.124h-2.897V6.157z"/>
+<polygon points="24.721,22.299 24.721,24.732 20.316,24.732 20.318,24.732 14.341,24.732 16.373,22.299 "/>
+<polygon points="5.279,22.299 10.579,22.299 8.525,24.732 5.279,24.732 "/>
+<polygon points="24.721,17.28 24.721,19.715 18.53,19.715 20.564,17.28 "/>
+<polygon points="5.279,19.715 5.279,17.28 14.801,17.28 12.753,19.715 "/>
+<polygon points="21.421,14.559 21.497,14.619 21.448,14.68 10.378,27.869 9.38,29.059 7.514,27.494 8.936,25.801 19.631,13.056 "/>
+<rect fill="none" height="30" width="30"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_person_activitystream.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_person_activitystream.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_person_activitystream.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M8.649,14.904c0.002,0.148,0.013,0.419,0.003,0.566c-0.006,0.102-0.042,0.209-0.08,0.317h5.857  c-0.037-0.108-0.073-0.216-0.079-0.317c-0.01-0.157,0-0.437,0.002-0.596c1.086-0.732,2.028-1.654,2.6-2.776  c1.061-2.08,0.672-7.392,0.672-7.392C17.625,2.538,14.382,0,12.19,0h-1.391C8.606,0,5.375,2.538,5.375,4.707  c0,0-0.333,5.294,0.659,7.392C6.577,13.243,7.536,14.175,8.649,14.904z"/>
-<path d="M13,27.11v-6.216l-1.5,3.392l-3.401-7.694C6.402,18.725,1.294,21.482,1,21.87V28h12.09C13.036,27.711,13,27.415,13,27.11z"/>
-<path d="M25.111,17h-7.223C16.294,17,15,18.294,15,19.89v7.221c0,1.596,1.294,2.89,2.889,2.89h7.223C26.706,30,28,28.706,28,27.11  V19.89C28,18.294,26.706,17,25.111,17z M17.807,28.555c-0.752,0-1.361-0.608-1.361-1.359s0.609-1.36,1.361-1.36  s1.363,0.609,1.363,1.36S18.559,28.555,17.807,28.555z M23.102,28.555H21.17c0.002-0.08,0.012-0.159,0.012-0.241  c0-2.48-2.021-4.5-4.506-4.5c-0.078,0-0.154,0.008-0.23,0.012v-1.928c0.076-0.002,0.152-0.012,0.23-0.012  c3.549,0,6.438,2.884,6.438,6.428C23.113,28.396,23.105,28.475,23.102,28.555z M26.543,28.555H24.61  c0.003-0.082,0.013-0.164,0.013-0.245c0-4.377-3.564-7.937-7.947-7.937c-0.078,0-0.154,0.009-0.23,0.012v-1.929  c0.078-0.001,0.152-0.011,0.23-0.011c5.448,0,9.879,4.424,9.879,9.864C26.555,28.391,26.544,28.473,26.543,28.555z"/>
+<path d="M15,19c0-0.49,0.102-0.955,0.264-1.39c-0.496-0.364-0.865-0.9-0.865-1.702v-0.429c0-0.187,0.093-0.364,0.245-0.478  C16.652,13.566,18,10.619,18,7.659C18,3.434,15.309,0,12,0S6,3.434,6,7.659c0,2.96,1.348,5.907,3.352,7.343  c0.157,0.113,0.245,0.291,0.245,0.478v0.429c0,1.695-1.636,2.33-2.999,2.359C0.673,18.85,0.024,25.664,0,26h15V19z"/>
+<path d="M28,17h-9c-1.104,0-2,0.896-2,2v9c0,1.104,0.896,2,2,2h9c1.104,0,2-0.896,2-2v-9C30,17.896,29.104,17,28,17z M19.807,28.555  c-0.752,0-1.361-0.608-1.361-1.359c0-0.75,0.609-1.36,1.361-1.36s1.363,0.61,1.363,1.36C21.17,27.946,20.559,28.555,19.807,28.555z   M25.102,28.555H23.17c0.003-0.08,0.013-0.159,0.013-0.241c0-2.48-2.022-4.5-4.507-4.5c-0.078,0-0.154,0.008-0.23,0.012v-1.928  c0.076-0.002,0.152-0.011,0.23-0.011c3.549,0,6.438,2.883,6.438,6.427C25.113,28.396,25.105,28.475,25.102,28.555z M28.543,28.555  H26.61c0.003-0.082,0.013-0.164,0.013-0.245c0-4.377-3.564-7.936-7.947-7.936c-0.078,0-0.154,0.009-0.23,0.011v-1.928  c0.078-0.002,0.152-0.012,0.23-0.012c5.448,0,9.88,4.425,9.88,9.864C28.556,28.391,28.544,28.473,28.543,28.555z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photo_albums.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photo_albums.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photo_albums.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M27,4H5C3.896,4,3,4.896,3,6H2C1.447,6,1,6.447,1,7s0.447,1,1,1h1v2H2c-0.553,0-1,0.447-1,1s0.447,1,1,1h1v2H2  c-0.553,0-1,0.447-1,1s0.447,1,1,1h1v2H2c-0.553,0-1,0.447-1,1s0.447,1,1,1h1v2H2c-0.553,0-1,0.447-1,1s0.447,1,1,1h1  c0,1.104,0.896,2,2,2h22c1.104,0,2-0.896,2-2V6C29,4.896,28.104,4,27,4z M26,23H6V7h20V23z"/>
+<path d="M25,8H7v14h18V8z M8,13.135L10.467,11l3.467,3l1.732-2l2.376,2.192c0.079,1.077,0.339,2.032,0.738,2.808H8V13.135z M24,20.5  c0,0.199-0.82,0.37-2,0.45V21h-1v-0.007C20.836,20.996,20.672,21,20.5,21c-1.934,0-3.5-0.224-3.5-0.5s1.566-0.5,3.5-0.5  c0.172,0,0.336,0.004,0.5,0.007v-2.098c-1.141-0.417-2-2.232-2-4.409c0-2.485,1.119-4.5,2.5-4.5s2.5,2.015,2.5,4.5  c0,2.177-0.859,3.992-2,4.409v2.141C23.18,20.13,24,20.301,24,20.5z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M3,5v3H1v2h2v2H1v2h2v2H1v2h2v2H1v2h2v3h26V5H3z M26,22H6V8h20V22z"/>
-<path d="M9.243,13.314c0.405-0.221,0.651-0.603,0.789-0.881c0.477,0.275,1.009,0.524,1.556,0.742  c0.449,0.179,1.003,0.36,1.614,0.547c-0.47,0.105-0.979,0.303-1.479,0.687c-1.603,1.229-1.786,2.46-1.328,2.87  s2.097,0.743,3.708-0.974c0.615-0.657,0.835-1.519,0.915-2.057c2.166,0.609,4.643,1.29,6.448,2.117  c-0.907-0.107-2.054-0.052-3.058,0.594c-2.037,1.308-1.852,3.128-1.268,3.564c0.581,0.436,3.111,1.079,5.158-0.747  c0.801-0.713,0.885-1.773,0.85-2.429c0.75,0.569,1.361,1.122,1.852,1.634v-1.914v-0.006v-4.936  c-0.469,0.524-0.889,1.192-1.162,2.033c-0.306,0.938-0.02,1.781,0.281,2.341c-0.028-0.015-0.052-0.031-0.08-0.046  c-1.096-0.558-3.502-1.213-6.131-1.951c0.393-0.042,0.869-0.146,1.301-0.405c1.086-0.652,1.352-1.691,0.963-2.256  c-0.278-0.399-1.191-0.742-2.199,0.359c-0.504,0.552-0.749,1.623-0.834,2.084c-1.775-0.503-3.599-1.042-5.155-1.613  c0.403-0.036,0.907-0.14,1.36-0.411c1.086-0.654,1.27-1.371,0.985-1.691c-0.321-0.358-1.2-0.783-2.381,0.307  c-0.487,0.449-0.639,1.129-0.688,1.51c-3.417-1.469-2.146-2.951-2.146-2.951c-0.092-0.359-0.32-0.717-0.687-0.102  C7.902,10.217,8.24,11.016,9.002,11.7c-0.236-0.012-0.497,0.014-0.771,0.106c-1.072,0.363-1.365,1.003-1.178,1.317  C7.24,13.439,8.09,13.943,9.243,13.314z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photos.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photos.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photos.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M27,4H3C1.896,4,1,4.896,1,6v18c0,1.104,0.896,2,2,2h24c1.104,0,2-0.896,2-2V6C29,4.896,28.104,4,27,4z M27,24H3V6h24V24z"/>
+<path d="M4,7v16h22V7H4z M5,16v-2l4-3l4,3l2-2l3.057,2.445c0.1,0.977,0.355,1.84,0.724,2.555H5V16z M24,20.5  c0,0.199-0.82,0.37-2,0.45V21h-1v-0.007C20.836,20.996,20.672,21,20.5,21c-1.934,0-3.5-0.224-3.5-0.5s1.566-0.5,3.5-0.5  c0.172,0,0.336,0.004,0.5,0.007v-2.098c-1.141-0.417-2-2.232-2-4.409c0-2.485,1.119-4.5,2.5-4.5s2.5,2.015,2.5,4.5  c0,2.177-0.859,3.992-2,4.409v2.141C23.18,20.13,24,20.301,24,20.5z M25,17h-0.78c0.158-0.307,0.294-0.639,0.407-1H25V17z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M2,5v20h26V5H2z M26,23H4V7h22V23z"/>
-<path d="M25,8H5v14h20V8z M24,21h-2.9c0.117-0.1,0.234-0.206,0.35-0.324c0.756-0.773,0.836-1.923,0.802-2.632  c0.708,0.617,1.286,1.216,1.749,1.771V21z M24,12.388c-0.443,0.568-0.839,1.292-1.098,2.202c-0.288,1.017-0.02,1.929,0.266,2.535  c-0.026-0.016-0.049-0.033-0.075-0.049c-1.035-0.604-3.308-1.314-5.79-2.114c0.371-0.045,0.82-0.158,1.229-0.438  c1.024-0.707,1.275-1.832,0.908-2.443c-0.262-0.434-1.124-0.805-2.076,0.389c-0.477,0.598-0.707,1.759-0.788,2.258  c-1.677-0.545-3.397-1.129-4.868-1.747c0.381-0.04,0.857-0.152,1.284-0.446c1.026-0.708,1.2-1.485,0.931-1.832  c-0.303-0.389-1.133-0.849-2.248,0.332c-0.461,0.487-0.604,1.223-0.65,1.636c-3.228-1.591-2.025-3.197-2.025-3.197  c-0.087-0.39-0.303-0.776-0.648-0.11c-0.498,0.957-0.178,1.822,0.541,2.564c-0.224-0.013-0.469,0.015-0.729,0.115  c-1.014,0.393-1.289,1.086-1.111,1.427c0.176,0.342,0.979,0.888,2.068,0.206c0.382-0.239,0.615-0.652,0.744-0.954  c0.45,0.299,0.953,0.568,1.47,0.804c0.425,0.194,0.947,0.391,1.525,0.593c-0.444,0.114-0.925,0.327-1.397,0.744  c-1.514,1.332-1.688,2.664-1.255,3.108s1.979,0.806,3.502-1.055c0.581-0.711,0.789-1.645,0.864-2.228  c2.046,0.66,4.385,1.397,6.091,2.295c-0.856-0.118-1.94-0.058-2.889,0.642c-1.522,1.121-1.723,2.579-1.47,3.377H6V9h18V12.388z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<path d="M7,27c-0.334,0-0.668-0.084-0.97-0.25C5.395,26.396,5,25.727,5,25V5c0-0.727,0.395-1.396,1.03-1.75C6.332,3.084,6.666,3,7,3  c0.369,0,0.736,0.102,1.061,0.305l16,9.999C24.645,13.67,25,14.311,25,15s-0.355,1.33-0.939,1.696l-16,9.999  C7.736,26.898,7.369,27,7,27L7,27z"/>
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="5,15,5,3,15.39,9,25.78,15,15.39,21,5,27"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play_history.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play_history.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play_history.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M22.5,13c0.232,0,0.461,0.019,0.688,0.035l1.81-1.04-21-12v24l9.998-5.713c1.56-3.13,4.78-5.29,8.5-5.29z"/>
-<path d="M22.5,15c-4.136,0-7.5,3.364-7.5,7.5s3.364,7.5,7.5,7.5,7.5-3.364,7.5-7.5-3.36-7.5-7.5-7.5zm0,13c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5,5.5,2.468,5.5,5.5-2.47,5.5-5.5,5.5z"/>
-<polygon points="23,22,23,18,21,18,21,22,21,24,23,24,27,24,27,22"/>
+<path d="M23,14c0.552,0,1.09,0.058,1.615,0.153C24.854,13.818,25,13.423,25,13c0-0.689-0.355-1.33-0.939-1.696l-16-9.999  C7.736,1.102,7.369,1,7,1C6.666,1,6.332,1.084,6.03,1.25C5.395,1.604,5,2.273,5,3v20c0,0.727,0.395,1.396,1.03,1.75  C6.332,24.916,6.666,25,7,25c0.369,0,0.736-0.102,1.061-0.305l6.221-3.888C15.264,16.903,18.795,14,23,14z"/>
+<path d="M23,16c-3.865,0-7,3.135-7,7c0,3.867,3.135,7,7,7s7-3.133,7-7C30,19.135,26.865,16,23,16z M22,23.992v-0.016v-1.98v-4.004h2  v4.004h4v1.996H22z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_playlist.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_playlist.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_playlist.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,14 +4,9 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="2" width="2" x="7" y="6"/>
-<rect height="2" width="9.941" x="10.059" y="6"/>
-<rect height="2" width="2" x="7" y="11"/>
-<rect height="2" width="9.941" x="10.059" y="11"/>
-<rect height="2" width="2" x="7" y="16"/>
-<rect height="2" width="9.941" x="10.059" y="16"/>
-<rect height="2" width="2" x="7" y="21"/>
-<rect height="2" width="9.941" x="10.059" y="21"/>
-<path d="M16.115,26H5V3h18v10c0.213,0,0.426,0.034,0.633,0.103L26,13.892V0H2v29h14.463C16.167,28.387,16,27.711,16,27  C16,26.657,16.043,26.324,16.115,26z"/>
-<path d="M23,15v9.3c-0.456-0.187-0.961-0.3-1.5-0.3c-1.934,0-3.5,1.343-3.5,3c0,1.656,1.566,3,3.5,3s3.5-1.344,3.5-3v-7.333L29,21  v-4L23,15z"/>
+<path d="M17,27.403c0-2.089,1.629-3.847,3.847-4.403H11v-2h10.632v-3H11v-2h10.632v-0.423c0-0.783,0.35-1.516,0.96-2.008  C23.066,13.196,23.635,13,24.211,13c0.182,0,0.364,0.02,0.544,0.058L26,13.333V3c0-1.104-0.896-2-2-2H6C4.896,1,4,1.896,4,3v24  c0,1.104,0.896,2,2,2h11.351C17.135,28.501,17,27.967,17,27.403z M11,6h11v2H11V6z M11,11h11v2H11V11z M10,23H8v-2h2V23z M10,18H8  v-2h2V18z M10,13H8v-2h2V13z M10,8H8V6h2V8z"/>
+<path d="M29.547,16.167l-5.211-1.153C24.295,15.005,24.252,15,24.211,15c-0.131,0-0.259,0.044-0.363,0.126  c-0.137,0.11-0.216,0.276-0.216,0.451v0.576v2.309v6.552c-0.399-0.132-0.841-0.206-1.303-0.206c-1.839,0-3.329,1.163-3.329,2.596  C19,28.837,20.49,30,22.329,30s3.618-1.163,3.618-2.597c0-0.077,0-5.665,0-7.966l3.348,0.741c0.043,0.009,0.084,0.014,0.126,0.014  c0,0,0.259-0.044,0.362-0.127C29.92,19.956,30,19.791,30,19.615V16.73C30,16.46,29.812,16.227,29.547,16.167z"/>
+<g>
+<rect fill="none" height="30" width="30"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_plus.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_plus.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_plus.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M24,13h-7V6c0-1.104-0.896-2-2-2s-2,0.896-2,2v7H6c-1.104,0-2,0.896-2,2s0.896,2,2,2h7v7c0,1.104,0.896,2,2,2s2-0.896,2-2  v-7h7c1.104,0,2-0.896,2-2S25.104,13,24,13z"/>
+<g>
 <rect fill="none" height="30" width="30"/>
-<rect height="4" width="22" x="4" y="13"/>
-<rect height="22" width="4" x="13" y="4"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_podcast.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_podcast.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_podcast.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M18.8,8.537l-1.735-1.735c-1.598-1.598-4.188-1.598-5.784,0l-4.05,4.05-1.155-1.157-1.735,1.737,1.157,1.157-2.313,2.31c-0.646,0.647-1.019,1.458-1.142,2.299l-0.015,0.015,0.013,0.014c-0.171,1.226,0.2,2.515,1.144,3.457l1.735,1.735c0.943,0.944,2.231,1.315,3.457,1.145l0.014,0.013,0.015-0.016c0.048-0.007,0.096-0.005,0.144-0.013v2.506h-4.092c-0.451,0-0.818,0.366-0.818,0.818v1.636h12.27v-1.636c0-0.452-0.366-0.818-0.818-0.818h-4.09v-3.933l2.016-2.016,1.156,1.156,1.735-1.734-1.157-1.157,4.05-4.049c1.59-1.6,1.59-4.18-0.01-5.783zm-9.026,8.113c-0.903,0-1.636-0.732-1.636-1.636s0.732-1.636,1.636-1.636,1.636,0.731,1.636,1.636c0,0.91-0.73,1.64-1.636,1.64zm7.866-3.48l-4.049,4.049-1.161-1.162c0.127-0.323,0.203-0.673,0.203-1.041,0-1.579-1.284-2.863-2.863-2.863-0.368,0-0.718,0.076-1.042,0.203l-0.335-0.35,4.049-4.05c0.957-0.957,2.514-0.957,3.471,0l1.735,1.734c0.96,0.956,0.96,2.516,0,3.476z"/>
-<path d="M22.21,1.066l-1.09,1.739c4.889,3.068,6.369,9.545,3.302,14.44l1.738,1.09c3.67-5.85,1.9-13.59-3.95-17.26z"/>
-<path d="M20.03,4.544l-1.091,1.738c2.972,1.867,3.874,5.803,2.007,8.773l1.739,1.094c2.46-3.93,1.27-9.138-2.66-11.61z"/>
+<path d="M21.184,8.305l-4.6-4.598c-1.088-1.09-2.853-1.09-3.941,0L7.674,8.676l3.293,3.293c0.478,0.07,0.938,0.279,1.305,0.648  c0.367,0.367,0.579,0.828,0.648,1.305l3.294,3.294l4.969-4.968C22.271,11.159,22.271,9.395,21.184,8.305z"/>
+<path d="M12.791,15.106c-0.113,0.291-0.284,0.563-0.518,0.795c-0.907,0.908-2.378,0.908-3.285,0c-0.907-0.906-0.907-2.377,0-3.283  c0.234-0.234,0.506-0.406,0.796-0.52l-4.081-4.08L3.732,9.989l1.314,1.313l-4.23,4.23c-1.088,1.089-1.088,2.855,0,3.943l4.599,4.598  c1.088,1.09,2.854,1.09,3.942,0l4.229-4.229l1.314,1.314l1.971-1.971L12.791,15.106z"/>
+<path d="M14.863,27.213H11.15v-3.518l-1.085,1.084c-0.478,0.479-1.066,0.799-1.702,0.967v1.467H4.628  c-0.96,0-1.741,0.729-1.841,1.66V30h13.937v-0.93C16.725,28.045,15.892,27.213,14.863,27.213z"/>
+<path d="M23.396,16c-0.177,0-0.356-0.046-0.519-0.144c-0.472-0.287-0.622-0.902-0.335-1.375C23.455,12.979,24,10.93,24,9  s-0.545-3.979-1.458-5.48c-0.287-0.473-0.137-1.086,0.335-1.373c0.473-0.287,1.088-0.137,1.374,0.334C25.346,4.284,26,6.719,26,9  s-0.654,4.719-1.749,6.52C24.063,15.831,23.733,16,23.396,16L23.396,16z"/>
+<path d="M26.585,18c-0.187,0-0.375-0.051-0.543-0.16c-0.464-0.301-0.596-0.92-0.295-1.383C27.242,14.151,28,11.643,28,9  s-0.758-5.15-2.253-7.455c-0.301-0.465-0.169-1.084,0.295-1.383c0.462-0.303,1.082-0.17,1.383,0.295C29.134,3.092,30,5.965,30,9  s-0.866,5.91-2.575,8.544C27.233,17.84,26.912,18,26.585,18L26.585,18z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
+<rect fill="none" height="30" width="30" y="0"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_portrait.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_portrait.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_portrait.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M3,28c0.024-0.336,0.673-7.15,6.598-7.732c1.363-0.029,2.999-0.664,2.999-2.359v-0.429c0-0.187-0.088-0.364-0.245-0.478  C10.348,15.566,9,12.619,9,9.659C9,5.434,11.691,2,15,2s6,3.434,6,7.659c0,2.96-1.348,5.907-3.356,7.343  c-0.152,0.113-0.246,0.291-0.246,0.478v0.429c0,1.867,1.966,2.359,3.001,2.359C26.327,20.85,26.973,27.664,27,28H3z"/>
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M17.852,16.471c-0.013-0.158,0-0.438,0.002-0.596c1.086-0.732,2.026-1.654,2.6-2.777c1.061-2.08,0.672-7.391,0.672-7.391  c0-2.17-3.242-4.707-5.436-4.707h-1.392c-2.193,0-5.424,2.537-5.424,4.707c0,0-0.331,5.293,0.658,7.391  c0.545,1.145,1.504,2.076,2.615,2.807c0.002,0.147,0.014,0.418,0.004,0.565c-0.137,2.127-7.302,5.938-7.651,6.398V29h3v-2h1.999v2  h11v-2h2v2h3v-6.125C25.148,22.412,17.984,18.598,17.852,16.471z"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_power.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_power.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_power.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M12.871,3.721c0.038,12.177,0.038,12.177,0.038,12.177s0.008,2.131,2.138,2.137c2.13,0.008,2.124-2.124,2.124-2.124  C17.131,3.735,17.131,3.735,17.131,3.735s-0.158-2.284-2.138-2.138C12.863,1.59,12.871,3.721,12.871,3.721L12.871,3.721z"/>
-<path d="M18.112,5.663v3.796c2.921,1.176,4.832,4.033,4.832,7.37c0,4.382-3.563,7.945-7.945,7.945c-4.379,0-7.943-3.563-7.943-7.945  c0-3.279,1.831-6.101,4.674-7.313V5.704C6.927,7.12,3.408,11.563,3.408,16.818c0,6.392,5.201,11.591,11.591,11.591  c6.393,0,11.593-5.199,11.593-11.591C26.592,11.505,22.995,7.027,18.112,5.663z"/>
+<path d="M28.005,14.99C28.004,9.31,24.355,4.493,19.277,2.723c0.135,0.399,0.224,0.82,0.224,1.266L19.5,6.066  c3.262,1.648,5.504,5.021,5.503,8.924c0,5.523-4.479,10.001-10.003,10.001c-5.526,0-10.004-4.478-10.004-10.002  c0-3.902,2.24-7.275,5.502-8.923V3.988c0-0.445,0.09-0.866,0.225-1.267C5.645,4.492,1.995,9.309,1.995,14.989  c0,7.181,5.821,13.002,13.005,13.003C22.182,27.992,28.004,22.171,28.005,14.99z"/>
+<path d="M17.5,12.989c0,1.105-0.895,2.001-2,2h-1c-1.105,0-2.001-0.896-2-2l0-9.002c0-1.104,0.896-2,2-2H15.5  c1.104,0.001,2,0.896,2,2V12.989z"/>
+<g>
 <rect fill="none" height="30" width="30"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<path d="M28.85,8.575l-7.072-7.071c-0.78-0.78-2.047-0.78-2.828,0L6.222,14.232l9.899,9.899L28.85,11.403  C29.631,10.623,29.631,9.356,28.85,8.575z"/>
+<path d="M4.986,15.825c-0.013,0.043-0.04,0.079-0.05,0.123l-1.824,7.902l3.392,3.391l7.902-1.823  c0.044-0.011,0.081-0.037,0.124-0.05L4.986,15.825z"/>
+<polygon points="2.686,24.839 0.565,26.96 4.101,29.082 5.515,27.667 "/>
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M25.502,4.497c-3.124-3.124-6.923-4.391-8.485-2.828c-0.001,0.001-0.002,0.002-0.003,0.003L2.871,15.814l-0.008,0.07l0,0  l-0.019,0.173L1.489,28.445l-0.032,0.097l0.098-0.032l12.595-1.415l0.542-0.539c0,0,0,0,0-0.001l13.635-13.569  c0.001-0.001,0.002-0.002,0.004-0.003C29.893,11.42,28.626,7.621,25.502,4.497z M7.257,25.857l-3.13-3.131l0.656-5.995l0.082-0.082  c1.639,0.432,3.549,1.566,5.266,3.282c1.665,1.665,2.781,3.512,3.24,5.117l-0.137,0.137L7.257,25.857z M26.916,11.568l-12.15,12.093  c-0.459-1.606-1.574-3.456-3.241-5.123c-1.708-1.709-3.617-2.856-5.253-3.295L18.428,3.086c0.355-0.355,2.922,0.087,5.66,2.825  S27.269,11.216,26.916,11.568z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_on.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_on.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_on.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<path d="M28.85,8.575l-7.072-7.071c-0.78-0.78-2.047-0.78-2.828,0L6.222,14.232l9.899,9.899L28.85,11.403  C29.631,10.623,29.631,9.356,28.85,8.575z"/>
+<path d="M4.986,15.825c-0.014,0.043-0.04,0.079-0.051,0.123l-1.824,7.902l3.393,3.391l7.902-1.823  c0.044-0.011,0.08-0.037,0.123-0.05L4.986,15.825z"/>
+<polygon points="2.686,24.839 0.564,26.96 4.101,29.082 5.516,27.667 "/>
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M25.502,4.497c-3.124-3.124-6.923-4.391-8.485-2.828c-0.001,0.001-0.002,0.002-0.003,0.003L2.871,15.814l-0.008,0.07l0,0  l-0.019,0.173L1.489,28.445l-0.032,0.097l0.098-0.032l12.595-1.415l0.542-0.539c0,0,0,0,0-0.001l13.635-13.569  c0.001-0.001,0.002-0.002,0.004-0.003C29.893,11.42,28.626,7.621,25.502,4.497z M7.257,25.857l-3.13-3.131l0.656-5.995l0.082-0.082  c1.639,0.432,3.549,1.566,5.266,3.282c1.665,1.665,2.781,3.512,3.24,5.117l-0.137,0.137L7.257,25.857z M26.916,11.568l-12.15,12.093  c-0.459-1.606-1.574-3.456-3.241-5.123c-1.708-1.709-3.617-2.856-5.253-3.295L18.428,3.086c0.355-0.355,2.922,0.087,5.66,2.825  S27.269,11.216,26.916,11.568z"/>
-<rect height="1.995" width="11.986" x="16.014" y="28.005"/>
-<rect height="1.995" width="8" x="20" y="24.005"/>
+<rect height="2" width="9" x="20" y="24"/>
+<rect height="2" width="13" x="16" y="28"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_presentation.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_presentation.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_presentation.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M3,7v16h24V7H3z M24,10.5V18v2v1h-5h-3H6v-1v-6h3v6h2v-4h3v4h2v-8h3v8h2v-2v-7.5V9h3V10.5z"/>
+<path d="M29,6V5c0-1.104-0.896-2-2-2H3C1.896,3,1,3.896,1,5v1H29z"/>
+<path d="M1,24v1c0,1.104,0.896,2,2,2h24c1.104,0,2-0.896,2-2v-1H1z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M29,7v-4h-28v4h1v16h-1v4h28v-4h-1v-16h1zm-3,16h-22v-16h22v16z"/>
-<polygon points="5,22,25,22,25,21,24,21,24,10,21,10,21,21,19,21,19,13,16,13,16,21,14,21,14,17,11,17,11,21,9,21,9,15,6,15,6,21,5,21"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_previous.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_previous.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_previous.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<path d="M10,24c0,1.104-0.896,2-2,2l0,0c-1.104,0-2-0.896-2-2V6c0-1.104,0.896-2,2-2l0,0c1.104,0,2,0.896,2,2V24z"/>
+<path d="M22,26c-0.484,0-0.963-0.176-1.338-0.514l-10-9C10.24,16.107,10,15.566,10,15s0.24-1.107,0.662-1.486l10-9  C21.037,4.176,21.516,4,22,4c0.275,0,0.553,0.057,0.813,0.173C23.535,4.494,24,5.21,24,6v18c0,0.79-0.465,1.506-1.187,1.827  C22.553,25.943,22.275,26,22,26L22,26z"/>
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="6,4 6,26 10,26 10,15 10,4 "/>
-<polygon points="10,15 24,26 24,4 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_private_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_private_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_private_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M7.129,15.84c-0.006-0.09,0-0.523,0-0.614,0.621-0.419,1.057-0.91,1.383-1.552,0.605-1.188,0.281-3.985,0.281-3.985,0-1.245-1.647-2.695-2.898-2.695h-0.795c-1.254,0-2.903,1.45-2.903,2.689,0,0-0.287,2.783,0.279,3.981,0.311,0.654,0.76,1.139,1.395,1.556,0.002,0.085,0.007,0.529,0.002,0.614-0.078,1.22-3.673,3.39-3.873,3.66v3.5h11.5v-3.5c-0.2-0.26-4.295-2.44-4.371-3.66z"/>
-<path d="M16.35,16.61c-0.603-1.273-0.687-3.219-0.65-4.633-1.034-0.719-2.033-1.543-2.07-2.138-0.006-0.09,0-0.523,0-0.614,0.621-0.419,1.057-0.91,1.383-1.552,0.605-1.188,0.281-3.985,0.281-3.985,0-1.241-1.64-2.691-2.89-2.691h-0.8c-1.254,0-2.902,1.45-2.902,2.689,0,0-0.118,1.153-0.052,2.294,1.202,0.875,2.088,2.216,2.145,3.568,0.098,0.898,0.291,3.486-0.496,5.031-0.215,0.422-0.468,0.806-0.762,1.156,0.403,0.321,1.018,0.747,1.815,1.261h5.229c-0.07-0.13-0.15-0.25-0.22-0.39z"/>
-<path d="M26.45,10.53c0-0.746-0.465-1.543-1.115-2.195l-7.244,7.245c0.022,0.059,0.044,0.121,0.069,0.175,0.361,0.764,0.877,1.345,1.569,1.85l6.752-6.752c-0.03-0.21-0.04-0.33-0.04-0.33z"/>
-<path d="M24.26,18.6c-0.007-0.118-0.001-0.687,0.001-0.807,0.814-0.549,1.385-1.194,1.814-2.037,0.297-0.583,0.424-1.461,0.466-2.332l-12.29,12.3v2.28h1.386l8.84-8.84c-0.12-0.2-0.21-0.38-0.22-0.56z"/>
-<path d="M23.76,7.263c-0.38-0.159-0.76-0.263-1.12-0.263h-1.04c-1.645,0-3.81,1.904-3.81,3.53,0,0-0.14,1.365-0.079,2.785l6.05-6.057z"/>
-<path d="M25.77,20.5l-7.49,7.5h3.665l5.967-5.968c-0.71-0.46-1.48-0.99-2.14-1.53z"/>
-<path d="M30,23.41c-0.042-0.055-0.223-0.179-0.479-0.346l-4.94,4.94h3.665l1.76-1.75v-2.844z"/>
+<path d="M13.137,8.828c-0.463-0.144-0.938-0.479-0.938-1.178V7.42c0-0.101,0.047-0.196,0.123-0.258C13.326,6.39,14,5.094,14,3.501  c0-2.276-1.346-3.417-3-3.417S8.001,1.225,8.001,3.501c0,1.593,0.673,2.889,1.675,3.661C9.754,7.224,9.799,7.319,9.799,7.42v0.23  c0,0.092-0.014,0.175-0.029,0.256C9.909,8.379,10,8.9,10,9.501c0,1.364-0.43,2.614-1.197,3.583h4.527  C13.121,12.242,13,11.367,13,10.482C13,9.916,13.049,9.363,13.137,8.828z"/>
+<path d="M0,19.084c0.012-0.181,0.336-3.851,3.3-4.164c0.681-0.016,1.499-0.357,1.499-1.27v-0.23c0-0.101-0.045-0.196-0.123-0.258  c-1.002-0.772-1.675-2.068-1.675-3.661c0-2.276,1.345-3.417,2.999-3.417s3,1.141,3,3.417c0,1.593-0.674,2.889-1.678,3.661  c-0.076,0.062-0.123,0.157-0.123,0.258v0.23c0,1.005,0.982,1.27,1.5,1.27c2.965,0.313,3.287,3.983,3.301,4.164H0z"/>
+<path d="M23.892,6.42c-0.572-0.92-1.335-1.627-2.208-2.034l-6.652,6.651c0.078,1.186,0.396,2.342,0.899,3.344L23.892,6.42z"/>
+<path d="M25,10.482c0-0.727-0.096-1.424-0.267-2.076l-7.649,7.649c0.225,0.237,0.458,0.456,0.709,0.64  c0.131,0.096,0.205,0.246,0.205,0.404v0.361c0,1.436-1.363,1.973-2.5,1.996C10.561,19.95,10.021,25.717,10,26h1.382l13.325-13.324  C24.891,11.966,25,11.227,25,10.482z"/>
+<path d="M15.462,7.779l3.675-3.676C17.5,4.476,16.138,5.879,15.462,7.779z"/>
+<path d="M28.353,26H30c-0.006-0.082-0.061-0.641-0.254-1.394L28.353,26z"/>
+<path d="M24.923,19.531c-0.142-0.025-0.274-0.059-0.423-0.074c-0.732,0-2.01-0.307-2.386-1.359L14.211,26h4.242L24.923,19.531z"/>
+<path d="M28.961,22.563c-0.447-0.838-1.085-1.656-1.991-2.25L21.281,26h4.242L28.961,22.563z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_qcif.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_qcif.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_qcif.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M7.744,11.378c-0.412,0-0.72,0.2-0.939,0.612c-0.239,0.446-0.36,1.295-0.36,2.521c0,1.159,0.121,2.035,0.359,2.604  c0.218,0.519,0.525,0.771,0.94,0.771c0.41,0,0.717-0.214,0.938-0.654c0.24-0.479,0.362-1.394,0.362-2.72  c0-1.196-0.12-2.038-0.358-2.502C8.467,11.584,8.159,11.378,7.744,11.378z"/>
+<path d="M27,4H3C1.896,4,1,4.896,1,6v18c0,1.104,0.896,2,2,2h24c1.104,0,2-0.896,2-2V6C29,4.896,28.104,4,27,4z M10.495,17.789  C10.09,18.53,9.49,19,8.711,19.188c0.06,0.196,0.139,0.349,0.236,0.456c0.063,0.07,0.251,0.187,0.801,0.187h0.2v1.326H9.361  c-0.765,0-1.36-0.161-1.77-0.479c-0.389-0.302-0.683-0.812-0.873-1.517c-0.763-0.225-1.35-0.707-1.746-1.435  c-0.405-0.743-0.61-1.825-0.61-3.216c0-1.521,0.283-2.668,0.841-3.404c0.57-0.755,1.425-1.138,2.541-1.138  c1.12,0,1.978,0.384,2.55,1.14c0.56,0.74,0.844,1.885,0.844,3.402C11.138,15.906,10.921,17.01,10.495,17.789z M17.026,11.65  l-0.257-0.076c-0.44-0.131-0.837-0.196-1.18-0.196c-0.548,0-0.947,0.237-1.22,0.727c-0.29,0.521-0.438,1.321-0.438,2.384  c0,1.24,0.151,2.135,0.451,2.66c0.282,0.496,0.694,0.737,1.259,0.737c0.352,0,0.731-0.057,1.13-0.168l0.254-0.071v1.413l-0.148,0.04  c-0.479,0.129-0.976,0.194-1.476,0.194c-1.172,0-2.07-0.384-2.668-1.14c-0.586-0.742-0.884-1.959-0.884-3.619  c0-1.492,0.299-2.634,0.889-3.395c0.602-0.777,1.51-1.171,2.698-1.171c0.477,0,0.961,0.065,1.44,0.194l0.148,0.04V11.65z   M20.788,11.472h-0.721v6.32h0.721V19.2h-3.459v-1.408h0.721v-6.32h-0.721v-1.408h3.459V11.472z M26.56,11.472h-2.877v2.359h2.244  v1.42h-2.244V19.2h-2.012v-9.137h4.889V11.472z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M1,3v24h28V3H1z M26,24H4V6h22V24z"/>
-<path d="M7.854,18.328c-0.639-0.164-1.121-0.543-1.445-1.141c-0.326-0.599-0.488-1.465-0.488-2.601c0-1.238,0.223-2.15,0.666-2.736  c0.444-0.587,1.104-0.882,1.983-0.882c0.883,0,1.547,0.295,1.992,0.885c0.447,0.588,0.67,1.5,0.67,2.734  c0,1.139-0.172,2.023-0.516,2.65c-0.344,0.629-0.859,1.002-1.545,1.119c0.059,0.272,0.15,0.479,0.277,0.619  c0.127,0.141,0.391,0.211,0.791,0.211v0.771H9.918c-0.602,0-1.059-0.121-1.371-0.362C8.234,19.352,8.002,18.93,7.854,18.328z   M8.57,17.566c0.408,0,0.717-0.213,0.932-0.637c0.213-0.427,0.318-1.207,0.318-2.343c0-1.029-0.105-1.75-0.316-2.16  c-0.213-0.411-0.524-0.618-0.934-0.618c-0.406,0-0.717,0.199-0.93,0.6c-0.213,0.398-0.32,1.125-0.32,2.18  c0,0.992,0.105,1.736,0.313,2.234C7.842,17.318,8.154,17.566,8.57,17.566z"/>
-<path d="M14.953,18.406c-0.928,0-1.625-0.295-2.092-0.887c-0.469-0.59-0.701-1.563-0.701-2.912c0-1.211,0.234-2.122,0.705-2.728  c0.471-0.607,1.176-0.912,2.117-0.912c0.383,0,0.77,0.053,1.156,0.156v0.856c-0.384-0.115-0.728-0.172-1.029-0.172  c-0.519,0-0.906,0.23-1.162,0.691c-0.258,0.461-0.387,1.15-0.387,2.067c0,1.066,0.133,1.834,0.397,2.3  c0.267,0.467,0.664,0.698,1.192,0.698c0.312,0,0.64-0.049,0.986-0.146v0.83C15.752,18.354,15.355,18.406,14.953,18.406z"/>
-<path d="M16.725,18.328v-0.84h0.603v-5.601h-0.603v-0.84h2.549v0.84h-0.6v5.602h0.6v0.84L16.725,18.328L16.725,18.328z"/>
-<path d="M20.344,18.328v-7.281h3.74v0.84h-2.398v2.301h1.871v0.85h-1.871v3.291L20.344,18.328L20.344,18.328z"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_collections.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_collections.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_collections.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="30" width="30"/>
-<path d="M15.46,20.81l-1.366-1.366c0.058-0.056,0.121-0.104,0.179-0.162,1.753-1.754,1.753-4.611-0.004-6.368-0.056-0.056-0.114-0.104-0.171-0.155l1.362-1.362c0.056,0.052,0.116,0.099,0.172,0.154,2.509,2.51,2.513,6.591,0.007,9.097-0.06,0.05-0.12,0.1-0.18,0.16zm2.44,2.43l-1.367-1.366c0.061-0.056,0.125-0.106,0.184-0.164,3.094-3.095,3.092-8.133-0.008-11.23-0.057-0.056-0.115-0.104-0.172-0.155l1.363-1.363c0.057,0.055,0.115,0.1,0.172,0.155,3.852,3.853,3.857,10.11,0.01,13.96-0.05,0.06-0.11,0.11-0.17,0.17z"/>
-<polygon points="5,0,5,3,27,3,27,25,30,25,30,0"/>
-<path d="M0,30h25v-25h-25v25zm3-22h19v19h-19v-19z"/>
-<path d="M8.082,16.93v4.336c-0.374-0.152-0.787-0.244-1.228-0.244-1.582,0-2.864,1.098-2.864,2.454,0,1.355,1.282,2.454,2.864,2.454,1.581,0,2.863-1.099,2.863-2.454v-6.001l3.272,1.092v-3.272l-4.908-1.636v3.267z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-1 -1 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M21,5H2C0.895,5,0,5.895,0,7v19c0,1.104,0.895,2,2,2h19c1.104,0,2-0.896,2-2V7C23,5.895,22.104,5,21,5z M12.75,16.256  l-3-0.554c0,2.007,0,6.882,0,6.949c0,1.25-1.537,2.265-3.125,2.265S3.75,23.901,3.75,22.651s1.287-2.265,2.875-2.265  c0.399,0,0.779,0.064,1.125,0.18v-8.65l0,0l5,0.923V16.256z M13.944,16.959c1.515-1.627,1.454-4.08-0.22-5.623  c-0.027-0.023-0.055-0.045-0.083-0.068l1.505-1.127c2.319,2.195,2.424,5.646,0.309,7.949L13.944,16.959z M17.806,19.854  l-1.499-1.123c2.397-2.723,2.344-6.672-0.146-9.352l1.494-1.121C20.724,11.59,20.777,16.48,17.806,19.854z"/>
+<path d="M26,0H7C5.895,0,5,0.895,5,2v1h20v17v3h1c1.104,0,2-0.896,2-2V2C28,0.895,27.104,0,26,0z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_stations.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_stations.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_stations.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,16 +4,7 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="2" width="2" x="7" y="6"/>
-<rect height="2" width="2" x="7" y="11"/>
-<rect height="2" width="2" x="7" y="16"/>
-<rect height="2" width="2" x="7" y="21"/>
-<rect height="2" width="9.942" x="10.06" y="6"/>
-<rect height="2" width="9.942" x="10.06" y="11"/>
-<rect height="2" width="4.941" x="10.06" y="21"/>
-<path d="M15,17c0-0.357,0.103-0.699,0.277-1h-5.219v2h4.94v-1z"/>
-<path d="M11.32,26h-6.32v-23h18v10.84c0.23-0.124,0.473-0.216,0.727-0.243,0.101-0.24,0.246-0.461,0.435-0.648l1.362-1.363c0.145-0.144,0.308-0.252,0.478-0.342v-11.25h-24v29h9.325c-0.18-0.469-0.296-0.963-0.296-1.486,0.01-0.53,0.12-1.04,0.3-1.51z"/>
-<path d="M22.58,23.63l1.36,1.37c0.06-0.055,0.119-0.104,0.179-0.163,2.506-2.506,2.502-6.587-0.006-9.097-0.058-0.057-0.117-0.104-0.173-0.154l-1.362,1.361c0.058,0.053,0.114,0.101,0.172,0.156,1.757,1.756,1.759,4.613,0.004,6.367-0.05,0.05-0.11,0.1-0.17,0.15z"/>
-<path d="M27.11,13.16c-0.055-0.056-0.112-0.101-0.17-0.155l-1.362,1.363c0.055,0.052,0.114,0.1,0.17,0.155,3.101,3.099,3.104,8.136,0.008,11.23-0.058,0.058-0.121,0.108-0.183,0.164l1.367,1.366c0.06-0.057,0.123-0.107,0.183-0.166,3.83-3.84,3.83-10.1-0.02-13.95z"/>
-<path d="M22.03,19l-5.03-2v8.305c-0.254-0.152-0.666-0.244-1.107-0.244-1.583,0-2.864,1.098-2.864,2.453s1.28,2.49,2.86,2.49c1.59,0,3.11-1,3.11-2.49v-6.51l3.029,1v-3z"/>
+<path d="M11.754,27.735c0-2.09,1.728-3.834,4-4.196V23H9.5v-2h6.254v-3H9.5v-2h6.535c0.116-0.2,0.258-0.386,0.439-0.537  C16.836,15.161,17.29,15,17.754,15c0.121,0,0.242,0.011,0.363,0.033l3.637,0.671c0.128-0.376,0.367-0.71,0.693-0.953l1.504-1.127  c0.171-0.128,0.356-0.222,0.549-0.287V3c0-1.104-0.896-2-2-2h-18c-1.104,0-2,0.896-2,2v24c0,1.104,0.896,2,2,2h7.498  C11.854,28.598,11.754,28.179,11.754,27.735z M9.5,6h11v2h-11V6z M9.5,11h11v2h-11V11z M8.5,23h-2v-2h2V23z M8.5,18h-2v-2h2V18z   M8.5,13h-2v-2h2V13z M8.5,8h-2V6h2V8z"/>
+<path d="M24.26,24.775l-1.51-1.131c-0.131-0.099-0.249-0.212-0.351-0.336c-0.003-0.001-0.646-0.119-0.646-0.119v4.546  c0,0.44-0.108,0.861-0.266,1.265H22.5c1.104,0,2-0.896,2-2v-2.091C24.42,24.865,24.336,24.832,24.26,24.775z"/>
+<path d="M22.754,21.34l-3-0.554c0,2.007,0,6.882,0,6.949c0,1.25-1.537,2.265-3.125,2.265s-2.875-1.015-2.875-2.265  s1.287-2.265,2.875-2.265c0.399,0,0.779,0.064,1.125,0.18V17l0,0l5,0.923V21.34z M23.948,22.043c1.515-1.627,1.454-4.08-0.22-5.623  c-0.027-0.023-0.055-0.045-0.083-0.068l1.505-1.127c2.319,2.195,2.424,5.646,0.309,7.949L23.948,22.043z M27.81,24.938l-1.499-1.123  c2.397-2.723,2.344-6.672-0.146-9.352l1.494-1.121C30.728,16.674,30.781,21.564,27.81,24.938z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_recentlog.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_recentlog.svg	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M0,0v30h30v-30h-30zm28.24,26.99l-6.012-6.012-0.454,2.042,5.218,5.219h-24.37l5.535-5.534-0.454-2.042-5.942,5.941v-23.6l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202-2.479-1.04-3.137-2.756-3.311-3.69l-3.856-3.856h23.59l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738v24.36z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect height="3.519" width="17.65" x="6.177" y="13.25"/>
-<polygon points="9.706,25.59,20.29,25.59,22.06,17.65,7.941,17.65"/>
-<path d="M10.52,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766v-3.871c0.866,0.304,2.249,0.588,3.599,0.017,2.926-1.238,2.831-3.499,2.831-3.499s-1.41-1.298-4.335-0.06c-2.645,1.12-2.94,2.791-2.973,3.101h-0.01c-0.032-0.31-0.328-1.98-2.973-3.101-2.925-1.238-4.335,0.06-4.335,0.06s-0.102,2.261,2.825,3.499z"/>
-</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_recognize_song.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_recognize_song.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M23.217,4.023l-9-2C14.145,2.008,14.072,2,14,2c-0.226,0-0.446,0.076-0.626,0.22C13.138,2.41,13,2.696,13,3v1v15.357  C12.31,19.129,11.549,19,10.75,19C7.574,19,5,21.016,5,23.5S7.574,28,10.75,28S17,25.984,17,23.5c0-0.134,0-9.82,0-13.809  l5.783,1.285C22.855,10.992,22.928,11,23,11c0,0,0.446-0.076,0.626-0.22C23.862,10.59,24,10.304,24,10V5  C24,4.531,23.675,4.126,23.217,4.023z"/>
+<g>
+<rect fill="none" height="30" width="30"/>
+</g>
+<path d="M20,17.014v-1.582C21.043,15.145,21.975,15,22.795,15c1.363,0,2.405,0.279,3.124,0.838C26.64,16.395,27,17.219,27,18.309  c0,0.459-0.104,0.93-0.311,1.412c-0.21,0.48-0.705,1.119-1.488,1.916c-0.573,0.576-0.957,1.008-1.149,1.291  c-0.192,0.287-0.29,0.615-0.29,0.99v0.836h-2.297v-0.965c0-0.619,0.136-1.156,0.407-1.609c0.271-0.453,0.689-0.953,1.257-1.498  c0.598-0.59,0.967-1.037,1.108-1.342c0.142-0.307,0.212-0.607,0.212-0.902c0-0.613-0.171-1.072-0.516-1.379  c-0.343-0.305-0.858-0.459-1.546-0.459C21.718,16.6,20.923,16.736,20,17.014z M22.613,29c-0.398,0-0.735-0.143-1.013-0.428  c-0.278-0.283-0.416-0.629-0.416-1.033s0.138-0.748,0.416-1.029c0.277-0.283,0.614-0.424,1.013-0.424s0.735,0.141,1.014,0.424  c0.277,0.281,0.415,0.625,0.415,1.029s-0.139,0.75-0.421,1.033C23.342,28.857,23.006,29,22.613,29z"/>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_redeye.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_redeye.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_redeye.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M27,21h-2.869L28,10h-8.639l3.179-9h-5.302l-3.247,9.192c2.081,0.37,4.071,1.317,5.885,2.808h1.762l-0.426,1.212  c1.5,1.545,1.498,4.048-0.01,5.588c-1.629,1.661-3.438,2.841-5.35,3.521l4.909,5.355C20.952,28.883,21.22,29,21.5,29  s0.548-0.117,0.737-0.324l5.5-6c0.268-0.293,0.338-0.715,0.179-1.078C27.756,21.234,27.396,21,27,21z"/>
+<path d="M19.773,15.6C17.467,13.245,14.777,12,12,12c-2.775,0-5.463,1.244-7.773,3.6  c-0.763,0.777-0.763,2.023,0,2.801C6.537,20.756,9.225,22,12,22c2.777,0,5.467-1.245,7.773-3.6  C20.536,17.622,20.536,16.378,19.773,15.6z M12,20c-2.68,0-4.816-1.441-6.346-3c0.695-0.709,1.522-1.385,2.463-1.921  C8.047,15.376,8,15.682,8,16C8,18.21,9.793,20,12,20c2.209,0,4-1.79,4-4c0-0.318-0.047-0.625-0.117-0.922  c0.941,0.536,1.769,1.213,2.463,1.922C16.818,18.559,14.68,20,12,20z" fill-rule="evenodd"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M24.13,21l3.87-11h-8.639l3.179-9h-5.302l-3.275,9.273c2.109,0.408,4.498,1.305,6.408,2.727h1.268l-0.29,0.824c0.824,0.778,1.511,1.672,1.962,2.698l0.874,1.988-0.874,1.99c-0.965,2.193-2.979,3.809-5.204,4.881l3.39,3.62,7.5-8h-4.869z"/>
-<path d="M21.48,17.33c-1.524-3.469-6.775-5.315-9.979-5.315-3.205,0-8.457,1.848-9.98,5.315l-0.52,1.17,0.52,1.184c1.523,3.471,6.777,5.318,9.982,5.318,3.203,0,8.453-1.848,9.978-5.316l0.52-1.18-0.52-1.18zm-17.14,1.18c0.793-1.807,4.152-3.297,6.66-3.479v0.031c-1.693,0.244-3,1.688-3,3.449s1.307,3.205,3,3.449v0.031c-2.51-0.18-5.867-1.67-6.66-3.48zm7.66,3.48v-0.031c1.694-0.244,3-1.688,3-3.449s-1.306-3.205-3-3.449v-0.031c2.507,0.182,5.866,1.672,6.66,3.479-0.8,1.81-4.15,3.3-6.66,3.48z"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reject_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reject_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reject_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M15.691,11.542c1.257-0.961,2.563-1.786,3.289-2.164c0.001,0.002,0,0.004,0.001,0.004s0.005-0.006,0.007-0.008l1.277,2.143  c0.183,0.313,0.589,0.408,0.953,0.256l7.359-4.248c0.383-0.221,0.533-0.68,0.334-1.023c0,0-0.203-0.305-0.818-1.061  c0.002,0,0.002,0.002,0.004,0.004c-0.002-0.002,0-0.004-0.002-0.008c-0.312-0.383-0.35-0.396-0.751-0.764  c-1.204-1.104-2.53-1.537-2.53-1.537c-0.514-0.182-2.241-0.281-4.417,0.375c-1.677,0.506-4.996,2.504-7.887,4.85L15.691,11.542z"/>
+<path d="M9.396,18.757c-0.01,0-0.019,0-0.027-0.002c0.002-0.002,0.008-0.01,0.008-0.01c0.654-1.126,1.376-2.136,2.144-3.077  l-3.206-3.206c-2.368,2.795-4.218,5.808-4.637,6.908c-0.814,2.148-0.74,4.516-0.563,5.205c0,0,0.169,0.512,0.56,1.211  c0.005,0.006,0.01,0.016,0.015,0.023c0.038,0.068,0.076,0.137,0.119,0.207c0.001,0.002,0.005,0.002,0.005,0.002  c0.21,0.35,0.464,0.73,0.783,1.115c0.374,0.449,0.392,0.578,0.785,0.924c0.001,0,0.002,0,0.003,0c0.723,0.637,1.021,0.83,1.021,0.83  c0.344,0.225,0.827,0.104,1.081-0.268l4.793-7.041c0.254-0.373,0.186-0.857-0.158-1.078L9.396,18.757z"/>
+<path d="M27.693,26.372c0.389,0.389,0.41,1.005,0.048,1.368c-0.362,0.362-0.978,0.343-1.366-0.046L2.307,3.625  C1.918,3.236,1.896,2.621,2.26,2.258c0.363-0.362,0.979-0.34,1.367,0.049L27.693,26.372z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M15.69,11.54c1.257-0.96,2.563-1.786,3.289-2.164,0.001,0.001,0,0.003,0.001,0.004,0.001-0.001,0.005-0.006,0.007-0.008l1.277,2.142c0.183,0.313,0.589,0.408,0.953,0.256l7.359-4.248c0.383-0.22,0.533-0.68,0.334-1.022,0,0-0.203-0.305-0.818-1.062,0.002,0.001,0.002,0.003,0.004,0.005-0.002-0.002,0-0.005-0.002-0.008-0.312-0.383-0.35-0.397-0.751-0.765-1.204-1.103-2.53-1.536-2.53-1.536-0.514-0.182-2.241-0.282-4.417,0.374-1.677,0.506-4.996,2.505-7.888,4.851l3.19,3.181z"/>
-<path d="M9.396,18.76c-0.01-0.001-0.019-0.001-0.027-0.003,0.002-0.002,0.008-0.01,0.008-0.01,0.652-1.125,1.375-2.136,2.143-3.077l-3.205-3.205c-2.367,2.794-4.219,5.808-4.637,6.907-0.814,2.148-0.74,4.517-0.563,5.205,0,0,0.169,0.513,0.56,1.211,0.005,0.007,0.01,0.016,0.015,0.024,0.038,0.068,0.076,0.136,0.119,0.207,0.001,0.002,0.004,0.001,0.005,0.002,0.21,0.35,0.464,0.729,0.783,1.114,0.374,0.449,0.392,0.578,0.785,0.925h0.003c0.723,0.636,1.021,0.83,1.021,0.83,0.345,0.224,0.827,0.103,1.08-0.268l4.794-7.042c0.254-0.372,0.186-0.856-0.158-1.078l-2.724-1.74z"/>
-<rect height="35.83" transform="matrix(0.7066 -0.7076 0.7076 0.7066 -6.0774 14.6889)" width="1.867" x="13.74" y="-3.24"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_collection.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_collection.svg	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M0,0v30h30v-30h-30zm28.24,26.99l-6.012-6.012-0.454,2.042,5.218,5.219h-24.37l5.535-5.534-0.454-2.042-5.942,5.941v-23.6l9.352,9.352h2.119v-0.377l-2.467-2.467c-0.202-0.056-0.401-0.12-0.594-0.202-2.479-1.04-3.137-2.756-3.311-3.69l-3.856-3.856h23.59l-3.413,3.413c-0.041,0.684-0.408,2.89-3.363,4.141-0.348,0.147-0.714,0.25-1.093,0.315l-1.968,1.968v0.763h1.732l9.738-9.738v24.36z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect height="3.519" width="17.65" x="6.177" y="13.25"/>
-<polygon points="9.706,25.59,20.29,25.59,22.06,17.65,7.941,17.65"/>
-<path d="M10.52,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766v-3.871c0.866,0.304,2.249,0.588,3.599,0.017,2.926-1.238,2.831-3.499,2.831-3.499s-1.41-1.298-4.335-0.06c-2.645,1.12-2.94,2.791-2.973,3.101h-0.01c-0.032-0.31-0.328-1.98-2.973-3.101-2.925-1.238-4.335,0.06-4.335,0.06s-0.102,2.261,2.825,3.499z"/>
-</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_video_collection.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_video_collection.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_video_collection.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M13,22.5c0-0.169,0.017-0.333,0.025-0.5h-1.02v-1h1.131c0.11-0.693,0.293-1.364,0.546-2h-3.68v-3h5v0.689c0.875-1.127,1.995-2.048,3.283-2.689h-0.28v-1h1v-2h-13v2h2v1h-2v2h2v3h-2v2h2v1h-2v2h7.131c-0.08-0.49-0.13-0.99-0.13-1.5zm2-9.5h2v1h-2v-1zm-3,0h2v1h-2v-1zm-3,0h2v1h-2v-1zm2,9h-2v-1h2v1z"/>
-<path d="M13.68,26h-9.68v-17h17v4.13c0.49-0.078,0.988-0.13,1.5-0.13s1.01,0.052,1.5,0.13v-7.13h-23v23h14.59c-0.81-0.86-1.47-1.88-1.91-3z"/>
-<path d="M26,13.68c1.121,0.446,2.135,1.1,3,1.914v-14.59h-23v3h20v9.677z"/>
-<path d="M22.5,15c-4.137,0-7.5,3.364-7.5,7.5s3.363,7.5,7.5,7.5,7.5-3.364,7.5-7.5-3.36-7.5-7.5-7.5zm0,13c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5,5.5,2.468,5.5,5.5-2.47,5.5-5.5,5.5z"/>
-<rect height="3" width="9" x="18" y="21"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M26,14.525c1.119,0.396,2.134,1.008,3,1.785V3c0-1.104-0.896-2-2-2H8C6.896,1,6,1.896,6,3v1h20V14.525z"/>
+<rect height="2" width="2" x="7" y="11"/>
+<rect height="2" width="2" x="7" y="22"/>
+<path d="M16,17.355V15H9v5h5.525C14.869,19.033,15.367,18.139,16,17.355z"/>
+<rect height="2" width="2" x="10" y="11"/>
+<rect height="2" width="2" x="10" y="22"/>
+<rect height="2" width="2" x="16" y="11"/>
+<path d="M14,23c0-0.338,0.022-0.671,0.059-1H13v2h1.062C14.024,23.671,14,23.339,14,23z"/>
+<path d="M22,6H3C1.896,6,1,6.896,1,8v19c0,1.104,0.896,2,2,2h13.311c-0.777-0.865-1.384-1.884-1.783-3H5c-0.552,0-1-0.447-1-1  s0.448-1,1-1h1v-2H5c-0.552,0-1-0.447-1-1s0.448-1,1-1h2v-5H5c-0.552,0-1-0.447-1-1s0.448-1,1-1h1v-2H5c-0.552,0-1-0.447-1-1  s0.448-1,1-1h15c0.553,0,1,0.447,1,1s-0.447,1-1,1h-1v2h1c0.553,0,1,0.447,1,1c0,0.087-0.029,0.164-0.049,0.244  C21.61,14.09,22.294,14,23,14c0.338,0,0.672,0.022,1,0.059V8C24,6.896,23.104,6,22,6z"/>
+<rect height="2" width="2" x="13" y="11"/>
+<path d="M18,15.521c0.287-0.191,0.588-0.362,0.896-0.521H18V15.521z"/>
+<path d="M23,16c-3.866,0-7,3.134-7,7s3.134,7,7,7s7-3.134,7-7S26.866,16,23,16z M18,24v-2h10v2H18z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M15,2C8.475,2,3.09,6.814,2.16,13.082c-0.039,0.133-0.066,0.271-0.066,0.418c0,0.828,0.671,1.5,1.5,1.5  c0.803,0,1.454-0.633,1.493-1.427l0.027,0.004C5.808,8.736,9.971,5,15,5c5.514,0,10,4.486,10,10c0,5.515-4.486,10-10,10  c-2.759,0-5.244-1.136-7.048-2.951l3.634-3.635C12.364,17.637,12.1,17,11,17H4c-1.1,0-2,0.9-2,2v7c0,1.1,0.636,1.363,1.414,0.586  l2.408-2.408C8.17,26.534,11.409,28,15,28c7.18,0,13-5.82,13-13S22.18,2,15,2z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M15,2C8.158,2,2.563,7.289,2.051,14h3C5.554,8.954,9.824,5,15,5c5.514,0,10,4.486,10,10c0,5.515-4.486,10-10,10  c-3.523,0-6.621-1.836-8.402-4.598L10,17H2v8l2.445-2.445C6.8,25.848,10.642,28,15,28c7.18,0,13-5.82,13-13S22.18,2,15,2z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat_exception.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat_exception.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat_exception.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M5.086,13.573l0.027,0.004c0.166-1.16,0.537-2.255,1.066-3.251L3.99,8.137c-0.921,1.479-1.563,3.148-1.83,4.945  c-0.039,0.133-0.066,0.271-0.066,0.418c0,0.828,0.672,1.5,1.5,1.5C4.396,15,5.047,14.367,5.086,13.573z"/>
+<path d="M15,5c5.514,0,10,4.486,10,10c0,1.691-0.425,3.283-1.169,4.681l2.19,2.19C27.268,19.875,28,17.525,28,15  c0-7.18-5.82-13-13-13c-2.527,0-4.879,0.729-6.872,1.979l2.197,2.196C11.721,5.43,13.31,5,15,5z"/>
+<path d="M15,25c-2.759,0-5.244-1.136-7.049-2.951l3.635-3.635C12.363,17.637,12.1,17,11,17H4c-1.1,0-2,0.9-2,2v7  c0,1.1,0.637,1.363,1.414,0.586l2.408-2.408C8.17,26.534,11.408,28,15,28c2.527,0,4.877-0.732,6.873-1.98l-2.19-2.189  C18.284,24.574,16.691,25,15,25z"/>
+<path d="M3.628,2.307c-0.389-0.389-1.004-0.41-1.367-0.048S1.919,3.236,2.308,3.625l24.068,24.07  c0.389,0.389,1.004,0.408,1.366,0.045s0.341-0.979-0.048-1.367L3.628,2.307z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M3.98,8.128C2.902,9.856,2.214,11.854,2.051,14h3c0.132-1.319,0.526-2.562,1.122-3.681L3.98,8.128z"/>
-<path d="M15,5c5.514,0,10,4.486,10,10c0,1.691-0.426,3.283-1.169,4.681l2.19,2.19C27.268,19.876,28,17.526,28,15  c0-7.18-5.82-13-13-13c-2.528,0-4.883,0.726-6.877,1.975l2.198,2.197C11.719,5.428,13.309,5,15,5z"/>
-<path d="M15,25c-3.523,0-6.621-1.836-8.402-4.598L10,17H2v8l2.445-2.445C6.8,25.848,10.642,28,15,28c2.527,0,4.877-0.732,6.873-1.98  l-2.189-2.189C18.285,24.574,16.691,25,15,25z"/>
-<rect height="1.868" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 14.6748 35.4224)" width="35.827" x="-3.24" y="13.738"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_replace_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_replace_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_replace_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M27.578,6.523l-7.36,4.248c-0.363,0.152-0.77,0.057-0.952-0.256l-1.278-2.143c-0.001,0.002-0.004,0.008-0.006,0.008V8.377  c-1.121,0.582-3.618,2.223-5.188,3.791c-1.632,1.635-3.15,3.393-4.417,5.576c0,0-0.006,0.008-0.008,0.01  c0.009,0.002,0.018,0.002,0.027,0.002l2.725,1.744c0.344,0.221,0.412,0.705,0.158,1.078l-4.794,7.041  c-0.253,0.371-0.735,0.492-1.08,0.268c0,0-0.298-0.193-1.021-0.83c0,0-0.002,0-0.003,0c-0.394-0.346-0.411-0.475-0.785-0.924  c-0.319-0.385-0.573-0.766-0.783-1.115c0,0-0.004,0-0.005-0.002c-0.043-0.07-0.081-0.139-0.119-0.207  c-0.005-0.008-0.01-0.018-0.015-0.023c-0.391-0.699-0.56-1.211-0.56-1.211c-0.178-0.689-0.252-3.057,0.563-5.205  c0.52-1.365,3.24-5.672,6.42-8.855c3.18-3.182,8.124-6.348,10.3-7.004s3.903-0.557,4.416-0.375c0,0,1.326,0.434,2.531,1.537  c0.401,0.367,0.439,0.381,0.75,0.764c0.002,0.004,0.002,0.006,0.002,0.006s-0.002-0.002-0.004-0.002  C27.709,5.195,27.911,5.5,27.911,5.5C28.11,5.844,27.962,6.303,27.578,6.523z"/>
+<path d="M28.832,17.445l-4-6C24.646,11.167,24.334,11,24,11s-0.646,0.167-0.832,0.445l-4,6c-0.205,0.307-0.224,0.701-0.05,1.026  C19.293,18.797,19.631,19,20,19h2v6h-2v-2c0-1.104-0.896-2-2-2s-2,0.896-2,2v1v1c0,3,2.775,5,5.5,5s5.5-2,5.5-5v-6h1  c0.369,0,0.707-0.203,0.882-0.528C29.056,18.146,29.037,17.752,28.832,17.445z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M27.58,6.523l-7.36,4.248c-0.363,0.152-0.77,0.057-0.952-0.256l-1.278-2.142c-0.001,0.002-0.004,0.007-0.006,0.008v-0.004c-1.121,0.582-3.618,2.223-5.188,3.79-1.632,1.635-3.15,3.394-4.417,5.576,0,0-0.006,0.008-0.008,0.01,0.009,0.002,0.018,0.002,0.027,0.003l2.725,1.743c0.344,0.222,0.412,0.706,0.158,1.078l-4.795,7.05c-0.253,0.37-0.735,0.491-1.08,0.268,0,0-0.298-0.194-1.021-0.83h-0.003c-0.394-0.347-0.411-0.476-0.785-0.925-0.319-0.385-0.573-0.765-0.783-1.114-0.001-0.001-0.004,0-0.005-0.002-0.043-0.071-0.081-0.139-0.119-0.207-0.005-0.009-0.01-0.018-0.015-0.024-0.391-0.698-0.56-1.211-0.56-1.211-0.178-0.688-0.252-3.057,0.563-5.205,0.52-1.364,3.24-5.672,6.42-8.854,3.181-3.182,8.124-6.349,10.3-7.005s3.903-0.556,4.416-0.374,1.326,0.434,2.531,1.536c0.401,0.367,0.439,0.382,0.75,0.765,0.002,0.003,0.002,0.006,0.003,0.008-0.001-0.002-0.003-0.004-0.005-0.005,0.616,0.757,0.818,1.062,0.818,1.062,0.19,0.331,0.04,0.791-0.34,1.01z"/>
-<path d="M24,11l-6,8h3.963v6.002h-1.96v-5h-3.997v5c0,3,2.775,5,5.5,5s5.5-2,5.5-5v-6h3l-6-8z"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<polygon points="8.268,16.727 0,9.819 0,23.547 "/>
+<path d="M0.127,7.319l11.307,9.448c0.46,0.354,0.908,0.555,1.402,0.566c0.021,0,0.094,0,0.113,0  c0.494-0.012,0.943-0.213,1.402-0.566l11.508-9.494C25.567,6.529,24.848,6,24,6H2C1.136,6,0.406,6.552,0.127,7.319z"/>
+<path d="M14,24c0-0.893,0.394-1.732,1.08-2.305l3.615-3.013l-1.75-1.462l-1.321,1.09c-0.882,0.681-1.724,1.002-2.627,1.023h-0.023  h-0.138c-0.948-0.021-1.791-0.342-2.621-0.98l-1.167-0.975l-8.907,7.349C0.433,25.472,1.152,26,2,26h12.786  C14.291,25.452,14,24.75,14,24z"/>
+<path d="M21.08,16.695C21.616,16.248,22.299,16,23,16c0.435,0,0.873,0.098,1.269,0.281C25.322,16.774,26,17.841,26,19V9.75  l-8.271,6.823l1.747,1.459L21.08,16.695z"/>
+<path d="M23,30c-0.229,0-0.457-0.079-0.641-0.231l-6-5C16.132,24.578,16,24.297,16,24s0.132-0.578,0.359-0.768l6-5  C22.543,18.079,22.771,18,23,18c0.144,0,0.289,0.031,0.424,0.095C23.775,18.259,24,18.612,24,19v2h5c0.553,0,1,0.448,1,1v4  c0,0.553-0.447,1-1,1h-5v2c0,0.389-0.225,0.741-0.576,0.906C23.289,29.969,23.144,30,23,30L23,30z"/>
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M14.8,22.6c-0.217-0.163-0.387-0.371-0.52-0.6h-8.866l6.115-6.115,3.41,3.41,0.481-0.36,3.05-3.05,0.436,0.436,0.809-0.605-0.537-0.537,5.82-5.825v3.928c0.611,0.357,1,1.003,1,1.717v1h2v-11h-26v20h16l-3.2-2.4zm8.73-14.6l-8.53,8.53-8.527-8.53h17.05zm-18.53,1.355l5.822,5.822-5.82,5.82v-11.64z"/>
-<polygon points="29,18,24,18,24,15,16,21,24,27,24,24,29,24"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<polygon points="7.45,17.72 0,11.495 0,23.867 "/>
+<path d="M22,8H2C1.228,8,0.566,8.442,0.232,9.083l10.322,8.626c0.424,0.327,0.837,0.512,1.294,0.522c0.02,0,0.086,0,0.105,0  c0.456-0.011,0.87-0.195,1.293-0.522l10.5-8.663C23.407,8.426,22.757,8,22,8z"/>
+<path d="M14,24c0-0.892,0.393-1.731,1.078-2.303l2.421-2.019l-1.737-1.451l-1.242,1.024c-0.845,0.652-1.652,0.959-2.519,0.979  h-0.024h-0.128c-0.913-0.021-1.72-0.327-2.513-0.937l-1.104-0.922l-7.979,6.582C0.593,25.574,1.243,26,2,26h12.786  C14.291,25.452,14,24.75,14,24z"/>
+<path d="M21.079,16.695C21.618,16.247,22.3,16,23,16c0.341,0,0.678,0.076,1,0.19V11.43l-7.454,6.15l1.733,1.448L21.079,16.695z"/>
+<path d="M23,30c-0.229,0-0.457-0.079-0.641-0.231l-6-5C16.132,24.578,16,24.297,16,24s0.132-0.578,0.359-0.768l6-5  C22.543,18.079,22.771,18,23,18c0.144,0,0.289,0.031,0.424,0.095C23.775,18.259,24,18.612,24,19v2h5c0.553,0,1,0.448,1,1v4  c0,0.553-0.447,1-1,1h-5v2c0,0.389-0.225,0.741-0.576,0.906C23.289,29.969,23.144,30,23,30L23,30z"/>
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M27,16h2c0.366,0,0.705,0.105,1,0.277v-13.28h-24v3h21v10z"/>
-<path d="M15.33,23h-10.92l5.115-5.115,3.471,3.48,1.189-1.189c0.137-0.298,0.342-0.563,0.61-0.766l0.621-0.466,1.05-1.05,0.15,0.15,0.808-0.606-0.251-0.251,4.82-4.81v1.64l0.8-0.6c0.606-0.455,1.417-0.528,2.095-0.189,0.039,0.02,0.068,0.051,0.105,0.072v-5.28h-24v18h18.33l-4-3zm5.2-12l-7.53,7.53-7.527-7.53h15.05zm-16.53,1.36l4.822,4.822-4.822,4.82v-9.645z"/>
-<polygon points="29,18,24,18,24,15,16,21,24,27,24,24,29,24"/>
+<path d="M23,4H6C4.896,4,4,4.896,4,6h19c1.654,0,3,1.346,3,3v10h2V9C28,6.244,25.757,4,23,4z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all_email.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all_email.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all_email.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<path d="M23,30c-0.229,0-0.457-0.08-0.641-0.232l-6-5C16.132,24.578,16,24.297,16,24s0.132-0.578,0.359-0.768l6-5  C22.543,18.078,22.771,18,23,18c0.144,0,0.289,0.031,0.424,0.094C23.775,18.258,24,18.611,24,19v2h5c0.553,0,1,0.447,1,1v4  c0,0.553-0.447,1-1,1h-5v2c0,0.389-0.225,0.74-0.576,0.906C23.289,29.969,23.144,30,23,30L23,30z"/>
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M14.48,10.68c-1.992,0-3.585,0.628-4.777,1.885-1.193,1.258-1.79,2.989-1.79,5.197,0,1.423,0.337,2.545,1.012,3.367,0.675,0.824,1.506,1.234,2.494,1.234,0.758,0,1.401-0.181,1.932-0.545s1.019-0.972,1.463-1.823c0.031,0.11,0.074,0.21,0.112,0.313l2.128-1.596c-0.011-0.198-0.018-0.414-0.018-0.651,0-1.515,0.288-3.975,0.864-7.381h-3.409zm-0.25,5.58c-0.197,1.538-0.448,2.618-0.753,3.238-0.304,0.62-0.704,0.93-1.197,0.93-0.552,0-0.931-0.223-1.136-0.669-0.206-0.447-0.309-1.154-0.309-2.121,0-1.539,0.301-2.759,0.901-3.66s1.328-1.353,2.185-1.353h0.766l-0.46,3.63z"/>
-<path d="M16.19,24.64c-0.816,0.148-1.612,0.225-2.388,0.225-5.465,0-8.197-2.861-8.197-8.584,0-2.563,0.738-4.566,2.216-6.01,1.477-1.443,3.396-2.165,5.759-2.165,2.239,0,3.965,0.685,5.18,2.053,1.214,1.369,1.82,3.311,1.82,5.824,0,0.029-0.003,0.054-0.003,0.082l2.22-1.66c0.037-0.028,0.081-0.041,0.12-0.066-0.23-2.387-1.02-4.306-2.383-5.741-1.64-1.726-3.98-2.589-7.02-2.589-3.045,0-5.56,0.923-7.543,2.772-1.985,1.848-2.977,4.388-2.977,7.638,0,3.398,0.965,6.015,2.896,7.846,1.929,1.82,4.524,2.74,7.784,2.74,0.766,0,1.644-0.088,2.636-0.266,0.764-0.138,1.433-0.301,2.013-0.489l-2.14-1.6z"/>
-<path d="M17.58,4.108c2.239,0,3.965,0.685,5.18,2.053,1.214,1.369,1.82,3.311,1.82,5.824,0,0.037-0.004,0.068-0.004,0.104,0.164,0.672,0.267,1.391,0.335,2.133,0.66,0.35,1.08,1.04,1.08,1.79v0.071c0.654-1.065,1-2.46,1-4.223,0-3.108-0.821-5.527-2.463-7.256-1.64-1.731-3.98-2.594-7.02-2.594-2.769,0-5.094,0.771-6.984,2.3,0.94-0.192,1.93-0.3,2.98-0.3,0.92,0,1.79,0.073,2.61,0.215,0.46-0.067,0.95-0.107,1.45-0.107z"/>
-<polygon points="29,19,24,19,24,16,16,22,24,28,24,25,29,25"/>
+<path d="M25.117,3.85C23.294,1.949,20.705,1,17.352,1c-2.008,0-3.802,0.369-5.393,1.088C12.51,2.035,13.07,2,13.648,2  c3.088,0,5.662,0.74,7.699,2.183c0.686,0.356,1.29,0.823,1.808,1.403c0.439,0.494,0.8,1.061,1.095,1.689  c1.26,2.045,1.898,4.583,1.898,7.58c0,0.99-0.091,1.908-0.266,2.756c0.147-0.143,0.289-0.295,0.424-0.459  c1.029-1.252,1.545-3.019,1.545-5.297C27.852,8.419,26.939,5.75,25.117,3.85z"/>
+<path d="M15.079,26.305c-0.479-0.4-0.803-0.934-0.962-1.52c-0.049,0.002-0.107,0.01-0.154,0.01c-3.026,0-5.296-0.789-6.809-2.365  c-1.514-1.577-2.27-3.942-2.27-7.096c0-2.808,0.815-5.012,2.447-6.611c1.631-1.6,3.755-2.398,6.371-2.398  c2.488,0,4.404,0.754,5.749,2.262c1.345,1.51,2.017,3.648,2.017,6.42c0,0.541-0.039,1.025-0.097,1.486  C21.855,16.178,22.418,16,23,16c0.365,0,0.726,0.083,1.067,0.213c0.046-0.434,0.081-0.879,0.081-1.357  c0-3.437-0.912-6.105-2.734-8.006C19.591,4.949,17.002,4,13.648,4c-3.373,0-6.157,1.016-8.354,3.049C3.098,9.081,2,11.889,2,15.471  c0,3.755,1.066,6.64,3.199,8.654c2.133,2.014,5.008,3.021,8.627,3.021c0.612,0,1.312-0.071,2.052-0.176L15.079,26.305z"/>
+<path d="M14.715,9.154c-2.215,0-3.98,0.692-5.298,2.078c-1.317,1.385-1.976,3.295-1.976,5.729c0,1.576,0.373,2.816,1.121,3.719  c0.747,0.902,1.668,1.354,2.762,1.354c0.811,0,1.511-0.189,2.099-0.568c0.588-0.377,1.142-1.059,1.661-2.043  c0.179,0.633,0.46,1.155,0.842,1.568l1.937-1.614c-0.069-0.13-0.128-0.284-0.174-0.468c-0.096-0.377-0.144-0.918-0.144-1.619  c0-1.769,0.318-4.48,0.957-8.135H14.715z M14.441,15.307c-0.219,1.713-0.499,2.907-0.841,3.582  c-0.342,0.674-0.782,1.012-1.319,1.012c-0.602,0-1.019-0.242-1.251-0.725c-0.232-0.483-0.349-1.268-0.349-2.352  c0-1.695,0.332-3.04,0.998-4.033c0.665-0.994,1.472-1.49,2.42-1.49h0.848L14.441,15.307z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_email.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_email.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_email.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<path d="M14,24c0-0.453,0.103-0.891,0.291-1.288c-2.271-0.229-4.039-0.983-5.285-2.282c-1.514-1.577-2.27-3.942-2.27-7.096  c0-2.808,0.815-5.012,2.447-6.611c1.631-1.6,3.755-2.398,6.371-2.398c2.488,0,4.404,0.754,5.749,2.262  c1.345,1.51,2.017,3.648,2.017,6.42c0,1.205-0.149,2.201-0.436,3.004C22.924,16.008,22.961,16,23,16c0.438,0,0.88,0.098,1.276,0.285  c0.353,0.164,0.658,0.398,0.915,0.676C25.724,15.854,26,14.492,26,12.855c0-3.437-0.912-6.105-2.734-8.006  C21.442,2.949,18.854,2,15.5,2c-3.373,0-6.157,1.016-8.354,3.049c-2.197,2.032-3.295,4.84-3.295,8.422  c0,3.755,1.066,6.64,3.199,8.654c1.837,1.734,4.229,2.717,7.167,2.959C14.084,24.74,14,24.377,14,24z"/>
+<path d="M16.566,7.154c-2.215,0-3.98,0.692-5.298,2.078c-1.317,1.385-1.976,3.295-1.976,5.729c0,1.576,0.373,2.816,1.121,3.719  c0.747,0.902,1.668,1.354,2.762,1.354c0.811,0,1.511-0.189,2.099-0.568c0.588-0.377,1.142-1.059,1.661-2.043  c0.217,0.768,0.59,1.363,1.104,1.807l1.892-1.576c-0.169-0.155-0.303-0.395-0.391-0.744c-0.096-0.377-0.144-0.918-0.144-1.619  c0-1.769,0.318-4.48,0.957-8.135H16.566z M16.293,13.307c-0.219,1.713-0.499,2.907-0.841,3.582C15.11,17.563,14.67,17.9,14.133,17.9  c-0.602,0-1.019-0.242-1.251-0.725c-0.232-0.483-0.349-1.268-0.349-2.352c0-1.695,0.332-3.04,0.998-4.033  c0.665-0.994,1.472-1.49,2.42-1.49h0.848L16.293,13.307z"/>
+<path d="M23,30c-0.229,0-0.457-0.08-0.641-0.232l-6-5C16.132,24.578,16,24.297,16,24s0.132-0.578,0.359-0.768l6-5  C22.543,18.078,22.771,18,23,18c0.144,0,0.289,0.031,0.424,0.094C23.775,18.258,24,18.611,24,19v2h5c0.553,0,1,0.447,1,1v4  c0,0.553-0.447,1-1,1h-5v2c0,0.389-0.225,0.74-0.576,0.906C23.289,29.969,23.144,30,23,30L23,30z"/>
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M14.8,20.4l2.013-1.51c0.092-0.151,0.184-0.301,0.271-0.469,0.021,0.074,0.051,0.138,0.075,0.209l2.4-1.801c-0.007-0.173-0.015-0.344-0.015-0.541,0-1.668,0.319-4.38,0.957-8.135h-3.787c-2.206,0-3.97,0.692-5.291,2.078s-1.982,3.295-1.982,5.729c0,1.567,0.374,2.805,1.121,3.712s1.668,1.36,2.762,1.36c0.362,0,0.697-0.045,1.013-0.12,0.13-0.19,0.28-0.37,0.47-0.51zm-1.78-2.24c-0.228-0.492-0.342-1.271-0.342-2.338,0-1.695,0.333-3.04,0.998-4.033s1.472-1.49,2.42-1.49h0.848l-0.506,4.006c-0.219,1.695-0.497,2.885-0.834,3.568s-0.78,1.02-1.33,1.02c-0.61,0-1.03-0.25-1.26-0.74z"/>
-<path d="M15.02,23.76c-5.419-0.321-8.133-3.461-8.133-9.43,0-2.825,0.818-5.033,2.454-6.624s3.762-2.386,6.378-2.386c2.479,0,4.391,0.754,5.735,2.263s2.017,3.648,2.017,6.419c0,0.029-0.003,0.055-0.003,0.084,0.47-0.131,0.977-0.104,1.429,0.121,0.632,0.316,1.032,0.943,1.085,1.641,0.101-0.618,0.169-1.271,0.169-1.996,0-3.427-0.909-6.093-2.728-7.998s-4.43-2.842-7.79-2.842c-3.372,0-6.157,1.019-8.354,3.056s-3.296,4.844-3.296,8.414c0,3.746,1.068,6.629,3.206,8.647s5.011,3.028,8.62,3.028c0.632,0,1.356-0.072,2.127-0.182l-2.94-2.21z"/>
-<polygon points="29,19,24,19,24,16,16,22,24,28,24,25,29,25"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_restore_settings.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_restore_settings.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_restore_settings.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M29.999,13h-2c0-4.502-3.662-8.166-8.166-8.166c-0.094,0-0.188,0.002-0.279,0.004L19.479,2.84  c0.117-0.004,0.234-0.006,0.354-0.006C25.438,2.834,29.999,7.395,29.999,13L29.999,13z"/>
-<polygon points="19.999,3.999 19.999,8 17,5.999 13.999,3.999 17,2.001 19.999,0 "/>
-<path d="M2.921,6.375c-0.289,0.289-0.543,0.6-0.781,0.918l5.024,5.023c0.624,0.623,1.638,0.623,2.263-0.002l0.565-0.564  c0.625-0.625,0.624-1.639,0-2.264L5.247,4.742C4.407,5.143,3.616,5.682,2.921,6.375z"/>
-<path d="M25.083,21.602L16.882,13.4c0.402-2.592-0.383-5.334-2.375-7.326C11.192,2.76,5.8,2.76,2.485,6.074s-3.313,8.707,0,12.021  c1.992,1.992,4.734,2.777,7.326,2.375l8.201,8.201c1.771,1.771,4.654,1.771,6.428,0l0.643-0.643  C26.854,26.256,26.854,23.371,25.083,21.602z M22.345,25.367l-0.566,0.566c-0.625,0.623-1.637,0.625-2.262,0l-8.821-8.822  c-2.013,0.879-4.443,0.508-6.089-1.139c-2.144-2.143-2.144-5.633,0-7.777c2.145-2.145,5.635-2.145,7.779,0  c1.645,1.645,2.016,4.076,1.139,6.088l8.82,8.822C22.97,23.73,22.97,24.742,22.345,25.367z"/>
-<rect height="2" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 20.3094 20.3716)" width="9.826" x="1.023" y="13.392"/>
-<path d="M20.837,23.793c0.133,0.133,0.098,0.379-0.078,0.555l0,0c-0.174,0.174-0.422,0.209-0.553,0.078l-1.424-1.422  c-0.131-0.133-0.096-0.381,0.078-0.555l0,0c0.176-0.174,0.424-0.209,0.555-0.078L20.837,23.793z"/>
+</g>
+<path d="M18,2.024V1c0-0.348-0.18-0.669-0.475-0.852C17.365,0.05,17.183,0,17,0c-0.152,0-0.307,0.035-0.447,0.105l-4,2  C12.214,2.275,12,2.621,12,3s0.214,0.725,0.553,0.895l4,2C16.693,5.965,16.848,6,17,6c0.183,0,0.365-0.051,0.525-0.15  C17.82,5.668,18,5.346,18,5V4.024c4.838,0.254,8.722,4.137,9,8.976c0,0.553,0.447,1,1,1s1-0.447,1-1  C28.719,7.049,23.949,2.281,18,2.024z"/>
+<path d="M6.15,12.979l-2.74-2.741v0.001l-0.002-0.003L3.332,10.16C3.077,9.922,2.229,9.288,1.494,10.56  c-0.541,2.157-0.045,4.519,1.492,6.291l3.568-3.567C6.411,13.199,6.273,13.103,6.15,12.979z"/>
+<path d="M14.858,14.616c0.874-2.466,0.333-5.324-1.637-7.294C11.42,5.521,8.873,4.916,6.564,5.494  C5.42,6.147,5.794,6.893,6.061,7.232l2.918,2.918c0.781,0.781,0.781,2.048,0,2.829l-4.896,4.897  c1.902,1.424,4.369,1.748,6.534,0.982l8.263,8.262c1.172,1.172,3.07,1.172,4.242,0s1.172-3.07,0-4.242L14.858,14.616z M21,25  c-0.391,0.391-1.023,0.391-1.414,0l-0.707-0.707c-0.391-0.391-0.391-1.023,0-1.414s1.023-0.391,1.414,0L21,23.586  C21.391,23.977,21.391,24.609,21,25z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rewind.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rewind.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rewind.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M13,26c-0.561,0-1.108-0.236-1.496-0.672l-8-9c-0.673-0.758-0.673-1.898,0-2.656l8-9C11.893,4.236,12.44,4,13,4  c0.238,0,0.479,0.043,0.71,0.131C14.487,4.426,15,5.17,15,6v18c0,0.83-0.513,1.574-1.289,1.869C13.479,25.957,13.239,26,13,26L13,26  z"/>
+<path d="M25,26c-0.561,0-1.107-0.236-1.495-0.672l-8-9c-0.673-0.758-0.673-1.898,0-2.656l8-9C23.893,4.236,24.439,4,25,4  c0.238,0,0.479,0.043,0.711,0.131C26.486,4.426,27,5.17,27,6v18c0,0.83-0.514,1.574-1.289,1.869C25.479,25.957,25.238,26,25,26  L25,26z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="14,15,25,26,25,4"/>
-<polygon points="3,15,14,26,14,15,14,4"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_horizontal.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_horizontal.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_horizontal.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M27,10H11C5.486,10,1,14.486,1,20c0,1.104,0.896,2,2,2s2-0.896,2-2c0-3.309,2.691-6,6-6h16c1.104,0,2-0.896,2-2  S28.104,10,27,10z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M1,20h4c0-3.309,2.691-6,6-6h18v-4h-18c-5.514,0-10,4.49-10,10z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_vertical.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_vertical.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_vertical.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M20,25c-3.309,0-6-2.691-6-6V3c0-1.104-0.896-2-2-2s-2,0.896-2,2v16c0,5.514,4.486,10,10,10c1.104,0,2-0.896,2-2  S21.104,25,20,25z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M20,29v-4c-3.309,0-6-2.691-6-6v-18h-4v18c0,5.51,4.49,10,10,10z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<rect fill="none" height="30" width="30"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M10.572,19.428c-0.359-0.361-0.68-0.746-0.982-1.139l-1.542,1.542c-0.766-0.451-1.767-0.354-2.425,0.304l-2.828,2.828  l4.242,4.242l2.828-2.828c0.659-0.658,0.756-1.658,0.304-2.425l1.542-1.542C11.318,20.107,10.934,19.787,10.572,19.428z"/>
+<path d="M26.129,3.871c-4.1-4.102-10.748-4.102-14.85-0.002c-4.1,4.102-4.1,10.75,0.002,14.85c4.1,4.102,10.748,4.102,14.848,0  C30.23,14.619,30.23,7.971,26.129,3.871z M24.008,16.598c-2.928,2.93-7.678,2.93-10.605,0C10.473,13.67,10.473,8.92,13.4,5.99  c2.93-2.928,7.678-2.928,10.607,0.002S26.938,13.67,24.008,16.598z"/>
+<path d="M1.381,27.205l1.414,1.414c0.781,0.781,2.047,0.781,2.828,0l-4.242-4.242C0.6,25.158,0.6,26.424,1.381,27.205z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="1.5" transform="matrix(0.7071 0.7072 -0.7072 0.7071 19.6001 4.8865)" width="4.501" x="1.652" y="25.35"/>
-<path d="M25.64,4.355c-3.809-3.807-9.981-3.807-13.79,0-3.44,3.447-3.757,8.825-0.97,12.64l-1.681,1.68-0.53-0.531-4.773,4.773,3.182,3.183,4.773-4.772-0.53-0.531,1.681-1.681c3.814,2.791,9.193,2.475,12.64-0.972,3.81-3.8,3.81-9.978,0-13.78zm-2.12,11.66c-2.633,2.631-6.916,2.632-9.546,0-1.27-1.27-1.97-2.97-1.97-4.77,0-1.804,0.703-3.499,1.977-4.774,2.63-2.631,6.914-2.631,9.546,0,2.62,2.633,2.62,6.914-0.01,9.544z"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search_stop.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search_stop.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search_stop.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g>
+<path d="M10.572,19.428c-0.359-0.361-0.68-0.746-0.982-1.139l-1.542,1.542c-0.766-0.451-1.767-0.354-2.425,0.304l-2.828,2.828  l4.242,4.242l2.828-2.828c0.659-0.658,0.756-1.658,0.304-2.425l1.542-1.542C11.318,20.107,10.934,19.787,10.572,19.428z"/>
+<path d="M12.028,7.879c0.348-0.68,0.803-1.319,1.372-1.889c2.93-2.928,7.678-2.928,10.607,0.002s2.93,7.678,0,10.605  c-0.568,0.569-1.207,1.024-1.888,1.373l2.194,2.193c0.643-0.408,1.254-0.885,1.814-1.445c4.102-4.1,4.102-10.748,0-14.848  c-4.1-4.102-10.748-4.102-14.85-0.002c-0.561,0.561-1.037,1.173-1.445,1.816L12.028,7.879z"/>
+<path d="M8.27,12.416c0.246,2.303,1.247,4.539,3.012,6.303c1.764,1.765,4,2.766,6.302,3.012L8.27,12.416z"/>
+<path d="M1.381,27.205l1.414,1.414c0.781,0.781,2.047,0.781,2.828,0l-4.242-4.242C0.6,25.158,0.6,26.424,1.381,27.205z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30" x="0" y="0.006"/>
+<rect fill="none" height="30" width="30"/>
 </g>
-<g>
-<rect height="2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -13.8982 48.1905)" width="4.998" x="0.532" y="25.973"/>
-<path d="M11.802,8.788c0.351-1.107,0.959-2.15,1.836-3.026c2.924-2.925,7.682-2.924,10.605,0c2.923,2.924,2.925,7.682,0,10.604    c-0.876,0.877-1.919,1.484-3.026,1.836l2.303,2.303c1.026-0.498,1.992-1.164,2.846-2.017c4.102-4.101,4.102-10.749,0-14.849    c-4.101-4.102-10.748-4.102-14.85,0c-0.853,0.853-1.519,1.818-2.016,2.846L11.802,8.788z"/>
-<path d="M15.777,21.058l-6.829-6.83c0.349,1.1,0.874,2.156,1.593,3.115l-1.499,1.498l-0.707-0.707l-4.949,4.951l3.535,3.535    l4.95-4.951l-0.707-0.707l1.499-1.498C13.622,20.184,14.677,20.71,15.777,21.058z"/>
-<rect height="35.827" transform="matrix(-0.7062 0.708 -0.708 -0.7062 34.8635 16.0136)" width="1.868" x="13.175" y="-2.673"/>
-</g>
-</g>
+<path d="M27.693,26.372c0.389,0.389,0.41,1.005,0.048,1.368c-0.362,0.362-0.978,0.343-1.366-0.046L2.307,3.625  C1.918,3.236,1.896,2.621,2.26,2.258c0.363-0.362,0.979-0.34,1.367,0.049L27.693,26.372z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_next.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_next.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_next.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="13,5 23,15.066 13,25.133 "/>
-<polygon points="3,5 13,15.066 3,25.133 "/>
-<rect height="20" width="4" x="23" y="5"/>
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<path d="M15,25c0.617,0,1.215-0.287,1.6-0.8l6-8c0.533-0.712,0.533-1.688,0-2.4l-6-8C16.215,5.287,15.617,5,15,5  c-0.211,0-0.425,0.033-0.633,0.103C13.551,5.375,13,6.139,13,7v16c0,0.861,0.551,1.625,1.367,1.897C14.575,24.967,14.789,25,15,25  L15,25z"/>
+<path d="M23,23c0,1.104,0.896,2,2,2l0,0c1.104,0,2-0.896,2-2V7c0-1.104-0.896-2-2-2l0,0c-1.104,0-2,0.896-2,2V23z"/>
+<path d="M5,25c0.617,0,1.215-0.287,1.6-0.8l6-8c0.533-0.712,0.533-1.688,0-2.4l-6-8C6.215,5.287,5.617,5,5,5  C4.789,5,4.575,5.033,4.367,5.103C3.551,5.375,3,6.139,3,7v16c0,0.861,0.551,1.625,1.367,1.897C4.575,24.967,4.789,25,5,25L5,25z"/>
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_previous.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_previous.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_previous.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="17,25.133 7,15.066 17,5 "/>
-<polygon points="27,25.133 17,15.066 27,5 "/>
-<rect height="20" width="4" x="3" y="5.133"/>
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<path d="M15,25c-0.617,0-1.215-0.287-1.6-0.8l-6-8c-0.533-0.712-0.533-1.688,0-2.4l6-8C13.785,5.287,14.383,5,15,5  c0.211,0,0.425,0.033,0.633,0.103C16.449,5.375,17,6.139,17,7v16c0,0.861-0.551,1.625-1.367,1.897C15.425,24.967,15.211,25,15,25  L15,25z"/>
+<path d="M7,23c0,1.104-0.896,2-2,2l0,0c-1.104,0-2-0.896-2-2V7c0-1.104,0.896-2,2-2l0,0c1.104,0,2,0.896,2,2V23z"/>
+<path d="M25,25c-0.617,0-1.215-0.287-1.6-0.8l-6-8c-0.533-0.712-0.533-1.688,0-2.4l6-8C23.785,5.287,24.383,5,25,5  c0.211,0,0.425,0.033,0.633,0.103C26.449,5.375,27,6.139,27,7v16c0,0.861-0.551,1.625-1.367,1.897C25.425,24.967,25.211,25,25,25  L25,25z"/>
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="1.538,18 2,21 4,21 4,18 "/>
-<polygon points="0.77,13 1.23,16 4,16 4,13 "/>
-<polygon points="0,8 0.462,11 4,11 4,8 "/>
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<polygon points="1.538,20 2,23 5,23 5,20 "/>
+<polygon points="0.77,15 1.23,18 5,18 5,15 "/>
+<polygon points="0,10 0.462,13 5,13 5,10 "/>
+<polygon points="13.45,17.72 6,11.494 6,23.867 "/>
+<polygon points="30,23.809 30,11.43 22.546,17.58 "/>
+<path d="M20.52,19.252c-0.845,0.652-1.651,0.959-2.519,0.979l-0.024,0.001h-0.128c-0.913-0.021-1.72-0.327-2.513-0.937l-1.104-0.923  l-7.979,6.583C6.593,25.574,7.243,26,8,26h20c0.771,0,1.434-0.442,1.768-1.083l-8.006-6.69L20.52,19.252z"/>
+<path d="M28,8H8C7.228,8,6.566,8.442,6.232,9.083l10.322,8.626c0.424,0.326,0.837,0.512,1.294,0.522c0.02,0,0.086,0,0.104,0  c0.457-0.011,0.87-0.196,1.294-0.522l10.5-8.664C29.407,8.426,28.757,8,28,8z"/>
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M5,6v18h24V6H5z M24.527,9L17,16.527L9.473,9H24.527z M8,10.355l4.822,4.822L8,20V10.355z M8.414,21l5.115-5.115L17,19.355  l3.471-3.471L25.586,21H8.414z M26,20l-4.822-4.822L26,10.355V20z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send_mycard.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send_mycard.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send_mycard.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="1.539,18 2,21 4,21 4,18 "/>
-<polygon points="0.77,13 1.23,16 4,16 4,13 "/>
-<polygon points="0,8 0.461,11 4,11 4,8 "/>
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<path d="M28,8H8c-1.104,0-2,0.896-2,2v14c0,1.104,0.896,2,2,2h20c1.104,0,2-0.896,2-2V10C30,8.896,29.104,8,28,8z M8,22  c0.502-0.589,1.209-1.061,2.217-1.164c0.701-0.016,1.544-0.357,1.544-1.27v-0.23c0-0.101-0.046-0.196-0.126-0.258  c-1.032-0.773-1.727-2.36-1.727-3.953C9.908,12.849,11.294,11,13,11c1.705,0,3.092,1.849,3.092,4.125c0,1.593-0.695,3.18-1.73,3.953  c-0.077,0.062-0.125,0.157-0.125,0.258v0.23c0,1.005,1.012,1.27,1.545,1.27C16.791,20.939,17.498,21.411,18,22H8z M27,20h-8v-2h8V20  z M27,16h-8v-2h8V16z"/>
+<polygon points="1.538,20 2,23 5,23 5,20 "/>
+<polygon points="0.77,15 1.23,18 5,18 5,15 "/>
+<polygon points="0,10 0.462,13 5,13 5,10 "/>
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M5,6v18h24V6H5z M27,22H7V8h20V22z"/>
-<rect height="2" width="7" x="18" y="11"/>
-<rect height="2" width="7" x="18" y="15"/>
-<path d="M13.447,16.48c-0.004-0.076,0-0.443,0-0.52c0.553-0.355,0.939-0.771,1.23-1.313c0.537-1.007,0.25-3.373,0.25-3.373  c0-1.049-1.465-2.275-2.577-2.275h-0.706c-1.115,0-2.58,1.227-2.58,2.275c0,0-0.255,2.355,0.248,3.369  c0.276,0.554,0.676,0.963,1.24,1.316c0.002,0.071,0.006,0.447,0.002,0.52c-0.07,1.028-2.377,1.604-2.555,1.827V20h8v-1.69  C15.821,18.086,13.516,17.509,13.447,16.48z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_settings.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_settings.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_settings.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M8.282,11.011c-0.144-0.085-0.28-0.181-0.403-0.304l-3.54-3.539c-0.964-0.96-1.597-0.279-1.903,0.25  c-0.9,2.646-0.377,5.661,1.572,7.867L8.282,11.011z"/>
+<path d="M27.132,22.889l-9.769-9.769c1.232-2.911,0.667-6.403-1.707-8.777c-2.024-2.024-4.863-2.729-7.462-2.129  c-0.388,0.13-1.167,0.571,0.113,1.851H8.307l3.107,3.107c0.781,0.78,0.781,2.047,0,2.828l-0.707,0.707L5.104,16.31  c2.321,1.804,5.399,2.161,8.016,1.054l9.769,9.768c1.172,1.172,3.072,1.172,4.243,0C28.303,25.96,28.303,24.061,27.132,22.889z   M25.01,25.01c-0.39,0.391-1.023,0.391-1.414,0l-0.707-0.707c-0.391-0.391-0.391-1.023,0-1.414s1.023-0.391,1.414,0l0.707,0.707  C25.4,23.986,25.4,24.619,25.01,25.01z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M22.49,21.78c-0.146-0.146-0.423-0.106-0.619,0.089-0.195,0.195-0.234,0.472-0.088,0.618l1.592,1.591c0.146,0.146,0.423,0.107,0.618-0.088s0.235-0.473,0.089-0.619l-1.59-1.59z"/>
-<path d="M27.88,20.1l-9.029-9.028c0.489-2.928-0.385-6.041-2.639-8.295-3.704-3.704-9.73-3.704-13.44,0-3.703,3.704-3.703,9.73,0,13.44,2.255,2.254,5.369,3.128,8.297,2.639l9.027,9.028c1.949,1.949,5.122,1.949,7.072,0l0.707-0.707c1.95-1.96,1.95-5.13,0-7.08zm-23.91-14.01l4.114,4.113-3.505,3.505c-1.852-2.16-2.066-5.247-0.609-7.611zm21.79,18.96l-0.707,0.707c-0.78,0.781-2.048,0.781-2.829,0l-10.26-10.27c-1.9,0.773-4.089,0.629-5.867-0.467l5.529-5.528c0.781-0.78,0.781-2.047,0-2.828l-3.516-3.51c2.092-0.456,4.365,0.122,5.988,1.745,1.91,1.909,2.38,4.717,1.41,7.071l10.25,10.26c0.79,0.77,0.79,2.04,0.01,2.82z"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shake_warning.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shake_warning.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shake_warning.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0.006 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="30" width="30" x="0.006"/>
-<path d="M20.11,3.436c-0.041,0-0.084,0-0.125,0.002c-0.39-1.125-1.472-1.936-2.739-1.936c-0.104,0-0.207,0.006-0.309,0.016  C16.451,0.615,15.488,0,14.381,0c-1.106,0-2.07,0.615-2.557,1.518c-0.102-0.01-0.205-0.016-0.309-0.016  c-1.597,0-2.896,1.283-2.896,2.861v3.412C8.568,7.76,8.516,7.746,8.464,7.732c-0.263-0.066-0.531-0.1-0.797-0.1  c-0.692,0-1.313,0.225-1.771,0.629c-0.886,0.756-1.137,2.027-0.64,3.234L9.169,21h11.929l1.906-6.926V6.295  C23.005,4.717,21.707,3.436,20.11,3.436z M19.574,19h-9.065c-1.928-4.682-3.398-8.258-3.401-8.264  c-0.12-0.293-0.18-0.725,0.089-0.955c0.199-0.176,0.529-0.172,0.777-0.109c0.506,0.127,0.894,0.438,1.167,0.838  c0.259,0.377,0.711,1.797,0.96,2.664l0.518-0.1V4.363c0-0.477,0.402-0.861,0.896-0.861c0.496,0,0.896,0.385,0.896,0.861v6.861h1.074  V2.857c0-0.475,0.4-0.857,0.895-0.857c0.496,0,0.895,0.383,0.895,0.857v8.367h1.076V4.363c0-0.477,0.4-0.861,0.895-0.861  c0.496,0,0.894,0.385,0.894,0.861v6.861h1.075v-4.93c0-0.475,0.402-0.859,0.895-0.859c0.496,0,0.895,0.385,0.895,0.859v7.508h0.002  L19.574,19z"/>
-<path d="M12,28.01c-5.376-0.275-9.678-3.713-9.994-7.996H0c0.31,5.382,5.51,9.708,12,10V28.01z"/>
-<path d="M12,24.001c-3.037-0.18-5.489-1.845-5.889-3.987H4c0.389,3.234,3.788,5.798,8,6V24.001z"/>
-<path d="M18.012,28.01c5.376-0.275,9.678-3.713,9.994-7.996h2.006c-0.31,5.382-5.511,9.708-12,10V28.01z"/>
-<path d="M18.012,24.001c3.036-0.18,5.489-1.845,5.89-3.987h2.11c-0.39,3.234-3.787,5.798-8,6V24.001z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M3,20H1c0,4.971,4.029,9,9,9h2v-2h-2C6.141,27,3,23.859,3,20z"/>
+<path d="M27,20c0,3.859-3.141,7-7,7h-2v2h2c4.971,0,9-4.029,9-9H27z"/>
+<path d="M7,20H5c0,2.757,2.243,5,5,5h2v-2h-2C8.346,23,7,21.654,7,20z"/>
+<path d="M18,23v2h2c2.757,0,5-2.243,5-5h-2c0,1.654-1.346,3-3,3H18z"/>
+<path d="M11,21h9l2-7v-2v-2V5c0-0.553-0.447-1-1-1s-1,0.447-1,1v5h-1V3c0-0.553-0.447-1-1-1s-1,0.447-1,1v7h-1V2  c0-0.553-0.447-1-1-1s-1,0.447-1,1v8h-1V3c0-0.553-0.447-1-1-1s-1,0.447-1,1v7v2v2c0,0-2-5-3-5c-2,0-1,2-1,2L11,21z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,9 @@
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<circle cx="23" cy="6" r="4.5"/>
-<circle cx="23" cy="24" r="4.5"/>
-<circle cx="7" cy="15" r="4.5"/>
-<path d="M13.26,13.28l4.997-2.852c-0.685-0.73-1.203-1.617-1.493-2.604l-4.947,2.824c0.67,0.75,1.17,1.64,1.44,2.63z"/>
-<path d="M18.26,19.57l-4.996-2.852c-0.272,0.992-0.772,1.887-1.443,2.631l4.946,2.824c0.29-0.99,0.81-1.87,1.49-2.6z"/>
+<circle cx="22.5" cy="6" r="4.5"/>
+<circle cx="22.5" cy="24" r="4.5"/>
+<path d="M12.763,13.285l4.997-2.852c-0.685-0.73-1.203-1.617-1.493-2.604l-4.947,2.824C11.99,11.398,12.491,12.293,12.763,13.285z"/>
+<path d="M17.76,19.566l-4.996-2.852c-0.272,0.992-0.772,1.887-1.443,2.631l4.946,2.824C16.557,21.184,17.075,20.299,17.76,19.566z"/>
+<circle cx="6.5" cy="15" r="4.5"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M16.283,24.273c-0.041-0.088-0.061-0.183-0.093-0.273H3V6h24v9.914l2,2.4V6c0-1.104-0.896-2-2-2H3C1.896,4,1,4.896,1,6v18  c0,1.104,0.896,2,2,2h16C17.842,26,16.775,25.322,16.283,24.273z"/>
+<path d="M20.013,17.099C19.401,16.277,19,14.979,19,13.5c0-2.485,1.119-4.5,2.5-4.5s2.5,2.015,2.5,4.5  c0,0.172-0.018,0.336-0.028,0.503C23.981,14.003,23.99,14,24,14c0.75,0,1.453,0.291,2,0.786V7H4v16h12  c0-0.699,0.246-1.38,0.692-1.918L20.013,17.099z M5,17v-1v-2l4-3l4,3l2-2l3.057,2.445c0.1,0.977,0.355,1.84,0.724,2.555H5z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M15.4,21.8L16,21H6V9h18v3.388c-0.162,0.208-0.314,0.444-0.459,0.695c0.418,0.118,0.793,0.362,1.059,0.717l0.4,0.534V8H5v14  h10.29C15.328,21.934,15.354,21.862,15.4,21.8z"/>
-<path d="M10.206,17.969c0.433,0.444,1.979,0.806,3.502-1.055c0.581-0.711,0.789-1.645,0.864-2.228  c1.593,0.514,3.359,1.076,4.871,1.723l0.453-0.604c-0.803-0.269-1.684-0.55-2.594-0.843c0.371-0.045,0.82-0.158,1.229-0.438  c1.024-0.707,1.275-1.832,0.908-2.443c-0.262-0.434-1.124-0.805-2.076,0.389c-0.477,0.598-0.707,1.759-0.788,2.258  c-1.677-0.545-3.397-1.129-4.868-1.747c0.381-0.04,0.857-0.152,1.284-0.446c1.026-0.708,1.2-1.485,0.931-1.832  c-0.303-0.389-1.133-0.849-2.248,0.332c-0.461,0.487-0.604,1.223-0.65,1.636c-3.228-1.591-2.025-3.197-2.025-3.197  c-0.087-0.39-0.303-0.776-0.648-0.11c-0.498,0.957-0.178,1.822,0.541,2.564c-0.224-0.013-0.469,0.015-0.729,0.115  c-1.014,0.393-1.289,1.086-1.111,1.427c0.176,0.342,0.979,0.888,2.068,0.206c0.382-0.239,0.615-0.652,0.744-0.954  c0.45,0.299,0.953,0.568,1.47,0.804c0.425,0.194,0.947,0.391,1.525,0.593c-0.444,0.114-0.925,0.327-1.397,0.744  C9.947,16.192,9.773,17.524,10.206,17.969z"/>
-<path d="M17.774,17.623c-1.341,0.987-1.655,2.234-1.538,3.063l2.715-3.62C18.553,17.17,18.152,17.344,17.774,17.623z"/>
-<path d="M15.211,23.895c-0.142-0.283-0.195-0.59-0.194-0.895H4V7h22v8.667l2,2.667V5H2v20h15C16.242,25,15.55,24.572,15.211,23.895z  "/>
-<polygon points="29,23 23,15 17,23 20,23 20,28 26,28 26,23 "/>
+<path d="M18,23c0-0.229,0.079-0.457,0.231-0.641l5-6C23.422,16.132,23.703,16,24,16s0.578,0.132,0.768,0.359l5,6  C29.921,22.543,30,22.771,30,23c0,0.144-0.031,0.289-0.095,0.424C29.741,23.775,29.388,24,29,24h-2v5c0,0.553-0.448,1-1,1h-4  c-0.553,0-1-0.447-1-1v-5h-2c-0.389,0-0.741-0.225-0.906-0.576C18.031,23.289,18,23.144,18,23L18,23z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M10.149,6H27v9.914l2,2.4V6c0-1.104-0.896-2-2-2H8.149L10.149,6z"/>
+<path d="M16.283,24.273c-0.041-0.088-0.061-0.183-0.093-0.273H3V7.146L1.138,5.285C1.052,5.508,1,5.747,1,6v18c0,1.104,0.896,2,2,2  h16C17.842,26,16.775,25.322,16.283,24.273z"/>
+<path d="M19.166,15.017C19.068,14.54,19,14.039,19,13.5c0-2.485,1.119-4.5,2.5-4.5s2.5,2.015,2.5,4.5  c0,0.172-0.018,0.336-0.028,0.503C23.981,14.003,23.99,14,24,14c0.75,0,1.453,0.291,2,0.786V7H11.149L19.166,15.017z"/>
+<path d="M12.853,17H5v-1v-2l2.773-2.08L4,8.146V23h12c0-0.699,0.246-1.38,0.692-1.918l0.11-0.132L12.853,17z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M17.774,17.623c-1.341,0.987-1.655,2.234-1.538,3.063l2.715-3.62C18.553,17.17,18.152,17.344,17.774,17.623z"/>
-<path d="M13.148,9H24v3.388c-0.162,0.208-0.314,0.444-0.459,0.695c0.418,0.118,0.793,0.362,1.059,0.717l0.4,0.534V8H12.148L13.148,9  z"/>
-<path d="M6,10.147l-1-1V22h10.29c0.038-0.066,0.063-0.138,0.11-0.2L16,21H6V10.147z"/>
-<polygon points="11.148,7 26,7 26,15.667 28,18.334 28,5 9.148,5 "/>
-<path d="M15.211,23.895c-0.142-0.283-0.195-0.59-0.194-0.895H4V8.147l-2-2V25h15C16.242,25,15.55,24.572,15.211,23.895z"/>
-<path d="M18.609,14.46c0.953-0.709,1.188-1.786,0.83-2.38c-0.262-0.434-1.124-0.805-2.076,0.389  c-0.105,0.132-0.196,0.293-0.278,0.467L18.609,14.46z"/>
-<path d="M11.084,15.23c-1.152,1.201-1.271,2.335-0.878,2.738c0.39,0.399,1.681,0.717,3.043-0.573L11.084,15.23z"/>
-<path d="M7.979,12.126c-0.855,0.401-1.094,1.023-0.928,1.342c0.176,0.342,0.979,0.888,2.068,0.206  c0.083-0.053,0.156-0.115,0.227-0.182L7.979,12.126z"/>
-<polygon points="17.795,21.941 17,23 18.854,23 "/>
-<polygon points="27.15,23 29,23 23,15 21.35,17.2 "/>
-<polygon points="20,24.146 20,28 23.854,28 "/>
-<rect height="35.827" transform="matrix(0.7063 -0.7079 0.7079 0.7063 -6.0767 14.6963)" width="1.868" x="13.74" y="-3.242"/>
+<path d="M28.15,24H29c0.388,0,0.741-0.225,0.905-0.576C29.969,23.289,30,23.144,30,23c0-0.229-0.079-0.457-0.232-0.641l-5-6  C24.578,16.132,24.297,16,24,16s-0.578,0.132-0.769,0.359l-1.237,1.484L28.15,24z"/>
+<path d="M18.225,22.372C18.078,22.554,18,22.775,18,23c0,0.144,0.031,0.289,0.094,0.424C18.259,23.775,18.611,24,19,24h0.852  L18.225,22.372z"/>
+<path d="M24.961,29.109L21,25.147V29c0,0.553,0.447,1,1,1h4c0.146,0,0.283-0.035,0.408-0.092  C25.867,29.779,25.36,29.508,24.961,29.109z"/>
+<path d="M27.693,26.373c0.389,0.389,0.41,1.004,0.049,1.367c-0.363,0.363-0.979,0.344-1.367-0.045L2.307,3.625  C1.918,3.236,1.897,2.621,2.26,2.259s0.979-0.341,1.367,0.048L27.693,26.373z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<polyline points="1,29,9,7,17,29,1,29"/>
-<polygon points="22.36,7.977,23,6.391,23.63,7.977,25.68,7.977,23,1,20.31,7.977"/>
-<polygon points="20.36,12.98,21.56,9.977,19.54,9.977,18.39,12.98"/>
-<polygon points="27.61,12.98,26.45,9.977,24.43,9.977,25.63,12.98"/>
-<path d="M27,16.4c0,0.002-0.002,0.006-0.002,0.008h-0.002c-0.002,0.758-0.227,1.461-0.596,2.066l1.447,1.445c0.682-0.934,1.102-2.072,1.146-3.303v-0.02l-0.621-1.615h-1.95l0.566,1.416z"/>
-<path d="M19.59,18.47c-0.369-0.605-0.593-1.307-0.595-2.064h-0.002l0.002-0.002c0-0.002-0.002-0.006-0.002-0.008l0.566-1.416h-1.95l-0.62,1.61c0.04,1.24,0.461,2.385,1.146,3.324l1.44-1.44z"/>
-<path d="M23,20.4c-0.719,0-1.384-0.205-1.967-0.537l-1.455,1.457c0.972,0.68,2.15,1.082,3.422,1.082s2.449-0.402,3.42-1.082l-1.455-1.455c-0.58,0.34-1.24,0.54-1.96,0.54z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-1 -1 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<polyline points="0,28 8,6 16,28 0,28 "/>
+<polygon points="21.365,6.977 21.998,5.391 22.631,6.977 24.684,6.977 21.998,0 19.314,6.977 "/>
+<polygon points="19.365,11.979 20.564,8.977 18.545,8.977 17.391,11.979 "/>
+<polygon points="26.609,11.979 25.453,8.977 23.432,8.977 24.631,11.979 "/>
+<path d="M26,15.396l-0.002,0.008L26,15.406h-0.002c-0.002,0.758-0.227,1.461-0.596,2.066l1.447,1.445  c0.682-0.934,1.102-2.072,1.146-3.303L28,15.596l-0.621-1.615H25.43l0.566,1.416H26z"/>
+<path d="M18.594,17.471c-0.369-0.605-0.594-1.307-0.596-2.064h-0.002l0.002-0.002l-0.002-0.008H18l0.566-1.416h-1.945L16,15.592  c0.041,1.24,0.461,2.385,1.146,3.324L18.594,17.471z"/>
+<path d="M21.998,19.398c-0.719,0-1.383-0.205-1.967-0.537l-1.455,1.457c0.973,0.68,2.15,1.082,3.422,1.082s2.449-0.402,3.42-1.082  l-1.455-1.455C23.381,19.195,22.717,19.398,21.998,19.398z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shift.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shift.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shift.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M13.494,3.684l-6.999,8C6.17,12.055,6,12.525,6,13c0,0.28,0.059,0.563,0.18,0.827C6.504,14.541,7.217,15,8.002,15L11,14.998  V24c0,1.104,0.896,2,2,2h4c1.104,0,2-0.896,2-2v-9.007l3.002-0.002c0.784-0.001,1.496-0.46,1.82-1.175  C23.941,13.553,24,13.271,24,12.992c0-0.477-0.17-0.947-0.496-1.318l-7-7.992C16.125,3.248,15.576,3,15,3  C14.423,3,13.875,3.249,13.494,3.684z"/>
+<g>
 <rect fill="none" height="30" width="30"/>
-<path d="M15,2l-13,17h7v9h12v-9h7l-13-17zm3,14v9h-6v-9h-3.93l6.93-9.062,6.93,9.062h-3.93z"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_show_view.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_show_view.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_show_view.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M25,20.748c1.023,0.381,2.02,0.894,2.969,1.558C27.984,22.205,28,22.104,28,22V2c0-1.104-0.896-2-2-2H8C6.896,0,6,0.896,6,2  v1h19V20.748z"/>
+<path d="M10.428,28.235c-0.57-0.725-0.57-1.746,0-2.471c0.839-1.068,1.753-1.981,2.714-2.765H8v-2h8.381c1.487-0.647,3.04-1,4.619-1  c0.673,0,1.339,0.083,2,0.203V7c0-1.104-0.896-2-2-2H3C1.896,5,1,5.896,1,7v20c0,1.104,0.896,2,2,2h8.086  C10.866,28.748,10.64,28.506,10.428,28.235z M8,11h11v2H8V11z M8,16h11v2H8V16z M7,23H5v-2h2V23z M7,18H5v-2h2V18z M7,13H5v-2h2V13z  "/>
+<path d="M30,27c-2.454-3.123-5.586-5-9-5s-6.546,1.877-9,5h2.654  c0.695-0.709,1.521-1.386,2.463-1.922C17.047,25.376,17,25.682,17,26c0,2.21,1.792,4,4,4s4-1.79,4-4  c0-0.318-0.047-0.624-0.117-0.922c0.941,0.536,1.768,1.213,2.463,1.922H30z M21,28c-1.104,0-2-0.447-2-1s0.896-1,2-1s2,0.447,2,1  S22.104,28,21,28z" fill-rule="evenodd"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="2" width="2" x="8" y="16"/>
-<rect height="2" width="7.941" x="11.059" y="16"/>
-<rect height="2" width="2" x="7.971" y="21"/>
-<rect height="2" width="2" x="8" y="11"/>
-<rect height="2" width="7.941" x="11.059" y="11"/>
-<path d="M16.382,21h-5.353v2h2.112C14.169,22.162,15.254,21.491,16.382,21z"/>
-<path d="M10.428,28.235C10.143,27.873,10,27.437,10,27H6V8h15v12c1.014,0,2.018,0.146,3,0.416V5H3v25h9.029  C11.476,29.457,10.935,28.881,10.428,28.235z"/>
-<path d="M26,21.18c1.042,0.496,2.048,1.136,3,1.931V0H8v3h18V21.18z"/>
-<path d="M30,27c-2.454-3.123-5.586-5-9-5s-6.546,1.877-9,5h2.654  c0.695-0.709,1.522-1.386,2.463-1.921C17.047,25.376,17,25.682,17,26c0,2.21,1.792,4,4,4s4-1.79,4-4  c0-0.318-0.047-0.624-0.117-0.921c0.94,0.535,1.768,1.212,2.463,1.921H30z M21,28c-1.104,0-2-0.447-2-1s0.896-1,2-1s2,0.447,2,1  S22.104,28,21,28z" fill-rule="evenodd"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="20.27,13.92,20.27,22.37,8.237,22.37,8.237,19.06,0.5,24.03,8.237,29,8.237,25.69,23.71,25.69,23.71,13.92"/>
-<polygon points="9.728,16.08,9.728,7.626,21.76,7.626,21.76,10.94,29.5,5.971,21.76,1,21.76,4.313,6.289,4.313,6.289,16.08"/>
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<path d="M28.504,4.637l-6-3.5C22.348,1.045,22.174,1,22,1c-0.172,0-0.344,0.045-0.498,0.133C21.191,1.311,21,1.643,21,2v2v0.027  h-6.521C9.252,4.027,5,8.279,5,13.506c0,0.188,0.005,0.902,0.016,1.088C5.064,15.389,5.723,16,6.509,16c0.03,0,0.061,0,0.091-0.002  c0.825-0.049,1.454-0.758,1.405-1.584c-0.008-0.125-0.011-0.781-0.011-0.908c0-3.576,2.909-6.484,6.486-6.484H21V9  c0,0.357,0.191,0.689,0.502,0.867C21.656,9.955,21.828,10,22,10c0.174,0,0.348-0.045,0.504-0.137l6-3.5  C28.811,6.186,29,5.855,29,5.5S28.811,4.816,28.504,4.637z"/>
+<path d="M1.496,25.363l6,3.5C7.652,28.955,7.826,29,8,29c0.172,0,0.344-0.045,0.498-0.133C8.809,28.689,9,28.357,9,28v-2v-0.027  h6.521c5.228,0,9.479-4.252,9.479-9.479c0-0.188-0.006-0.902-0.016-1.088C24.936,14.613,24.277,14,23.491,14  c-0.03,0-0.061,0-0.091,0.002c-0.825,0.049-1.453,0.76-1.405,1.584c0.008,0.125,0.011,0.781,0.011,0.908  c0,3.576-2.908,6.486-6.485,6.486H9V21c0-0.357-0.191-0.689-0.502-0.867C8.344,20.045,8.172,20,8,20  c-0.174,0-0.348,0.045-0.504,0.137l-6,3.5C1.189,23.816,1,24.145,1,24.5S1.189,25.186,1.496,25.363z"/>
 <rect fill="none" height="30" width="30"/>
-</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="11.78,7.626,21.26,7.626,21.26,10.94,29,5.971,21.26,1,21.26,4.313,8.463,4.313"/>
-<polygon points="5.789,9.937,5.789,16.08,9.228,16.08,9.228,13.38"/>
-<polygon points="23.21,19.06,23.21,13.92,19.77,13.92,19.77,15.62"/>
-<polygon points="18.23,22.37,7.737,22.37,7.737,19.06,0,24.03,7.737,29,7.737,25.69,21.54,25.69"/>
-<rect height="39.4" transform="matrix(0.7066 -0.7076 0.7076 0.7066 -6.2267 15.051)" width="1.867" x="14.1" y="-4.667"/>
+<rect fill="none" height="30" width="30"/>
+<rect fill="none" height="30" width="30"/>
+<path d="M21.885,17.735l2.39,2.39C24.74,19.006,25,17.78,25,16.494c0-0.188-0.006-0.902-0.016-1.088  C24.936,14.613,24.277,14,23.491,14c-0.03,0-0.061,0-0.091,0.002c-0.825,0.049-1.453,0.76-1.405,1.584  c0.008,0.125,0.011,0.781,0.011,0.908C22.006,16.919,21.963,17.333,21.885,17.735z"/>
+<path d="M18.231,22.379c-0.826,0.382-1.742,0.602-2.711,0.602H9V21c0-0.357-0.191-0.689-0.502-0.867C8.344,20.045,8.172,20,8,20  c-0.174,0-0.348,0.045-0.504,0.137l-6,3.5C1.189,23.816,1,24.145,1,24.5s0.189,0.686,0.496,0.863l6,3.5C7.652,28.955,7.826,29,8,29  c0.172,0,0.344-0.045,0.498-0.133C8.809,28.689,9,28.357,9,28v-2v-0.027h6.521c1.801,0,3.479-0.514,4.915-1.39L18.231,22.379z"/>
+<path d="M11.771,7.622c0.826-0.382,1.741-0.601,2.709-0.601H21V9c0,0.357,0.191,0.689,0.502,0.867C21.656,9.955,21.828,10,22,10  c0.174,0,0.348-0.045,0.504-0.137l6-3.5C28.811,6.186,29,5.855,29,5.5s-0.189-0.684-0.496-0.863l-6-3.5C22.348,1.045,22.174,1,22,1  c-0.172,0-0.344,0.045-0.498,0.133C21.191,1.311,21,1.643,21,2v2v0.027h-6.521c-1.801,0-3.479,0.514-4.915,1.389L11.771,7.622z"/>
+<path d="M8.116,12.263l-2.39-2.39C5.26,10.993,5,12.219,5,13.506c0,0.188,0.005,0.902,0.016,1.088C5.064,15.389,5.723,16,6.509,16  c0.03,0,0.061,0,0.091-0.002c0.825-0.049,1.454-0.758,1.405-1.584c-0.008-0.125-0.011-0.781-0.011-0.908  C7.994,13.08,8.038,12.666,8.116,12.263z"/>
+<path d="M27.693,26.372c0.389,0.389,0.41,1.005,0.048,1.368c-0.362,0.362-0.978,0.343-1.366-0.046L2.307,3.625  C1.918,3.236,1.896,2.621,2.26,2.258c0.363-0.362,0.979-0.34,1.367,0.049L27.693,26.372z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_smiley.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_smiley.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_smiley.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<path d="M15,1C7.28,1,1,7.28,1,15s6.28,14,14,14s14-6.28,14-14S22.72,1,15,1z M15,26C8.935,26,4,21.065,4,15S8.935,4,15,4  s11,4.935,11,11S21.065,26,15,26z"/>
-<ellipse cx="9.5" cy="10.5" rx="1.5" ry="2.5"/>
-<ellipse cx="20.5" cy="10.5" rx="1.5" ry="2.5"/>
-<path d="M6,15c0,4.963,4.038,9,9,9c4.963,0,9-4.037,9-9H6z M20.742,19H9.258c-0.422-0.604-0.751-1.277-0.967-2h13.418  C21.493,17.723,21.164,18.396,20.742,19z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-2 -2 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M13,0C5.82,0,0,5.82,0,13s5.82,13,13,13s13-5.82,13-13S20.18,0,13,0z M13,23C7.486,23,3,18.514,3,13S7.486,3,13,3  s10,4.486,10,10S18.514,23,13,23z"/>
+<ellipse cx="7.5" cy="9" rx="1.5" ry="2"/>
+<ellipse cx="18.5" cy="9" rx="1.5" ry="2"/>
+<path d="M5,13.063c0,4.411,3.589,8,8,8s8-3.589,8-8H5z M17.501,17H8.499c-0.496-0.566-0.899-1.215-1.156-1.938h11.314  C18.4,15.785,17.997,16.434,17.501,17z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_songs_all.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_songs_all.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_songs_all.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<path d="M23.217,4.023l-9-2C14.145,2.008,14.072,2,14,2c-0.226,0-0.446,0.076-0.626,0.22C13.138,2.41,13,2.696,13,3v1v4v11.357  C12.31,19.129,11.549,19,10.75,19C7.574,19,5,21.016,5,23.5S7.574,28,10.75,28S17,25.984,17,23.5c0-0.134,0-9.82,0-13.809  l5.783,1.285C22.855,10.992,22.928,11,23,11c0,0,0.446-0.076,0.626-0.22C23.862,10.59,24,10.304,24,10V5  C24,4.531,23.675,4.126,23.217,4.023z"/>
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M25,5L15,2v17.357C14.31,19.129,13.549,19,12.75,19C9.574,19,7,21.016,7,23.5S9.574,28,12.75,28S19,25.984,19,23.5  c0-0.168,0-13.449,0-13.449L25,12V5z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sort.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sort.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sort.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M27.998,4c0,1.104-0.896,2-2,2H4C2.896,6,2,5.104,2,4l0,0c0-1.104,0.896-2,2-2h21.998C27.103,2,27.998,2.896,27.998,4  L27.998,4z"/>
+<path d="M23,11c0,1.104-0.896,2-2,2H4.002c-1.104,0-2-0.896-2-2l0,0c0-1.104,0.896-2,2-2H21C22.104,9,23,9.896,23,11L23,11z"/>
+<path d="M18,18c0,1.104-0.896,2-2,2H4c-1.104,0-2-0.896-2-2l0,0c0-1.104,0.896-2,2-2h12C17.104,16,18,16.896,18,18L18,18z"/>
+<path d="M13,25c0,1.104-0.896,2-2,2H4c-1.104,0-2-0.896-2-2l0,0c0-1.104,0.896-2,2-2h7C12.104,23,13,23.896,13,25L13,25z"/>
+<path d="M29,23c0,0.229-0.079,0.457-0.231,0.641l-5,6C23.578,29.868,23.297,30,23,30s-0.578-0.132-0.768-0.359l-5-6  C17.079,23.457,17,23.229,17,23c0-0.144,0.031-0.289,0.095-0.424C17.259,22.225,17.612,22,18,22h2v-5c0-0.553,0.448-1,1-1h4  c0.553,0,1,0.447,1,1v5h2c0.389,0,0.741,0.225,0.906,0.576C28.969,22.711,29,22.856,29,23L29,23z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="4" width="25.998" x="2" y="2"/>
-<rect height="4" width="20.998" x="2.002" y="9"/>
-<rect height="4" width="15.998" x="2.002" y="16"/>
-<rect height="4" width="10.998" x="2.002" y="23"/>
-<polygon points="26,22 26,17 20,17 20,22 17,22 23,30 29,22 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M8,9H3c-1.104,0-2,0.896-2,2v8c0,1.104,0.896,2,2,2h5V9z"/>
+<path d="M20,27c-0.167,0-0.334-0.042-0.486-0.126l-9-5C10.197,21.697,10,21.363,10,21V9c0-0.363,0.197-0.697,0.514-0.874l9-5  C19.666,3.042,19.833,3,20,3c0.176,0,0.351,0.046,0.508,0.139C20.813,3.318,21,3.646,21,4v22c0,0.354-0.188,0.682-0.492,0.861  C20.351,26.954,20.176,27,20,27L20,27z"/>
+<path d="M23.396,22c-0.177,0-0.356-0.047-0.519-0.146c-0.472-0.287-0.622-0.901-0.335-1.374C23.455,18.979,24,16.93,24,15  s-0.545-3.979-1.458-5.48c-0.287-0.473-0.137-1.087,0.335-1.374c0.473-0.286,1.088-0.136,1.374,0.335C25.346,10.282,26,12.719,26,15  s-0.654,4.718-1.749,6.52C24.063,21.829,23.733,22,23.396,22L23.396,22z"/>
+<path d="M26.585,24c-0.187,0-0.375-0.052-0.543-0.161c-0.464-0.3-0.596-0.919-0.295-1.383C27.242,20.15,28,17.643,28,15  s-0.758-5.15-2.253-7.456c-0.301-0.464-0.169-1.083,0.295-1.383c0.462-0.302,1.082-0.169,1.383,0.295C29.134,9.091,30,11.965,30,15  s-0.866,5.909-2.575,8.544C27.233,23.84,26.912,24,26.585,24L26.585,24z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="12" width="7" x="1" y="9"/>
-<polygon points="10,8 10,22 21,27 21,3 "/>
-<path d="M23.889,21.954l-1.676-1.094C23.382,19.069,24,17.043,24,15s-0.618-4.069-1.787-5.86l1.676-1.094  C25.27,10.164,26,12.568,26,15S25.27,19.836,23.889,21.954L23.889,21.954z"/>
-<path d="M26.702,24.602l-1.598-1.203C26.999,20.882,28,17.979,28,15s-1.001-5.882-2.896-8.398l1.598-1.203  C28.859,8.265,30,11.584,30,15S28.859,21.735,26.702,24.602L26.702,24.602z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M4.854,9H3c-1.104,0-2,0.896-2,2v8c0,1.104,0.896,2,2,2h5v-8.854L4.854,9z"/>
+<path d="M21,16.85V4c0-0.354-0.188-0.682-0.492-0.861C20.351,3.046,20.176,3,20,3c-0.167,0-0.334,0.042-0.486,0.126l-7.867,4.371  L21,16.85z"/>
+<path d="M10,14.146V21c0,0.363,0.197,0.697,0.514,0.874l9,5C19.666,26.958,19.833,27,20,27c0.176,0,0.351-0.046,0.508-0.139  C20.813,26.682,21,26.354,21,26v-0.853L10,14.146z"/>
+<path d="M27.693,26.372c0.389,0.389,0.41,1.005,0.048,1.368c-0.362,0.362-0.978,0.343-1.366-0.046L2.307,3.625  C1.918,3.236,1.896,2.621,2.26,2.258c0.363-0.362,0.979-0.34,1.367,0.049L27.693,26.372z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<polygon points="4.853,9 1,9 1,21 8,21 8,12.148 "/>
-<polygon points="21,16.852 21,3 11.478,7.328 "/>
-<polygon points="10,14.148 10,22 21,27 21,25.146 "/>
-<rect height="35.827" transform="matrix(0.7063 -0.7079 0.7079 0.7063 -6.0767 14.6963)" width="1.868" x="13.74" y="-3.242"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_itut.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_itut.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_itut.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<polygon points="8.05,11.37,5.545,12.97,5.708,10.01,4.124,10.01,4.279,12.97,1.773,11.37,1,12.73,3.625,14.08,1,15.44,1.773,16.8,4.279,15.18,4.124,18.16,5.708,18.16,5.545,15.18,8.05,16.8,8.824,15.44,6.199,14.08,8.824,12.73"/>
-<path d="M21.88,14.41l-1.713-0.388c-0.247,1.096-0.565,1.96-0.955,2.591l-2.574-3.332c0.97-0.654,1.642-1.246,2.015-1.777,0.372-0.53,0.56-1.115,0.56-1.751,0-0.78-0.283-1.397-0.849-1.851-0.565-0.454-1.35-0.681-2.354-0.681-1.079,0-1.92,0.247-2.522,0.741-0.603,0.493-0.904,1.202-0.904,2.125,0,0.838,0.459,1.856,1.377,3.056-0.924,0.529-1.586,1.09-1.988,1.684-0.401,0.595-0.603,1.296-0.603,2.104,0,1.091,0.351,1.937,1.051,2.535,0.699,0.6,1.707,0.899,3.021,0.899,1.28,0,2.368-0.358,3.264-1.075l0.723,0.938h2.574l-1.765-2.272c0.75-0.88,1.3-2.06,1.64-3.54zm-6.82-5.474c0.216-0.218,0.539-0.327,0.969-0.327,0.362,0,0.651,0.106,0.869,0.319,0.218,0.212,0.327,0.482,0.327,0.809,0,0.879-0.505,1.655-1.515,2.333-0.373-0.488-0.628-0.882-0.766-1.184-0.138-0.301-0.207-0.624-0.207-0.969,0-0.441,0.1-0.768,0.32-0.985zm0.77,9.954c-0.567,0-1.063-0.188-1.484-0.563-0.422-0.376-0.633-0.917-0.633-1.623,0-0.94,0.396-1.728,1.188-2.358l2.927,3.822c-0.59,0.48-1.26,0.72-2.01,0.72z"/>
-<polygon points="28.63,16.39,28.88,7.395,26.39,7.395,26.65,16.39"/>
-<path d="M28.6,18.03c-0.264-0.264-0.586-0.395-0.965-0.395s-0.699,0.131-0.964,0.395c-0.264,0.265-0.395,0.585-0.395,0.964s0.132,0.702,0.399,0.97c0.267,0.266,0.587,0.399,0.959,0.399,0.379,0,0.701-0.134,0.965-0.399,0.27-0.27,0.4-0.59,0.4-0.97s-0.13-0.7-0.4-0.97z"/>
+</g>
+<polygon points="8.05,11.372 5.545,12.974 5.708,10.013 4.124,10.013 4.279,12.974 1.773,11.372 1,12.732 3.625,14.084 1,15.444   1.773,16.804 4.279,15.178 4.124,18.155 5.708,18.155 5.545,15.178 8.05,16.804 8.824,15.444 6.199,14.084 8.824,12.732 "/>
+<path d="M21.881,14.411l-1.713-0.388c-0.247,1.096-0.565,1.96-0.955,2.591l-2.574-3.332c0.97-0.654,1.642-1.246,2.015-1.777  c0.372-0.53,0.56-1.115,0.56-1.751c0-0.78-0.283-1.397-0.849-1.851c-0.565-0.454-1.35-0.681-2.354-0.681  c-1.079,0-1.92,0.247-2.522,0.741c-0.603,0.493-0.904,1.202-0.904,2.125c0,0.838,0.459,1.856,1.377,3.056  c-0.924,0.529-1.586,1.09-1.988,1.684c-0.401,0.595-0.603,1.296-0.603,2.104c0,1.091,0.351,1.937,1.051,2.535  c0.699,0.6,1.707,0.899,3.021,0.899c1.28,0,2.368-0.358,3.264-1.075l0.723,0.938h2.574l-1.765-2.272  C20.994,17.073,21.542,15.892,21.881,14.411z M15.059,8.936c0.216-0.218,0.539-0.327,0.969-0.327c0.362,0,0.651,0.106,0.869,0.319  c0.218,0.212,0.327,0.482,0.327,0.809c0,0.879-0.505,1.655-1.515,2.333c-0.373-0.488-0.628-0.882-0.766-1.184  c-0.138-0.301-0.207-0.624-0.207-0.969C14.736,9.48,14.844,9.153,15.059,8.936z M15.829,18.887c-0.567,0-1.063-0.188-1.484-0.563  c-0.422-0.376-0.633-0.917-0.633-1.623c0-0.94,0.396-1.728,1.188-2.358l2.927,3.822C17.247,18.646,16.581,18.887,15.829,18.887z"/>
+<polygon points="28.629,16.391 28.879,7.395 26.392,7.395 26.649,16.391 "/>
+<path d="M28.604,18.034c-0.264-0.264-0.586-0.395-0.965-0.395s-0.699,0.131-0.964,0.395c-0.264,0.265-0.395,0.585-0.395,0.964  s0.132,0.702,0.399,0.97c0.267,0.266,0.587,0.399,0.959,0.399c0.379,0,0.701-0.134,0.965-0.399C28.867,19.7,29,19.377,29,18.998  S28.867,18.299,28.604,18.034z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_qwerty.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_qwerty.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_qwerty.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<polygon points="8.011,17.73,7.02,17.73,4.005,18.68,4.005,19.77,6.151,19.28,6.151,26.91,4.005,26.91,4.005,28,10.04,28,10.04,26.91,8.011,26.91"/>
-<path d="M13.65,25.69c0.193-0.34,0.432-0.651,0.714-0.934s0.675-0.636,1.176-1.06c0.897-0.752,1.468-1.368,1.709-1.849s0.362-0.97,0.362-1.467c0-0.884-0.269-1.553-0.807-2.006-0.538-0.454-1.324-0.681-2.358-0.681-0.839,0-1.7,0.139-2.584,0.417v1.217h0.014c0.843-0.306,1.561-0.458,2.153-0.458,0.561,0,0.98,0.134,1.262,0.399,0.279,0.268,0.42,0.665,0.42,1.193,0,0.301-0.087,0.604-0.26,0.909s-0.59,0.736-1.251,1.292c-0.552,0.465-1.007,0.893-1.367,1.281-0.36,0.391-0.663,0.86-0.909,1.412s-0.369,1.183-0.369,1.894v0.76h6.098v-1.189h-4.32c0.03-0.41,0.14-0.78,0.33-1.12z"/>
-<path d="M23.37,22.59c0.588-0.173,1.039-0.468,1.354-0.886,0.314-0.416,0.472-0.914,0.472-1.493,0-0.839-0.262-1.468-0.786-1.887s-1.308-0.629-2.352-0.629c-0.692,0-1.468,0.107-2.324,0.321v1.203h0.014c0.843-0.232,1.497-0.349,1.962-0.349,0.528,0,0.927,0.125,1.192,0.376,0.268,0.251,0.4,0.624,0.4,1.121,0,0.565-0.166,0.984-0.499,1.258s-1.169,0.41-2.509,0.41v1.142c1.354,0,2.217,0.146,2.591,0.438s0.561,0.772,0.561,1.442c0,0.624-0.156,1.093-0.468,1.404-0.313,0.313-0.778,0.469-1.398,0.469-0.515,0-1.219-0.111-2.112-0.335h-0.014v1.189c0.766,0.214,1.513,0.321,2.242,0.321,1.217,0,2.13-0.261,2.737-0.783,0.609-0.521,0.913-1.304,0.913-2.348,0-0.634-0.17-1.161-0.509-1.582-0.32-0.4-0.81-0.67-1.45-0.79z"/>
-<polygon points="4.013,13.54,5.54,13.54,5.383,10.67,7.798,12.24,8.545,10.93,6.014,9.616,8.545,8.313,7.798,7.002,5.383,8.546,5.54,5.69,4.013,5.69,4.162,8.546,1.746,7.002,1,8.313,3.531,9.616,1,10.93,1.746,12.24,4.162,10.67"/>
-<path d="M19.55,13.35c0.73-0.853,1.259-1.992,1.585-3.42l-1.651-0.373c-0.238,1.057-0.545,1.89-0.921,2.498l-2.49-3.216c0.936-0.631,1.583-1.202,1.942-1.714s0.54-1.075,0.54-1.688c0-0.753-0.273-1.348-0.818-1.785s-1.3-0.657-2.26-0.657c-1.041,0-1.852,0.238-2.433,0.715-0.581,0.476-0.872,1.159-0.872,2.05,0,0.808,0.443,1.79,1.328,2.946-0.891,0.51-1.529,1.051-1.917,1.623-0.4,0.58-0.59,1.25-0.59,2.03,0,1.052,0.338,1.867,1.013,2.445s1.646,0.867,2.913,0.867c1.234,0,2.283-0.346,3.146-1.037l0.697,0.904h2.482l-1.7-2.18zm-4.99-8.698c0.208-0.21,0.52-0.315,0.934-0.315,0.35,0,0.629,0.103,0.839,0.308,0.21,0.204,0.315,0.465,0.315,0.779,0,0.848-0.487,1.597-1.461,2.25-0.359-0.471-0.605-0.851-0.738-1.142-0.133-0.29-0.199-0.602-0.199-0.934,0.01-0.42,0.11-0.736,0.32-0.946zm0.74,9.598c-0.548,0-1.025-0.182-1.432-0.544s-0.61-0.884-0.61-1.564c0-0.907,0.382-1.666,1.146-2.274l2.822,3.686c-0.56,0.46-1.21,0.69-1.93,0.69z"/>
-<polygon points="26.64,11.84,26.88,3.166,24.48,3.166,24.73,11.84"/>
-<path d="M26.62,13.43c-0.254-0.254-0.564-0.381-0.93-0.381s-0.675,0.127-0.93,0.381c-0.254,0.255-0.381,0.564-0.381,0.93s0.128,0.677,0.386,0.935c0.257,0.257,0.565,0.386,0.925,0.386,0.365,0,0.676-0.129,0.93-0.386,0.24-0.27,0.37-0.58,0.37-0.94s-0.13-0.68-0.38-0.93z"/>
+</g>
+<polygon points="8.012,17.726 7.02,17.726 4.006,18.676 4.006,19.77 6.152,19.277 6.152,26.906 4.006,26.906 4.006,28 10.041,28   10.041,26.906 8.012,26.906 "/>
+<path d="M13.654,25.693c0.193-0.34,0.432-0.651,0.715-0.934c0.281-0.282,0.674-0.636,1.176-1.06  c0.896-0.752,1.467-1.368,1.709-1.849c0.24-0.481,0.361-0.97,0.361-1.467c0-0.884-0.268-1.553-0.807-2.006  c-0.537-0.454-1.324-0.681-2.357-0.681c-0.84,0-1.701,0.139-2.584,0.417v1.217h0.014c0.842-0.306,1.56-0.458,2.152-0.458  c0.561,0,0.98,0.134,1.262,0.399c0.279,0.268,0.42,0.665,0.42,1.193c0,0.301-0.086,0.604-0.26,0.909  c-0.172,0.306-0.59,0.736-1.25,1.292c-0.553,0.465-1.008,0.893-1.367,1.281c-0.361,0.391-0.664,0.86-0.91,1.412  s-0.369,1.183-0.369,1.894V28h6.098v-1.189h-4.32C13.355,26.405,13.461,26.032,13.654,25.693z"/>
+<path d="M23.371,22.593c0.588-0.173,1.039-0.468,1.354-0.886c0.314-0.416,0.473-0.914,0.473-1.493c0-0.839-0.262-1.468-0.787-1.887  c-0.523-0.419-1.307-0.629-2.352-0.629c-0.691,0-1.467,0.107-2.324,0.321v1.203h0.014c0.844-0.232,1.498-0.349,1.963-0.349  c0.527,0,0.926,0.125,1.191,0.376c0.268,0.251,0.4,0.624,0.4,1.121c0,0.565-0.166,0.984-0.498,1.258  c-0.334,0.273-1.17,0.41-2.51,0.41v1.142c1.354,0,2.217,0.146,2.592,0.438c0.373,0.292,0.561,0.772,0.561,1.442  c0,0.624-0.156,1.093-0.469,1.404c-0.313,0.313-0.777,0.469-1.398,0.469c-0.515,0-1.219-0.111-2.111-0.335h-0.014v1.189  c0.766,0.214,1.512,0.321,2.242,0.321c1.217,0,2.129-0.261,2.736-0.783c0.609-0.521,0.914-1.304,0.914-2.348  c0-0.634-0.17-1.161-0.51-1.582C24.498,22.975,24.01,22.707,23.371,22.593z"/>
+<polygon points="4.014,13.543 5.541,13.543 5.383,10.671 7.799,12.239 8.545,10.929 6.014,9.616 8.545,8.313 7.799,7.002   5.383,8.546 5.541,5.69 4.014,5.69 4.162,8.546 1.746,7.002 1,8.313 3.531,9.616 1,10.929 1.746,12.239 4.162,10.671 "/>
+<path d="M19.551,13.352c0.73-0.853,1.258-1.992,1.584-3.42l-1.65-0.373c-0.238,1.057-0.545,1.89-0.922,2.498L16.08,8.844  c0.936-0.631,1.584-1.202,1.942-1.714c0.36-0.512,0.54-1.075,0.54-1.688c0-0.753-0.273-1.348-0.818-1.785S16.443,3,15.475,3  c-1.041,0-1.852,0.238-2.432,0.715c-0.582,0.476-0.873,1.159-0.873,2.05c0,0.808,0.443,1.79,1.328,2.946  c-0.891,0.51-1.529,1.051-1.916,1.623C11.193,10.907,11,11.584,11,12.363c0,1.052,0.338,1.867,1.014,2.445  c0.674,0.578,1.646,0.867,2.912,0.867c1.234,0,2.283-0.346,3.146-1.037l0.697,0.904h2.482L19.551,13.352z M14.557,4.652  c0.209-0.21,0.52-0.315,0.934-0.315c0.35,0,0.629,0.103,0.84,0.308c0.209,0.204,0.314,0.465,0.314,0.779  c0,0.848-0.486,1.597-1.461,2.25c-0.359-0.471-0.605-0.851-0.738-1.142c-0.133-0.29-0.199-0.602-0.199-0.934  C14.246,5.178,14.35,4.862,14.557,4.652z M15.301,14.248c-0.549,0-1.025-0.182-1.432-0.544c-0.408-0.362-0.611-0.884-0.611-1.564  c0-0.907,0.383-1.666,1.146-2.274l2.822,3.686C16.668,14.016,16.025,14.248,15.301,14.248z"/>
+<polygon points="26.643,11.841 26.883,3.166 24.484,3.166 24.734,11.841 "/>
+<path d="M26.617,13.426c-0.254-0.254-0.564-0.381-0.93-0.381s-0.674,0.127-0.93,0.381c-0.254,0.255-0.381,0.564-0.381,0.93  s0.129,0.677,0.387,0.935c0.256,0.257,0.564,0.386,0.924,0.386c0.365,0,0.676-0.129,0.93-0.386C26.873,15.032,27,14.721,27,14.355  S26.873,13.681,26.617,13.426z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sport.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sport.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sport.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="30" width="30"/>
-<path d="M10.611,11.199c-0.307,0-0.617-0.094-0.881-0.289c-0.652-0.479-0.785-1.387-0.299-2.029l1.998-2.625  c0.488-0.641,1.412-0.771,2.064-0.293c0.65,0.48,0.783,1.389,0.297,2.029l-1.998,2.627C11.504,10.998,11.061,11.199,10.611,11.199  L10.611,11.199z"/>
-<path d="M27.576,18.043h-4.74l-1.639-5.9L16.824,8.32l-3.979,0.141c-0.801,0.01-1.445-0.576-1.473-1.35  c-0.027-0.771,0.584-1.42,1.371-1.447l5.118-0.18l5.859,5.121l1.287,4.637h2.566c0.785,0,1.424,0.627,1.424,1.4  C28.998,17.415,28.361,18.043,27.576,18.043L27.576,18.043z"/>
-<path d="M10.266,18.777l-0.539-1.771c-0.297-1.66,0.633-3.42,2.766-5.232c0.646-0.549,2.512-2.381,3.532-3.408l2.326-2.33  l4.746,4.572l-2.326,2.332c-0.291,0.289-2.871,2.872-3.938,3.777c-0.143,0.121-0.262,0.229-0.357,0.32l0.205,1.237l-5.5,1  L10.266,18.777z"/>
-<circle cx="25" cy="5" r="4"/>
-<path d="M11.584,29c-0.572,0-1.141-0.244-1.537-0.719c-0.707-0.85-0.592-2.111,0.256-2.818l4.965-4.135l-3.303-3.965  c-0.707-0.848-0.594-2.109,0.256-2.816c0.848-0.707,2.109-0.592,2.816,0.256l4.582,5.5c0.707,0.85,0.594,2.111-0.256,2.818  l-6.5,5.416C12.49,28.848,12.035,29,11.584,29L11.584,29z"/>
-<path d="M3.002,28.084c-0.578,0-1.152-0.25-1.549-0.732c-0.699-0.854-0.574-2.115,0.279-2.813l6.988-5.726l2.361-4.278  c0.533-0.967,1.75-1.316,2.719-0.783c0.967,0.533,1.318,1.75,0.783,2.717l-2.547,4.615c-0.123,0.224-0.287,0.42-0.482,0.58  l-7.287,5.969C3.896,27.936,3.447,28.084,3.002,28.084L3.002,28.084z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-1 -1 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M26.576,14.242h-2.566l-1.287-4.637l-5.859-5.121l-5.59,0.156c-0.391,0.014-0.736,0.18-0.984,0.438  c-0.082,0.068-0.159,0.145-0.227,0.233l-2.27,3.019C7.306,8.974,7.439,9.882,8.091,10.36c0.264,0.195,0.574,0.289,0.881,0.289  c0.449,0,0.893-0.201,1.182-0.58l1.992-2.652l2.905-0.076l-0.026,0.026c-1.021,1.027-2.887,2.859-3.533,3.408  c-1.171,0.995-1.966,1.974-2.407,2.93c-0.018,0.027-0.039,0.05-0.055,0.078l-0.053,0.163c-0.067,0.168-0.119,0.335-0.163,0.5  L7.72,17.813l-6.988,5.725c-0.854,0.699-0.979,1.959-0.279,2.814c0.396,0.482,0.971,0.732,1.549,0.732  c0.445,0,0.895-0.148,1.266-0.453c0,0,7.646-6.326,7.77-6.549l0.882-2.573l2.349,2.819l-4.965,4.135  c-0.848,0.707-0.963,1.969-0.256,2.818C9.443,27.756,10.011,28,10.583,28c0.451,0,0.906-0.152,1.279-0.463l6.5-5.416  c0.85-0.707,0.963-1.969,0.256-2.818l-2.9-3.481c0.041-0.035,0.069-0.063,0.115-0.103c1.066-0.906,3.646-3.488,3.938-3.777  l0.507-0.508l1.558,5.609h4.74c0.785,0,1.424-0.627,1.424-1.4S27.361,14.242,26.576,14.242z"/>
+<circle cx="24" cy="4" r="4"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M15,7c-2.757,0-5,2.243-5,5s2.243,5,5,5s5-2.243,5-5S17.757,7,15,7z M15,15c-1.654,0-3-1.346-3-3s1.346-3,3-3s3,1.346,3,3  S16.654,15,15,15z"/>
+<path d="M25,3H11H6H5C3.896,3,3,3.896,3,5v14c0,1.104,0.896,2,2,2h20c1.104,0,2-0.896,2-2V5C27,3.896,26.104,3,25,3z M15,19  c-3.866,0-7-3.135-7-7s3.134-7,7-7s7,3.135,7,7S18.866,19,15,19z M25,7h-3V5h3V7z"/>
+<path d="M11,1c0-0.553-0.448-1-1-1H7C6.448,0,6,0.447,6,1v1h5V1z"/>
+<polygon points="3,22 1,22 1,29 11,29 11,27.086 3,27.086 "/>
+<polygon points="27,22 27,27.086 19,27.086 19,29 29,29 29,22 "/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M3.949,4v17h22.1V4H3.949z M23,18H7V7h16V18z"/>
-<circle cx="9.001" cy="9.02" r="1"/>
-<rect height="2" width="4" x="20.049" y="1"/>
-<path d="M15.422,8c-2.48,0-4.5,2.018-4.5,4.5c0,2.48,2.02,4.5,4.5,4.5c2.482,0,4.5-2.02,4.5-4.5C19.922,10.018,17.904,8,15.422,8z   M15.422,14.5c-1.104,0-2-0.896-2-2c0-1.105,0.896-2,2-2c1.105,0,2,0.895,2,2C17.422,13.604,16.527,14.5,15.422,14.5z"/>
-<polygon points="3,27 3,21 1,21 1,29 11,29 11,27 "/>
-<polygon points="27,27 27,21 29,21 29,29 19,29 19,27 "/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M13.542,9.395C13.976,9.15,14.468,9,15,9c1.654,0,3,1.346,3,3c0,0.531-0.15,1.023-0.395,1.457l1.447,1.447  C19.643,14.084,20,13.086,20,12c0-2.757-2.242-5-5-5c-1.085,0-2.084,0.357-2.905,0.947L13.542,9.395z"/>
+<path d="M10.662,6.514C11.855,5.568,13.36,5,15,5c3.867,0,7,3.135,7,7c0,1.64-0.568,3.145-1.514,4.338l4.648,4.648  C26.176,20.915,27,20.059,27,19V5c0-1.104-0.895-2-2-2H11H7.148L10.662,6.514z M22,5h3v2h-3V5z"/>
+<path d="M14.844,18.992c-3.741-0.082-6.754-3.096-6.836-6.837L3,7.147V19c0,1.104,0.896,2,2,2h11.852L14.844,18.992z"/>
+<path d="M11,1c0-0.553-0.448-1-1-1H7C6.448,0,6,0.447,6,1v1h5V1z"/>
+<polygon points="3,22 1,22 1,29 11,29 11,27.086 3,27.086 "/>
+<polygon points="29,24.851 29,22 27,22 27,22.851 "/>
+<polygon points="22.938,27.086 19,27.086 19,29 24.852,29 "/>
+<path d="M27.693,26.373c0.389,0.389,0.41,1.004,0.049,1.367c-0.363,0.363-0.979,0.344-1.367-0.045L2.306,3.625  c-0.389-0.389-0.41-1.004-0.047-1.366s0.979-0.341,1.367,0.048L27.693,26.373z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="35.829" transform="matrix(-0.7061 0.7082 -0.7082 -0.7061 36.214 14.9658)" width="1.867" x="14.067" y="-2.916"/>
-<rect height="2" width="4" x="20.049" y="1"/>
-<polygon points="3,27 3,21 1,21 1,29 11,29 11,27 "/>
-<polygon points="29,24.85 29,21 27,21 27,22.85 "/>
-<polygon points="11.148,7 23,7 23,18 22.148,18 25.148,21 26.049,21 26.049,4 8.148,4 "/>
-<polygon points="13.853,18 7,18 7,11.147 3.949,8.097 3.949,21 16.854,21 "/>
-<polygon points="22.854,27 19,27 19,29 24.854,29 "/>
-<path d="M14.768,10.619c0.206-0.072,0.424-0.119,0.654-0.119c1.105,0,2,0.896,2,2c0,0.23-0.047,0.448-0.117,0.654l1.853,1.853  c0.483-0.717,0.766-1.58,0.766-2.507c0-2.482-2.019-4.5-4.5-4.5c-0.928,0-1.79,0.283-2.507,0.766L14.768,10.619z"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_station_scan.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_station_scan.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_station_scan.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M17,21c0,1.104-0.896,2-2,2l0,0c-1.104,0-2-0.896-2-2V10c0-1.104,0.896-2,2-2l0,0c1.104,0,2,0.896,2,2V21z"/>
+<path d="M11,18c0,0.553-0.447,1-1,1l0,0c-0.553,0-1-0.447-1-1v-5c0-0.553,0.447-1,1-1l0,0c0.553,0,1,0.447,1,1V18z"/>
+<path d="M7,18c0,0.553-0.447,1-1,1l0,0c-0.553,0-1-0.447-1-1v-5c0-0.553,0.447-1,1-1l0,0c0.553,0,1,0.447,1,1V18z"/>
+<path d="M3,18c0,0.553-0.447,1-1,1l0,0c-0.553,0-1-0.447-1-1v-5c0-0.553,0.447-1,1-1l0,0c0.553,0,1,0.447,1,1V18z"/>
+<path d="M21,18c0,0.553-0.447,1-1,1l0,0c-0.553,0-1-0.447-1-1v-5c0-0.553,0.447-1,1-1l0,0c0.553,0,1,0.447,1,1V18z"/>
+<path d="M25,18c0,0.553-0.447,1-1,1l0,0c-0.553,0-1-0.447-1-1v-5c0-0.553,0.447-1,1-1l0,0c0.553,0,1,0.447,1,1V18z"/>
+<path d="M29,18c0,0.553-0.447,1-1,1l0,0c-0.553,0-1-0.447-1-1v-5c0-0.553,0.447-1,1-1l0,0c0.553,0,1,0.447,1,1V18z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="15" width="4" x="13" y="8"/>
-<rect height="7" width="2" x="9" y="12"/>
-<rect height="7" width="2" x="5" y="12"/>
-<rect height="7" width="2" x="1" y="12"/>
-<rect height="7" width="2" x="27" y="12"/>
-<rect height="7" width="2" x="23" y="12"/>
-<rect height="7" width="2" x="19" y="12"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stop.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stop.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stop.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="30" width="30"/>
-<rect height="24" width="24" x="3" y="3"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-3 -3 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M24,22c0,1.104-0.896,2-2,2H2c-1.104,0-2-0.896-2-2V2c0-1.104,0.896-2,2-2h20c1.104,0,2,0.896,2,2V22z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_store.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_store.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_store.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<rect fill="none" height="30" width="30"/>
-<path d="M29,10v-3h-23v-3c0-0.553-0.447-1-1-1h-3c-0.553,0-1,0.447-1,1v1c0,0.553,0.447,1,1,1h1v16c0,0.553,0.448,1,1,1h22c0.553,0,1-0.447,1-1v-1c0-0.553-0.447-1-1-1h-20v-2h21v-2h-0.394l0.986-6h1.4zm-15,0h2v6h-2v-6zm-2,6h-2v-6h2v6zm6-6h2v6h-2v-6zm-12,0h2v6h-2v-6zm17.57,6h-1.57v-6h2.553l-0.98,6z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
 <circle cx="8.5" cy="25.5" r="2.5"/>
 <circle cx="22.5" cy="25.5" r="2.5"/>
+<path d="M28,7h-1H6V5V4c0-0.553-0.447-1-1-1H4H2C1.447,3,1,3.447,1,4v1c0,0.553,0.447,1,1,1h1v16c0,0.553,0.448,1,1,1h0.001H5h3.5  h14H26c0.552,0,1-0.447,1-1v-1c0-0.553-0.448-1-1-1H6v-2h17.237H26c0.553,0,1-0.447,1-1c0-0.331-0.172-0.61-0.419-0.792L27.593,10  H28c0.553,0,1-0.447,1-1V8C29,7.447,28.553,7,28,7z M8,16H6v-6h2V16z M12,16h-2v-6h2V16z M16,16h-2v-6h2V16z M20,16h-2v-6h2V16z   M23.566,16H22v-6h2.553L23.566,16z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_swap_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_swap_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_swap_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,6 +6,6 @@
 </g>
 <path d="M21,15c0-3.309-2.691-6-6-6c-1.206,0-2.327,0.361-3.269,0.976l1.21,1.613C13.545,11.223,14.244,11,15,11  c2.206,0,4,1.795,4,4h-2l3,4l3-4H21z"/>
 <path d="M15,19c-2.206,0-4-1.794-4-4h2l-3-4l-3,4h2c0,3.309,2.691,6,6,6c1.206,0,2.327-0.36,3.269-0.975l-1.21-1.613  C16.455,18.777,15.756,19,15,19z"/>
-<path d="M8.205,19.919c-0.063-0.329-0.366-0.549-0.673-0.484l-2.431,0.519c-0.007,0.004-0.011,0.008-0.017,0.014  c0.001-0.001-0.001-0.01-0.001-0.01c-0.498-1.825-0.628-3.556-0.63-5.283c0-1.66,0.467-3.848,0.76-4.748l0.002,0.003  c0.001-0.002-0.002-0.005-0.001-0.006l1.862,0.456c0.268,0.066,0.542-0.097,0.656-0.369l1.692-6.137  C9.514,3.556,9.347,3.232,9.05,3.155c0,0-0.276-0.053-1.019-0.128L8.027,3.024C7.649,2.986,7.619,3,7.202,3.016  c-1.252,0.055-2.21,0.527-2.21,0.527C4.613,3.717,3.619,4.576,2.792,6.075C1.965,7.572,0.997,11.86,1,15.225  s0.865,7.081,1.324,8.074c0.727,1.568,2.054,2.781,2.526,3.05c0,0,0.37,0.182,0.962,0.345c0.004,0.001,0.013,0.004,0.021,0.007  c0.058,0.017,0.114,0.03,0.177,0.046l0.004-0.002c0.305,0.074,0.65,0.142,1.032,0.177c0.449,0.039,0.529,0.098,0.929,0.073  c0.001-0.001,0.001-0.001,0.001-0.001c0.742-0.048,1.008-0.103,1.008-0.103c0.308-0.063,0.504-0.383,0.442-0.711L8.205,19.919z"/>
+<path d="M8.205,19.919c-0.063-0.329-0.366-0.549-0.673-0.484l-2.431,0.519c-0.007,0.004-0.011,0.008-0.017,0.014  c0.001-0.001-0.001-0.01-0.001-0.01c-0.498-1.825-0.629-3.556-0.63-5.283c0-1.66,0.467-3.848,0.76-4.748l0.003,0.003  c0.001-0.002-0.003-0.005-0.002-0.006l1.861,0.456c0.269,0.066,0.542-0.097,0.656-0.369l1.693-6.137  C9.514,3.556,9.347,3.232,9.05,3.155c0,0-0.276-0.053-1.019-0.128L8.027,3.024C7.648,2.986,7.619,3,7.201,3.016  c-1.252,0.055-2.21,0.527-2.21,0.527C4.613,3.717,3.619,4.576,2.793,6.075C1.965,7.572,0.997,11.86,1,15.225  s0.865,7.081,1.324,8.074c0.727,1.568,2.054,2.781,2.526,3.05c0,0,0.37,0.182,0.962,0.345c0.005,0.001,0.014,0.004,0.021,0.007  c0.058,0.017,0.114,0.03,0.177,0.046l0.004-0.002c0.306,0.074,0.65,0.142,1.032,0.177c0.448,0.039,0.528,0.098,0.929,0.073  c0.001-0.001,0.001-0.001,0.001-0.001c0.742-0.048,1.009-0.103,1.009-0.103c0.308-0.063,0.504-0.383,0.442-0.711L8.205,19.919z"/>
 <path d="M27.207,6.075c-0.826-1.499-1.82-2.358-2.198-2.532c0,0-0.958-0.473-2.21-0.527C22.381,3,22.352,2.986,21.973,3.024  l-0.004,0.003c-0.742,0.075-1.019,0.128-1.019,0.128c-0.297,0.077-0.464,0.4-0.376,0.718l1.693,6.137  c0.114,0.272,0.388,0.436,0.656,0.369l1.861-0.456c0.001,0.001-0.003,0.004-0.002,0.006l0.003-0.003  c0.293,0.9,0.76,3.088,0.76,4.748c-0.001,1.728-0.132,3.458-0.63,5.283c0,0-0.002,0.009-0.001,0.01  c-0.006-0.006-0.01-0.01-0.017-0.014l-2.431-0.519c-0.307-0.064-0.609,0.155-0.673,0.484l-1.223,6.261  c-0.062,0.328,0.135,0.648,0.442,0.711c0,0,0.267,0.055,1.009,0.103c0,0,0,0,0.001,0.001c0.4,0.024,0.48-0.034,0.929-0.073  c0.382-0.035,0.727-0.103,1.032-0.177l0.004,0.002c0.063-0.016,0.119-0.029,0.177-0.046c0.008-0.003,0.017-0.006,0.021-0.007  c0.592-0.163,0.962-0.345,0.962-0.345c0.473-0.269,1.8-1.481,2.526-3.05c0.459-0.993,1.321-4.71,1.324-8.074  S28.035,7.572,27.207,6.075z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_itut.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_itut.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_itut.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M4.427,12.81c-0.771-0.426-1.315-0.787-1.635-1.083s-0.479-0.69-0.479-1.184c0-0.509,0.183-0.907,0.549-1.195,0.366-0.287,0.854-0.432,1.464-0.432,0.672,0,1.398,0.089,2.18,0.266v-1.449c-0.737-0.166-1.544-0.25-2.421-0.25-1.209,0-2.188,0.281-2.94,0.843s-1.127,1.401-1.127,2.52c0,0.703,0.169,1.329,0.507,1.88s0.993,1.098,1.963,1.64c0.888,0.504,1.496,0.912,1.822,1.225,0.327,0.313,0.491,0.743,0.491,1.29,0,0.582-0.198,1.029-0.595,1.346-0.396,0.314-0.947,0.473-1.652,0.473-0.742,0-1.594-0.13-2.554-0.391v1.479c0.877,0.227,1.768,0.34,2.672,0.34,1.475,0,2.583-0.312,3.322-0.934,0.741-0.623,1.111-1.557,1.111-2.802,0-0.691-0.181-1.314-0.54-1.868-0.361-0.56-1.074-1.14-2.138-1.73z"/>
-<path d="M11.92,17.88l-1.92-7.58h-2.337l2.612,9.297h1.174c-0.233,0.725-0.471,1.206-0.712,1.443-0.241,0.238-0.572,0.357-0.994,0.357s-0.904-0.063-1.447-0.191v1.428c0.604,0.128,1.167,0.191,1.688,0.191,0.793,0,1.433-0.202,1.918-0.605,0.485-0.404,0.855-1.041,1.11-1.91l2.937-10.01h-1.996l-2.03,7.58z"/>
-<path d="M29.26,10.94c-0.496-0.525-1.241-0.788-2.233-0.788-1.171,0-2.075,0.459-2.714,1.378-0.433-0.919-1.295-1.378-2.587-1.378-1.23,0-2.174,0.528-2.828,1.585l-0.391-1.443h-1.315v9.7h2.255v-5.902c0-0.769,0.147-1.386,0.44-1.851,0.295-0.465,0.719-0.697,1.273-0.697,0.438,0,0.767,0.155,0.985,0.465,0.22,0.31,0.329,0.772,0.329,1.386v6.59h2.246v-5.902c0-0.774,0.15-1.393,0.449-1.854,0.3-0.462,0.729-0.693,1.29-0.693,0.433,0,0.754,0.14,0.966,0.419,0.21,0.279,0.314,0.757,0.314,1.432v6.59h2.24v-6.699c0-1.04-0.25-1.83-0.74-2.36z"/>
+</g>
+<path d="M4.426,12.812c-0.771-0.426-1.314-0.787-1.635-1.083c-0.318-0.296-0.479-0.69-0.479-1.184c0-0.509,0.184-0.907,0.549-1.195  c0.367-0.287,0.855-0.432,1.465-0.432c0.671,0,1.398,0.089,2.18,0.266V7.74C5.768,7.574,4.961,7.49,4.084,7.49  c-1.209,0-2.188,0.281-2.939,0.843s-1.127,1.401-1.127,2.52c0,0.703,0.168,1.329,0.506,1.88s0.994,1.098,1.963,1.64  c0.889,0.504,1.496,0.912,1.822,1.225c0.328,0.313,0.492,0.743,0.492,1.29c0,0.582-0.199,1.029-0.596,1.346  c-0.396,0.314-0.947,0.473-1.652,0.473c-0.742,0-1.594-0.13-2.553-0.391v1.479c0.877,0.227,1.768,0.34,2.672,0.34  c1.475,0,2.582-0.312,3.322-0.934c0.74-0.623,1.111-1.557,1.111-2.802c0-0.691-0.182-1.314-0.541-1.868  C6.203,13.977,5.49,13.403,4.426,12.812z"/>
+<path d="M11.922,17.875L10,10.297H7.662l2.613,9.297h1.174c-0.234,0.725-0.471,1.206-0.713,1.443  c-0.24,0.238-0.572,0.357-0.994,0.357s-0.904-0.063-1.447-0.191v1.428c0.605,0.128,1.168,0.191,1.689,0.191  c0.793,0,1.432-0.202,1.918-0.605c0.484-0.404,0.855-1.041,1.109-1.91l2.938-10.01h-1.996L11.922,17.875z"/>
+<path d="M29.256,10.943c-0.496-0.525-1.24-0.788-2.232-0.788c-1.172,0-2.076,0.459-2.715,1.378  c-0.432-0.919-1.295-1.378-2.586-1.378c-1.23,0-2.174,0.528-2.828,1.585l-0.391-1.443h-1.316V20h2.256v-5.902  c0-0.769,0.146-1.386,0.439-1.851c0.295-0.465,0.719-0.697,1.273-0.697c0.439,0,0.768,0.155,0.986,0.465s0.328,0.772,0.328,1.386V20  h2.246v-5.902c0-0.774,0.15-1.393,0.449-1.854c0.301-0.462,0.73-0.693,1.29-0.693c0.433,0,0.755,0.14,0.966,0.419  s0.314,0.757,0.314,1.432V20H30v-6.699C30,12.256,29.752,11.47,29.256,10.943z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_qwerty.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_qwerty.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_qwerty.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M7.672,9.609c0-0.651-0.169-1.237-0.508-1.758s-1.008-1.06-2.008-1.617c-0.724-0.401-1.235-0.741-1.535-1.02s-0.449-0.649-0.449-1.112c0-0.479,0.172-0.854,0.516-1.125s0.801-0.407,1.375-0.407c0.63,0,1.313,0.083,2.047,0.25v-1.359c-0.692-0.156-1.45-0.234-2.273-0.234-1.137,0-2.057,0.264-2.763,0.793s-1.058,1.319-1.058,2.371c0,0.661,0.159,1.251,0.477,1.77s0.933,1.032,1.844,1.543c0.833,0.474,1.403,0.858,1.711,1.152s0.461,0.699,0.461,1.215c0,0.547-0.187,0.969-0.559,1.266s-0.89,0.445-1.551,0.445c-0.698,0-1.497-0.122-2.398-0.367v1.391c0.823,0.214,1.659,0.32,2.508,0.32,1.386,0,2.426-0.293,3.121-0.879s1.042-1.46,1.042-2.631z"/>
-<path d="M13.83,13.29l2.758-9.422h-1.875l-1.92,7.132-1.8-7.133h-2.195l2.453,8.75h1.102c-0.219,0.683-0.441,1.136-0.668,1.359s-0.538,0.336-0.934,0.336-0.849-0.06-1.359-0.18v1.344c0.567,0.12,1.097,0.18,1.586,0.18,0.745,0,1.345-0.19,1.801-0.57s0.8-0.98,1.04-1.8z"/>
-<path d="M29.3,4.477c-0.466-0.495-1.165-0.742-2.098-0.742-1.099,0-1.948,0.433-2.547,1.297-0.406-0.864-1.216-1.297-2.43-1.297-1.156,0-2.042,0.497-2.656,1.492l-0.367-1.359h-1.234v9.132h2.117v-5.555c0-0.724,0.138-1.305,0.414-1.742s0.675-0.656,1.195-0.656c0.411,0,0.72,0.146,0.926,0.438s0.309,0.727,0.309,1.305v6.21h2.109v-5.555c0-0.729,0.141-1.312,0.422-1.746s0.685-0.652,1.211-0.652c0.406,0,0.708,0.132,0.906,0.395s0.297,0.712,0.297,1.348v6.21h2.13v-6.305c0-0.984-0.23-1.723-0.7-2.218z"/>
-<polygon points="8.011,17.73,7.02,17.73,4.005,18.68,4.005,19.77,6.151,19.28,6.151,26.91,4.005,26.91,4.005,28,10.04,28,10.04,26.91,8.011,26.91"/>
-<path d="M13.65,25.69c0.193-0.34,0.432-0.651,0.714-0.934s0.675-0.636,1.176-1.06c0.897-0.752,1.468-1.368,1.709-1.849s0.362-0.97,0.362-1.467c0-0.884-0.269-1.553-0.807-2.006-0.538-0.454-1.324-0.681-2.358-0.681-0.839,0-1.7,0.139-2.584,0.417v1.217h0.014c0.843-0.306,1.561-0.458,2.153-0.458,0.561,0,0.98,0.134,1.262,0.399,0.279,0.268,0.42,0.665,0.42,1.193,0,0.301-0.087,0.604-0.26,0.909s-0.59,0.736-1.251,1.292c-0.552,0.465-1.007,0.893-1.367,1.281-0.36,0.391-0.663,0.86-0.909,1.412s-0.369,1.183-0.369,1.894v0.76h6.098v-1.189h-4.32c0.03-0.41,0.14-0.78,0.33-1.12z"/>
-<path d="M23.37,22.59c0.588-0.173,1.039-0.468,1.354-0.886,0.314-0.416,0.472-0.914,0.472-1.493,0-0.839-0.262-1.468-0.786-1.887s-1.308-0.629-2.352-0.629c-0.692,0-1.468,0.107-2.324,0.321v1.203h0.014c0.843-0.232,1.497-0.349,1.962-0.349,0.528,0,0.927,0.125,1.192,0.376,0.268,0.251,0.4,0.624,0.4,1.121,0,0.565-0.166,0.984-0.499,1.258s-1.169,0.41-2.509,0.41v1.142c1.354,0,2.217,0.146,2.591,0.438s0.561,0.772,0.561,1.442c0,0.624-0.156,1.093-0.468,1.404-0.313,0.313-0.778,0.469-1.398,0.469-0.515,0-1.219-0.111-2.112-0.335h-0.014v1.189c0.766,0.214,1.513,0.321,2.242,0.321,1.217,0,2.13-0.261,2.737-0.783,0.609-0.521,0.913-1.304,0.913-2.348,0-0.634-0.17-1.161-0.509-1.582-0.32-0.4-0.81-0.67-1.45-0.79z"/>
+</g>
+<path d="M7.672,9.609c0-0.651-0.169-1.237-0.508-1.758s-1.008-1.06-2.008-1.617c-0.724-0.401-1.235-0.741-1.535-1.02  S3.172,4.565,3.172,4.102c0-0.479,0.172-0.854,0.516-1.125S4.489,2.57,5.063,2.57c0.63,0,1.313,0.083,2.047,0.25V1.461  c-0.692-0.156-1.45-0.234-2.273-0.234C3.7,1.227,2.78,1.491,2.074,2.02S1.016,3.339,1.016,4.391c0,0.661,0.159,1.251,0.477,1.77  s0.933,1.032,1.844,1.543c0.833,0.474,1.403,0.858,1.711,1.152s0.461,0.699,0.461,1.215c0,0.547-0.187,0.969-0.559,1.266  s-0.89,0.445-1.551,0.445c-0.698,0-1.497-0.122-2.398-0.367v1.391c0.823,0.214,1.659,0.32,2.508,0.32  c1.386,0,2.426-0.293,3.121-0.879S7.672,10.781,7.672,9.609z"/>
+<path d="M13.828,13.289l2.758-9.422h-1.875L12.805,11L11,3.867H8.805l2.453,8.75h1.102c-0.219,0.683-0.441,1.136-0.668,1.359  s-0.538,0.336-0.934,0.336s-0.849-0.06-1.359-0.18v1.344c0.567,0.12,1.097,0.18,1.586,0.18c0.745,0,1.345-0.19,1.801-0.57  S13.589,14.106,13.828,13.289z"/>
+<path d="M29.301,4.477c-0.466-0.495-1.165-0.742-2.098-0.742c-1.099,0-1.948,0.433-2.547,1.297c-0.406-0.864-1.216-1.297-2.43-1.297  c-1.156,0-2.042,0.497-2.656,1.492l-0.367-1.359h-1.234V13h2.117V7.445c0-0.724,0.138-1.305,0.414-1.742s0.675-0.656,1.195-0.656  c0.411,0,0.72,0.146,0.926,0.438s0.309,0.727,0.309,1.305V13h2.109V7.445c0-0.729,0.141-1.312,0.422-1.746s0.685-0.652,1.211-0.652  c0.406,0,0.708,0.132,0.906,0.395s0.297,0.712,0.297,1.348V13H30V6.695C30,5.711,29.767,4.972,29.301,4.477z"/>
+<polygon points="8.011,17.726 7.02,17.726 4.005,18.676 4.005,19.77 6.151,19.277 6.151,26.906 4.005,26.906 4.005,28 10.041,28   10.041,26.906 8.011,26.906 "/>
+<path d="M13.654,25.693c0.193-0.34,0.432-0.651,0.714-0.934s0.675-0.636,1.176-1.06c0.897-0.752,1.468-1.368,1.709-1.849  c0.241-0.481,0.362-0.97,0.362-1.467c0-0.884-0.269-1.553-0.807-2.006c-0.538-0.454-1.324-0.681-2.358-0.681  c-0.839,0-1.7,0.139-2.584,0.417v1.217h0.014c0.843-0.306,1.561-0.458,2.153-0.458c0.561,0,0.98,0.134,1.262,0.399  c0.279,0.268,0.42,0.665,0.42,1.193c0,0.301-0.087,0.604-0.26,0.909s-0.59,0.736-1.251,1.292c-0.552,0.465-1.007,0.893-1.367,1.281  c-0.36,0.391-0.663,0.86-0.909,1.412s-0.369,1.183-0.369,1.894V28h6.098v-1.189h-4.32C13.354,26.405,13.46,26.032,13.654,25.693z"/>
+<path d="M23.371,22.593c0.588-0.173,1.039-0.468,1.354-0.886c0.314-0.416,0.472-0.914,0.472-1.493c0-0.839-0.262-1.468-0.786-1.887  s-1.308-0.629-2.352-0.629c-0.692,0-1.468,0.107-2.324,0.321v1.203h0.014c0.843-0.232,1.497-0.349,1.962-0.349  c0.528,0,0.927,0.125,1.192,0.376c0.268,0.251,0.4,0.624,0.4,1.121c0,0.565-0.166,0.984-0.499,1.258s-1.169,0.41-2.509,0.41v1.142  c1.354,0,2.217,0.146,2.591,0.438s0.561,0.772,0.561,1.442c0,0.624-0.156,1.093-0.468,1.404c-0.313,0.313-0.778,0.469-1.398,0.469  c-0.515,0-1.219-0.111-2.112-0.335h-0.014v1.189c0.766,0.214,1.513,0.321,2.242,0.321c1.217,0,2.13-0.261,2.737-0.783  c0.609-0.521,0.913-1.304,0.913-2.348c0-0.634-0.17-1.161-0.509-1.582C24.498,22.975,24.009,22.707,23.371,22.593z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_active.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_active.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_active.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<circle cx="15" cy="15" r="13"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-2 -2 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<circle cx="13" cy="13" r="13"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_passive.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_passive.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_passive.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<path d="M15,2C7.82,2,2,7.82,2,15s5.82,13,13,13s13-5.82,13-13S22.18,2,15,2z M15,25C9.486,25,5,20.514,5,15S9.486,5,15,5  s10,4.486,10,10S20.514,25,15,25z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-2 -2 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M13,0C5.82,0,0,5.82,0,13s5.82,13,13,13s13-5.82,13-13S20.18,0,13,0z M13,23C7.486,23,3,18.514,3,13S7.486,3,13,3  s10,4.486,10,10S18.514,23,13,23z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tag.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tag.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tag.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M27.335,16.021L13.899,2.586C13.524,2.211,13.016,2,12.485,2H4C3.47,2,2.961,2.211,2.586,2.586S2,3.469,2,4v8.484  c0,0.531,0.211,1.04,0.586,1.415l13.435,13.435c0.781,0.781,2.048,0.781,2.829,0l8.485-8.484  C28.115,18.068,28.115,16.802,27.335,16.021z M6,8C4.896,8,4,7.104,4,6s0.896-2,2-2s2,0.896,2,2S7.104,8,6,8z M17.436,23.092  l-7.778-7.778l5.656-5.657l7.778,7.779L17.436,23.092z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M12.73,2h-8.636l-2.094,2.094v8.638l15.68,15.68,10.73-10.73-15.68-15.68zm-8.73,9.9v-6.978l0.922-0.922h6.981l13.68,13.68-7.903,7.903-13.68-13.68z"/>
-<rect height="11.95" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -6.6464 16.0459)" width="7.321" x="12.38" y="10.07"/>
-<circle cx="7" cy="7" r="2"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_center.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_center.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_center.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="2" width="22" x="4" y="4"/>
-<rect height="2" width="16" x="7" y="8"/>
-<rect height="2" width="22" x="4" y="12"/>
-<rect height="2" width="16" x="7" y="16"/>
-<rect height="2" width="22" x="4" y="20"/>
-<rect height="2" width="16" x="7" y="24"/>
+</g>
+<path d="M27,5c0,0.553-0.447,1-1,1H4C3.447,6,3,5.553,3,5l0,0c0-0.553,0.447-1,1-1h22C26.553,4,27,4.447,27,5L27,5z"/>
+<path d="M24,9c0,0.553-0.447,1-1,1H7c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h16C23.553,8,24,8.447,24,9L24,9z"/>
+<path d="M27,13c0,0.553-0.447,1-1,1H4c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h22C26.553,12,27,12.447,27,13L27,13z"/>
+<path d="M24,17c0,0.553-0.447,1-1,1H7c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h16C23.553,16,24,16.447,24,17L24,17z"/>
+<path d="M27,21c0,0.553-0.447,1-1,1H4c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h22C26.553,20,27,20.447,27,21L27,21z"/>
+<path d="M24,25c0,0.553-0.447,1-1,1H7c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h16C23.553,24,24,24.447,24,25L24,25z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_justify.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_justify.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_justify.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="2" width="22" x="4" y="4"/>
-<rect height="2" width="22" x="4" y="8"/>
-<rect height="2" width="22" x="4" y="12"/>
-<rect height="2" width="22" x="4" y="16"/>
-<rect height="2" width="22" x="4" y="20"/>
-<rect height="2" width="22" x="4" y="24"/>
+</g>
+<path d="M27,5c0,0.553-0.447,1-1,1H4C3.447,6,3,5.553,3,5l0,0c0-0.553,0.447-1,1-1h22C26.553,4,27,4.447,27,5L27,5z"/>
+<path d="M27,9c0,0.553-0.447,1-1,1H4c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h22C26.553,8,27,8.447,27,9L27,9z"/>
+<path d="M27,13c0,0.553-0.447,1-1,1H4c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h22C26.553,12,27,12.447,27,13L27,13z"/>
+<path d="M27,17c0,0.553-0.447,1-1,1H4c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h22C26.553,16,27,16.447,27,17L27,17z"/>
+<path d="M27,21c0,0.553-0.447,1-1,1H4c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h22C26.553,20,27,20.447,27,21L27,21z"/>
+<path d="M27,25c0,0.553-0.447,1-1,1H4c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h22C26.553,24,27,24.447,27,25L27,25z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_left.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_left.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_left.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="2" width="22" x="4" y="4"/>
-<rect height="2" width="16" x="4" y="8"/>
-<rect height="2" width="22" x="4" y="12"/>
-<rect height="2" width="16" x="4" y="16"/>
-<rect height="2" width="22" x="4" y="20"/>
-<rect height="2" width="16" x="4" y="24"/>
+</g>
+<path d="M27,5c0,0.553-0.447,1-1,1H4C3.447,6,3,5.553,3,5l0,0c0-0.553,0.447-1,1-1h22C26.553,4,27,4.447,27,5L27,5z"/>
+<path d="M21,9c0,0.553-0.447,1-1,1H4c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h16C20.553,8,21,8.447,21,9L21,9z"/>
+<path d="M27,13c0,0.553-0.447,1-1,1H4c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h22C26.553,12,27,12.447,27,13L27,13z"/>
+<path d="M21,17c0,0.553-0.447,1-1,1H4c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h16C20.553,16,21,16.447,21,17L21,17z"/>
+<path d="M27,21c0,0.553-0.447,1-1,1H4c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h22C26.553,20,27,20.447,27,21L27,21z"/>
+<path d="M21,25c0,0.553-0.447,1-1,1H4c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h16C20.553,24,21,24.447,21,25L21,25z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_right.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_right.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_right.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<rect height="2" width="22" x="4" y="4"/>
-<rect height="2" width="16" x="10" y="8"/>
-<rect height="2" width="22" x="4" y="12"/>
-<rect height="2" width="16" x="10" y="16"/>
-<rect height="2" width="22" x="4" y="20"/>
-<rect height="2" width="16" x="10" y="24"/>
+</g>
+<path d="M28,5c0,0.553-0.447,1-1,1H5C4.447,6,4,5.553,4,5l0,0c0-0.553,0.447-1,1-1h22C27.553,4,28,4.447,28,5L28,5z"/>
+<path d="M28,9c0,0.553-0.447,1-1,1H11c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h16C27.553,8,28,8.447,28,9L28,9z"/>
+<path d="M28,13c0,0.553-0.447,1-1,1H5c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h22C27.553,12,28,12.447,28,13L28,13z"/>
+<path d="M28,17c0,0.553-0.447,1-1,1H11c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h16C27.553,16,28,16.447,28,17L28,17z"/>
+<path d="M28,21c0,0.553-0.447,1-1,1H5c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h22C27.553,20,28,20.447,28,21L28,21z"/>
+<path d="M28,25c0,0.553-0.447,1-1,1H11c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h16C27.553,24,28,24.447,28,25L28,25z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tick.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tick.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tick.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<path d="M28.081,5.586c-0.78-0.781-2.047-0.781-2.828,0l-14.849,14.85l-5.657-5.657c-0.781-0.781-2.048-0.781-2.828,0  c-0.781,0.781-0.781,2.048,0,2.828l7.07,7.071c0.781,0.781,2.048,0.781,2.829,0L28.081,8.414  C28.862,7.634,28.862,6.367,28.081,5.586z"/>
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<polygon points="29,6.029 26.172,3.201 10.018,19.354 3.143,12.48 0.314,15.308 10.007,25 10.019,24.988 10.03,25 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tip.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tip.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tip.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect height="2" width="10" x="10" y="23"/>
+<path d="M12,28h6c1.104,0,2-0.896,2-2H10C10,27.104,10.896,28,12,28z"/>
+<path d="M15,2c-4.971,0-9,2.864-9,9c0,3.221,1.383,6.082,3.271,8.083L10,22h10l0.729-2.917C22.617,17.082,24,14.221,24,11  C24,4.864,19.971,2,15,2z M17.444,18c-0.422,0.31-0.845,0.55-1.247,0.719c-0.037,0.016-0.072,0.028-0.108,0.042  c-0.154,0.061-0.304,0.107-0.45,0.145c-0.045,0.012-0.091,0.024-0.135,0.034C15.328,18.977,15.158,19,15,19  s-0.328-0.023-0.503-0.061c-0.044-0.01-0.09-0.022-0.135-0.034c-0.146-0.037-0.296-0.084-0.45-0.145  c-0.036-0.014-0.072-0.026-0.108-0.042C13.4,18.55,12.978,18.31,12.556,18C10.761,16.684,9,14.162,9,11c0-4.959,3.263-6,6-6  s6,1.041,6,6C21,14.162,19.238,16.684,17.444,18z"/>
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="2" width="10" x="10" y="23"/>
-<rect height="2" width="10" x="10" y="26"/>
-<path d="M24,10.889C24,4.753,19.971,2,15,2s-9,2.753-9,8.889c0,3.335,1.196,6.32,3.082,8.356L10,22h10l0.918-2.755  C22.804,17.209,24,14.224,24,10.889z M15,5c3.981,0,6,1.981,6,5.889C21,15.285,18.252,19,15,19s-6-3.715-6-8.111  C9,6.981,11.019,5,15,5z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_two.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_two.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_two.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M13.5,22.69c0.035-0.788,0.244-1.511,0.625-2.169,0.381-0.659,0.85-1.264,1.406-1.813,0.556-0.548,1.326-1.234,2.314-2.057,1.766-1.46,2.887-2.656,3.362-3.59s0.714-1.883,0.714-2.847c0-1.717-0.53-3.015-1.588-3.895-1.05-0.875-2.59-1.315-4.63-1.315-1.65,0-3.345,0.27-5.085,0.81v2.362h0.027c1.658-0.593,3.071-0.89,4.237-0.89,1.103,0,1.931,0.259,2.481,0.776,0.553,0.519,0.828,1.289,0.828,2.316,0,0.584-0.171,1.172-0.512,1.765s-1.162,1.429-2.462,2.509c-1.085,0.902-1.982,1.732-2.69,2.488-0.709,0.756-1.305,1.671-1.789,2.741s-0.73,2.29-0.73,3.67v1.45h12v-2.31h-8.502z"/>
+</g>
+<path d="M13.498,22.69c0.036-0.788,0.244-1.511,0.626-2.169c0.381-0.659,0.849-1.264,1.406-1.813  c0.556-0.548,1.326-1.234,2.314-2.057c1.766-1.46,2.887-2.656,3.362-3.59s0.714-1.883,0.714-2.847c0-1.717-0.53-3.015-1.588-3.895  C19.273,5.44,17.727,5,15.69,5c-1.65,0-3.345,0.27-5.085,0.81v2.362h0.027c1.659-0.593,3.072-0.89,4.238-0.89  c1.103,0,1.931,0.259,2.481,0.776c0.553,0.519,0.828,1.289,0.828,2.316c0,0.584-0.171,1.172-0.512,1.765s-1.162,1.429-2.462,2.509  c-1.085,0.902-1.982,1.732-2.69,2.488c-0.708,0.756-1.305,1.671-1.789,2.741S10,22.174,10,23.553V25h12v-2.31H13.498z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M23.14,19.59v-6.889h-6.89v5.018h-2.298v-5.018h-6.884v6.889h5.018l-0.014,2.316-5.029,0.029,0.031,6.839,6.837-0.028,0.014-4.994h2.326v5.018h6.886v-6.886h-5.019v-2.294h5.015zm-6.86,2.3h-0.03v0.026h-2.324v-2.32h0.027v-0.031h2.297v0.025h0.025v2.286z"/>
-<polygon points="15.12,4.63,26.1,15.57,27.39,14.28,15.06,1.913,2.721,14.25,4.148,15.64"/>
-<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.83"/>
-<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.83"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M23.349,19.388v-7.117h-7.115v5.185H13.86v-5.185H6.744v7.117h5.186l-0.015,2.395l-5.197,0.031L6.75,28.88l7.065-0.029  l0.014-5.162h2.404v5.187h7.115v-7.116h-5.186v-2.371H23.349z M16.26,21.759h-0.026v0.027h-2.401v-2.398h0.028v-0.031h2.373v0.026  h0.026V21.759z"/>
+<polygon points="15.071,3.928 26.414,15.233 27.746,13.901 15,1.12 2.254,13.866 3.729,15.306 "/>
+<rect fill="none" height="30" width="30"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_attach.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_attach.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_attach.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M16.08,11.41v-3.592h-3.592v2.619h-1.198v-2.622h-3.59v3.595h2.62l-0.011,1.209-2.622,0.017,0.012,3.57,3.571-0.014,0.006-2.607h1.216v2.62h3.592v-3.595h-2.62v-1.197l2.61-0.01zm-3.57,1.2h-0.014v0.017h-1.216v-1.213h0.018v-0.015h1.198v0.015h0.014v1.19z"/>
-<polygon points="11.91,3.607,17.64,9.316,18.3,8.643,11.87,2.188,5.433,8.625,6.178,9.352"/>
-<polygon points="17.26,22.44,18.62,24.63,22.36,24.63,21,22.44"/>
-<polygon points="11.42,22.44,12.78,24.63,16.51,24.63,15.14,22.44"/>
-<polygon points="23.12,22.44,24.25,24.26,24.25,22.44"/>
-<polygon points="10.66,24.63,10.67,24.63,9.303,22.44,6.724,22.44,10.51,28.5,12.36,27.35,11.72,26.32"/>
-<polygon points="20.26,17.92,21.62,20.11,24.25,20.11,20.46,14.05,18.6,15.21,20.28,17.92"/>
-<polygon points="19.51,20.11,18.14,17.92,14.46,17.92,15.82,20.11"/>
-<polygon points="6.724,18.28,6.724,20.11,7.859,20.11"/>
-<polygon points="13.7,20.11,12.34,17.92,8.615,17.92,9.979,20.11"/>
-<rect fill="none" height="29.03" width="29.03" x="0.323" y="0.83"/>
-<rect fill="none" height="29.03" width="29.03" x="0.323" y="0.83"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M16.288,10.937V7.222h-3.712v2.707h-1.238V7.222H7.623v3.715h2.708l-0.012,1.251L7.61,12.204l0.013,3.687l3.69-0.015  l0.007-2.693h1.256v2.706h3.712v-3.715h-2.707v-1.237H16.288z M12.591,12.174h-0.015v0.018H11.32v-1.255h0.018v-0.014h1.238v0.014  h0.015V12.174z"/>
+<polygon points="11.97,2.87 17.889,8.771 18.581,8.074 11.931,1.403 5.28,8.056 6.05,8.808 "/>
+<polygon points="17.505,22.329 18.913,24.599 22.773,24.599 21.365,22.329 "/>
+<polygon points="11.471,22.329 12.877,24.599 16.725,24.599 15.312,22.329 "/>
+<polygon points="23.556,22.329 24.722,24.208 24.722,22.329 "/>
+<polygon points="10.684,24.599 10.688,24.599 9.28,22.329 6.614,22.329 10.529,28.597 12.435,27.403 11.773,26.341 "/>
+<polygon points="20.604,17.657 22.013,19.925 24.722,19.925 20.81,13.659 18.882,14.86 20.626,17.657 "/>
+<polygon points="19.824,19.925 18.413,17.657 14.607,17.657 16.016,19.925 "/>
+<polygon points="6.614,18.033 6.614,19.925 7.787,19.925 "/>
+<polygon points="13.825,19.925 12.419,17.657 8.569,17.657 9.978,19.925 "/>
+<rect fill="none" height="30" width="30"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_context.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_context.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_context.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M16.46,11.48v-3.576h-3.577v2.608h-1.194v-2.606h-3.58v3.581h2.609l-0.01,1.205-2.613,0.016,0.015,3.553,3.556-0.013,0.007-2.597h1.21v2.609h3.578v-3.581h-2.61v-1.192h2.605zm-3.56,1.2h-0.014v0.018h-1.21v-1.209h0.017v-0.014h1.194v0.014h0.014v1.187z"/>
-<polygon points="12.3,3.709,18.01,9.396,18.68,8.726,12.27,2.296,5.854,8.708,6.596,9.432"/>
-<polygon points="24.67,22.35,7.215,22.35,10.99,28.39,12.84,27.24,11.16,24.54,11.17,24.54,11.17,24.54,24.67,24.54"/>
-<polygon points="20.9,14,19.04,15.16,20.72,17.85,7.215,17.85,7.215,20.04,24.67,20.03"/>
-<rect fill="none" height="29.03" width="29.03" x="0.746" y="0.83"/>
-<rect fill="none" height="29.03" width="29.03" x="0.746" y="0.83"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M16.243,11.011V7.312h-3.696v2.695h-1.234V7.312H7.614v3.699h2.696L10.3,12.257l-2.7,0.016l0.015,3.672l3.675-0.014  l0.007-2.684h1.251v2.695h3.697v-3.699h-2.697v-1.232H16.243z M12.561,12.243h-0.014v0.018h-1.251v-1.25h0.017v-0.014h1.234v0.014  h0.014V12.243z"/>
+<polygon points="11.942,2.976 17.837,8.853 18.528,8.159 11.904,1.517 5.279,8.142 6.045,8.89 "/>
+<polygon points="24.721,22.241 6.685,22.243 10.585,28.483 12.499,27.29 10.759,24.503 10.773,24.503 10.77,24.503 24.721,24.503   "/>
+<polygon points="20.822,13.606 18.908,14.804 20.64,17.589 6.685,17.591 6.685,19.849 24.721,19.847 "/>
+<rect fill="none" height="30" width="30"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_multipdp.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_multipdp.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_multipdp.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M15.86,11.48v-3.576h-3.576v2.608h-1.194v-2.606h-3.58v3.581h2.609l-0.009,1.205-2.613,0.016,0.014,3.553,3.556-0.013,0.007-2.597h1.211v2.609h3.577v-3.581h-2.62v-1.192h2.607zm-3.56,1.2h-0.014v0.018h-1.22v-1.209h0.017v-0.014h1.194v0.014h0.014v1.187z"/>
-<polygon points="11.7,3.709,17.4,9.396,18.07,8.726,11.66,2.296,5.248,8.708,5.99,9.432"/>
-<polygon points="24.06,22.35,6.608,22.35,10.38,28.39,12.24,27.24,10.55,24.54,10.56,24.54,10.56,24.54,24.06,24.54"/>
-<polygon points="20.29,14,18.44,15.16,20.11,17.85,6.608,17.85,6.608,20.04,24.06,20.03"/>
-<polygon points="10.35,28.39,12.21,27.23,10.53,24.53,13.27,24.53,15.68,28.39,17.53,27.23,15.85,24.53,24.04,24.53,24.04,22.34,6.583,22.34"/>
-<rect fill="none" height="29.03" width="29.03" x="0.14" y="0.83"/>
-<rect fill="none" height="29.03" width="29.03" x="0.14" y="0.83"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M16.243,11.011V7.312h-3.696v2.695h-1.234V7.312H7.614v3.699h2.696L10.3,12.257l-2.7,0.016l0.015,3.672l3.674-0.014  l0.008-2.684h1.251v2.695h3.697v-3.699h-2.697v-1.232H16.243z M12.561,12.243h-0.014v0.018h-1.251v-1.25h0.017v-0.014h1.234v0.014  h0.014V12.243z"/>
+<polygon points="11.942,2.976 17.837,8.853 18.528,8.159 11.904,1.517 5.279,8.142 6.046,8.89 "/>
+<polygon points="24.721,22.241 6.685,22.243 10.585,28.483 12.499,27.29 10.759,24.503 10.772,24.503 10.77,24.503 24.721,24.503   "/>
+<polygon points="20.821,13.606 18.908,14.804 20.64,17.589 6.685,17.591 6.685,19.849 24.721,19.847 "/>
+<polygon points="10.556,28.477 12.474,27.278 10.739,24.49 13.57,24.49 16.057,28.477 17.97,27.278 16.238,24.49 24.694,24.49   24.694,22.232 6.659,22.232 "/>
+<rect fill="none" height="30" width="30"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_suspended.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_suspended.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_suspended.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M16.6,11.44v-3.592h-3.59v2.619h-1.2v-2.622h-3.587v3.594h2.621l-0.011,1.21-2.625,0.016,0.015,3.568,3.569-0.014,0.009-2.607h1.215v2.62h3.592v-3.6h-2.621v-1.197h2.61zm-3.57,1.2h-0.013v0.017h-1.22v-1.213h0.015v-0.02h1.2v0.014h0.013v1.2z"/>
-<polygon points="12.43,3.636,18.16,9.345,18.83,8.672,12.39,2.217,5.953,8.654,6.698,9.381"/>
-<polygon points="24.77,22.38,24.77,24.57,20.8,24.57,20.8,24.57,15.42,24.57,17.24,22.38"/>
-<polygon points="7.246,22.38,12.02,22.38,10.17,24.57,7.246,24.57"/>
-<polygon points="24.77,17.85,24.77,20.05,19.19,20.05,21.02,17.85"/>
-<polygon points="7.246,20.05,7.246,17.85,15.83,17.85,13.98,20.05"/>
-<polygon points="21.8,15.4,21.86,15.46,21.82,15.51,11.84,27.4,10.94,28.47,9.261,27.06,10.54,25.53,20.18,14.05"/>
-<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.83"/>
-<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.83"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M16.286,10.968V7.253h-3.71v2.706h-1.24V7.253H7.623v3.715h2.708l-0.011,1.25l-2.712,0.017l0.015,3.687l3.688-0.014  l0.009-2.695h1.256v2.707h3.712v-3.715h-2.709v-1.236H16.286z M12.589,12.204h-0.013v0.018H11.32v-1.254h0.016v-0.015h1.24v0.015  h0.013V12.204z"/>
+<polygon points="11.968,2.9 17.887,8.8 18.582,8.104 11.931,1.435 5.278,8.087 6.048,8.837 "/>
+<polygon points="24.72,22.266 24.72,24.532 20.62,24.532 20.62,24.532 15.057,24.532 16.946,22.266 "/>
+<polygon points="6.614,22.266 11.55,22.266 9.636,24.532 6.614,24.532 "/>
+<polygon points="24.72,17.593 24.72,19.86 18.954,19.86 20.849,17.593 "/>
+<polygon points="6.614,19.86 6.614,17.591 15.486,17.591 13.574,19.86 "/>
+<polygon points="21.65,15.058 21.719,15.116 21.673,15.172 11.362,27.458 10.432,28.565 8.696,27.106 10.021,25.528 19.981,13.659   "/>
+<rect fill="none" height="30" width="30"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unblock.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unblock.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unblock.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<path d="M13.116,23.909c-0.544-0.116-1.07-0.276-1.574-0.483l1.558-2.225  c0.424-3.082,2.324-5.697,4.971-7.099l3.658-5.225c1.07,1.175,1.836,2.629,2.179,4.238c1.504,0.225,2.893,0.799,4.081,1.644  C27.857,7.702,22.087,2,15,2C7.832,2,2,7.831,2,15c0,7.088,5.703,12.857,12.76,12.988C13.915,26.8,13.342,25.412,13.116,23.909z   M5.889,15c0-5.024,4.088-9.111,9.111-9.111c1.225,0,2.391,0.246,3.458,0.686L8.271,21.122C6.797,19.503,5.889,17.358,5.889,15z" fill-rule="evenodd"/>
-<path d="M22.5,15c-4.136,0-7.5,3.364-7.5,7.5s3.364,7.5,7.5,7.5s7.5-3.364,7.5-7.5S26.636,15,22.5,15z M22.5,28  c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5s5.5,2.468,5.5,5.5S25.533,28,22.5,28z"/>
-<rect height="3" transform="matrix(0.7071 -0.7072 0.7072 0.7071 -9.3196 22.502)" width="9" x="18" y="20.999"/>
-<rect height="3" transform="matrix(-0.7071 -0.7072 0.7072 -0.7071 22.4979 54.319)" width="9" x="18" y="21"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-2 -2 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M12.055,21.932c-1.396-0.15-2.703-0.605-3.837-1.321L20.611,8.218c0.715,1.133,1.17,2.437,1.32,3.832  c1.455,0.149,2.836,0.645,4.043,1.448C25.98,13.332,26,13.168,26,13c0-7.168-5.832-13-13-13S0,5.832,0,13s5.832,13,13,13  c0.169,0,0.332-0.02,0.5-0.025C12.682,24.742,12.201,23.352,12.055,21.932z M4,13c0-4.963,4.037-9,9-9  c1.758,0,3.395,0.515,4.782,1.39L5.39,17.782C4.514,16.395,4,14.758,4,13z"/>
+<path d="M25.949,16.051c-2.732-2.733-7.166-2.733-9.898,0c-2.734,2.734-2.734,7.166,0,9.899c2.732,2.732,7.164,2.734,9.898,0  C28.684,23.217,28.684,18.783,25.949,16.051z M21,22.414l-2.828,2.829l-1.414-1.414L19.586,21l-2.828-2.828l1.414-1.414L21,19.586  l2.828-2.828l1.414,1.414L22.414,21l2.828,2.829l-1.414,1.414L21,22.414z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_underline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_underline.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_underline.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M8.212,23.309C9.686,24.436,11.971,25,15.065,25c2.909,0,5.126-0.576,6.65-1.729C23.239,22.119,24,20.236,24,18V3.924  h-0.008C23.951,2.854,23.078,2,22,2h-1c-1.078,0-1.951,0.854-1.992,1.924H19V18c0,1.494-0.356,2.91-0.971,3.551  c-0.614,0.639-1.612,0.959-3,0.959c-1.389,0-2.397-0.324-3.022-0.975C11.38,20.887,11,19.475,11,18V3.924h-0.008  C10.951,2.854,10.079,2,9,2H8C6.921,2,6.049,2.854,6.008,3.924H6V18C6,20.344,6.737,22.18,8.212,23.309z"/>
+<path d="M24,26H6c-0.553,0-1,0.447-1,1s0.447,1,1,1h18c0.553,0,1-0.447,1-1S24.553,26,24,26z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M15.04,22.66c2.177,0,3.83-0.579,4.964-1.736,1.134-1.156,1.7-2.857,1.7-5.104v-12.82h-3.163v13.07c0,1.6-0.278,2.74-0.831,3.428-0.554,0.686-1.454,1.029-2.7,1.029-1.234,0-2.136-0.35-2.699-1.045-0.564-0.696-0.846-1.834-0.846-3.412v-13.07h-3.161v12.73c0,2.354,0.551,4.096,1.648,5.229s2.793,1.7,5.093,1.7zm-9.005,2.38v1.96h17.93v-1.956h-17.92z"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unknown.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unknown.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unknown.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.202"/>
-<path d="M17.84,25.04c0,1.713-1.393,3.11-3.113,3.11s-3.115-1.397-3.115-3.11c0-1.717,1.395-3.115,3.115-3.115s3.1,1.4,3.1,3.12z"/>
-<path d="M15.28,1.285c-2.324,0-3.988,0.716-5.086,2.191-1.04,1.396-1.688,3.248-1.918,5.509l3.837,0.662c0.161-1.211,0.444-2.098,0.862-2.689,0.565-0.796,1.331-1.214,2.223-1.214,1.052,0,1.636,0.476,1.941,0.877,0.395,0.515,0.598,1.217,0.598,2.083,0,0.886-0.437,1.832-1.295,2.805-1.35,1.568-2.227,2.667-2.598,3.262-0.359,0.576-0.631,1.217-0.805,1.906-0.185,0.697-0.279,1.639-0.281,2.793h3.725c0.048-0.754,0.179-1.393,0.388-1.936,0.285-0.721,0.901-1.594,1.89-2.687,1.256-1.382,2.096-2.552,2.488-3.476,0.388-0.909,0.585-1.868,0.585-2.838,0-2.417-0.739-4.287-2.255-5.72-1.09-1.017-2.49-1.517-4.3-1.517z"/>
-<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.202"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M21.684,2.715C20.141,1.572,17.908,1,14.988,1C13.231,1,11.235,1.41,9,2c0,0-2,1.256,0,3.128  c1.977-0.565,3.683-0.849,5.116-0.849c1.473,0,2.578,0.314,3.313,0.943c0.736,0.629,1.105,1.571,1.105,2.827  c0,0.603-0.152,1.22-0.456,1.848c-0.303,0.628-1.095,1.545-2.374,2.752c-1.214,1.118-2.112,2.143-2.693,3.072  c-0.581,0.931-1.012,2.03-1.012,3.3V21c0,0.553,1.119,1,2.5,1s2.5-0.447,2.5-1v-1.715c0-0.767,0.269-1.443,0.682-2.027  c0.414-0.584,1.234-1.467,2.462-2.648c1.68-1.633,2.742-2.943,3.188-3.93C23.777,9.693,24,8.729,24,7.786  C24,5.549,23.228,3.859,21.684,2.715z"/>
+<circle cx="14.5" cy="26.5" r="3"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_update_existing.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_update_existing.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_update_existing.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<g>
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M8.572,15.788h5.857l0.001,0.001c-0.037-0.108-0.073-0.217-0.08-0.318c-0.007-0.1-0.005-0.241-0.002-0.377  c-0.362-0.547-0.454-1.237-0.196-1.859C14.462,12.487,15.191,12,16,12h0.995c1.005-2.141,0.63-7.293,0.63-7.293  C17.625,2.538,14.383,0,12.189,0h-1.391C8.605,0,5.375,2.538,5.375,4.707c0,0-0.332,5.294,0.658,7.392  c0.544,1.145,1.503,2.076,2.615,2.806c0.002,0.148,0.014,0.419,0.004,0.566C8.646,15.572,8.609,15.68,8.572,15.788z"/>
-<path d="M14,21.5c0-1.65,0.469-3.185,1.248-4.515c-0.126-0.134-0.242-0.266-0.345-0.395L11.5,24.286l-3.401-7.694  C6.401,18.725,1.294,21.482,1,21.87V28h15.792C15.075,26.36,14,24.056,14,21.5z"/>
-<path d="M30,21.5c0-3.52-2.613-6.433-6-6.92v2.021c2.28,0.464,4,2.483,4,4.898c0,1.506-0.669,2.857-1.726,3.774L24,23v3.398v2.021  V29h6l-2.316-2.316C29.103,25.404,30,23.558,30,21.5z"/>
-<path d="M18.316,16.316C16.897,17.596,16,19.442,16,21.5c0,3.52,2.613,6.433,6,6.92v-2.021c-2.28-0.464-4-2.483-4-4.898  c0-1.506,0.669-2.857,1.726-3.774L22,20v-3.398V14.58V14h-6L18.316,16.316z"/>
+<path d="M24,16.08v2.021c2.282,0.464,4,2.48,4,4.899s-1.718,4.436-4,4.899v2.021c3.391-0.486,6-3.395,6-6.92S27.391,16.566,24,16.08  z"/>
+<path d="M18.581,17.581C17.007,18.862,16,20.812,16,23c0,3.525,2.609,6.434,6,6.92v-2.021c-2.282-0.464-4-2.48-4-4.899  c0-1.637,0.797-3.075,2.013-3.987L22,21v-2.899V16.08V16h-5L18.581,17.581z"/>
+<path d="M14,23c0-1.897,0.613-3.676,1.649-5.146c-0.684-0.348-1.251-0.944-1.251-1.945V15.48c0-0.188,0.093-0.365,0.245-0.479  C16.652,13.566,18,10.619,18,7.66C18,3.434,15.309,0,12,0S6,3.434,6,7.66c0,2.959,1.348,5.906,3.352,7.342  c0.157,0.113,0.245,0.291,0.245,0.479v0.428c0,1.695-1.636,2.33-2.999,2.359C0.673,18.85,0.024,25.664,0,26h14.528  C14.189,25.056,14,24.046,14,23z"/>
+<polygon points="24,25 29,30 24,30 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_usb.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_usb.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_usb.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect height="2" width="3" x="10" y="6"/>
+<rect height="2" width="3" x="17" y="6"/>
+<path d="M24,9V3c0-1.104-0.896-2-2-2H8C6.896,1,6,1.896,6,3v6c-1.104,0-2,0.896-2,2v7c0,6.075,4.925,11,11,11s11-4.925,11-11v-7  C26,9.896,25.104,9,24,9z M21,18h-1v1.5c0,1.379-1.121,2.5-2.5,2.5H16v3h1v2h-4v-2h1v-2h-1.5c-1.379,0-2.5-1.121-2.5-2.5V20H9v-2h1  h1h1v2h-1v0.5c0,0.827,0.673,1.5,1.5,1.5H14v-7h-2l3-4l3,4h-2v6h1.5c0.827,0,1.5-0.673,1.5-1.5V18h-1v-2h3V18z M22,10H8V3h14V10z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="2" width="3" x="10" y="6"/>
-<rect height="2" width="3" x="17" y="6"/>
-<path d="M24,9V1H6v8c-1.104,0-2,0.896-2,2v7c0,6.075,4.925,11,11,11s11-4.925,11-11v-7C26,9.896,25.104,9,24,9z M8,3h14v6H8V3z   M21,18h-1v1.5c0,1.379-1.121,2.5-2.5,2.5H16v3h1v2h-4v-2h1v-2h-1.5c-1.378,0-2.5-1.121-2.5-2.5V20H9v-2h1h1h1v2h-1v0.5  c0,0.827,0.673,1.5,1.5,1.5H14v-7h-2l3-4l3,4h-2v6h1.5c0.827,0,1.5-0.673,1.5-1.5V18h-1v-2h3V18z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_user_defined.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_user_defined.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_user_defined.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M27,4H3C1.896,4,1,4.896,1,6v18c0,1.104,0.896,2,2,2h24c1.104,0,2-0.896,2-2V6C29,4.896,28.104,4,27,4z M19.565,20.2h-2.26  v-6.442l-1.6,3.052h-1.028l-1.606-3.055V20.2h-2.267V9.607h1.894l2.497,4.754l2.497-4.754h1.873V20.2z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30" x="0.002"/>
+<rect fill="none" height="30" width="30"/>
 </g>
-<path d="M1,3v24h28v-24h-28zm25,21h-22v-18h22v18z"/>
-<path d="M19.78,9.176v11.65h-2.125v-8.062l-2.195,4.187h-0.898l-2.203-4.187v8.062h-2.133v-11.64h1.797l2.992,5.695,2.992-5.695h1.767z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<polygon points="21.136,15.894 22.797,15.894 21.978,12.576 "/>
+<path d="M27,4H3C1.896,4,1,4.896,1,6v18c0,1.104,0.896,2,2,2h24c1.104,0,2-0.896,2-2V6C29,4.896,28.104,4,27,4z M9.342,19.2H7.225  l-2.427-9.137h2.1l1.538,6.398l1.581-6.398h1.855L9.342,19.2z M18.208,19.2h-1.256l-0.17-0.552  c-0.151,0.156-0.333,0.288-0.542,0.393c-0.336,0.168-0.697,0.253-1.074,0.253c-1.041,0-1.839-0.385-2.373-1.143  c-0.525-0.747-0.781-1.933-0.781-3.628c0-1.455,0.326-2.588,0.969-3.365c0.652-0.788,1.622-1.188,2.882-1.188  c0.633,0,1.236,0.079,1.794,0.236l0.146,0.04v1.417l-0.258-0.077c-0.463-0.139-0.99-0.208-1.565-0.208  c-0.614,0-1.067,0.253-1.385,0.774c-0.333,0.545-0.501,1.331-0.501,2.336c0,1.341,0.123,2.266,0.365,2.749  c0.223,0.444,0.533,0.66,0.946,0.66c0.252,0,0.445-0.085,0.591-0.259c0.153-0.186,0.229-0.43,0.229-0.748v-1.435h-1.154v-1.385  h3.137V19.2z M23.643,19.2l-0.504-1.922h-2.335L20.288,19.2h-1.884l2.635-9.137h2.201l2.524,9.137H23.643z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M0.998,3v24h28V3H0.998z M25.998,24h-22V6h22V24z"/>
-<path d="M7.757,19.004L5.63,10.996h1.542l1.552,6.455l1.595-6.455h1.316l-2.219,8.008H7.757z"/>
-<path d="M14.895,19.09c-0.896,0-1.57-0.324-2.025-0.971c-0.454-0.646-0.682-1.719-0.682-3.219c0-1.297,0.282-2.285,0.846-2.969  c0.564-0.682,1.397-1.021,2.5-1.021c0.565,0,1.098,0.068,1.596,0.209v0.912c-0.444-0.133-0.938-0.197-1.487-0.197  c-0.626,0-1.103,0.266-1.427,0.797c-0.324,0.531-0.486,1.277-0.486,2.236c0,1.264,0.119,2.133,0.355,2.604s0.58,0.705,1.031,0.705  c0.286,0,0.514-0.102,0.682-0.303c0.168-0.203,0.252-0.471,0.252-0.803v-1.498h-1.058V14.67H17.5v4.334h-0.833l-0.22-0.715  c-0.15,0.25-0.367,0.447-0.65,0.588C15.514,19.02,15.213,19.09,14.895,19.09z"/>
-<path d="M22.807,19.004l-0.461-1.762h-2.423l-0.473,1.762h-1.343l2.31-8.008h1.74l2.213,8.008H22.807z M22.125,16.34l-0.982-3.98  l-1.01,3.98H22.125z"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga_wide.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga_wide.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga_wide.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<polygon points="19.732,9.388 19.166,11.62 20.284,11.62 "/>
+<path d="M18.539,17.395h-0.331v4.649h0.349c0.388,0,0.675-0.15,0.877-0.461c0.216-0.332,0.325-0.979,0.325-1.923  c0-0.834-0.108-1.436-0.322-1.785C19.239,17.552,18.946,17.395,18.539,17.395z"/>
+<path d="M27,4H3C1.896,4,1,4.896,1,6v18c0,1.104,0.896,2,2,2h24c1.104,0,2-0.896,2-2V6C29,4.896,28.104,4,27,4z M18.992,7.248h1.727  L22.64,14.2h-1.696l-0.378-1.441h-1.674L18.505,14.2h-1.519L18.992,7.248z M15.147,7.178c0.479,0,0.936,0.061,1.359,0.179  l0.146,0.04v1.168l-0.258-0.076c-0.343-0.104-0.733-0.154-1.16-0.154c-0.441,0-0.768,0.182-0.996,0.557  c-0.244,0.399-0.368,0.98-0.368,1.726c0,0.998,0.09,1.685,0.269,2.039c0.16,0.319,0.371,0.468,0.665,0.468  c0.176,0,0.305-0.056,0.405-0.176c0.105-0.129,0.159-0.307,0.159-0.529v-1.025h-0.866v-1.139h2.453V14.2h-1.029l-0.114-0.37  c-0.104,0.096-0.225,0.178-0.359,0.245c-0.261,0.13-0.539,0.195-0.828,0.195c-0.798,0-1.411-0.296-1.82-0.878  c-0.4-0.568-0.595-1.468-0.595-2.75c0-1.104,0.248-1.963,0.737-2.555C13.445,7.484,14.186,7.178,15.147,7.178z M8.462,7.248  l1.116,4.638l1.146-4.638h1.495L10.295,14.2H8.63L6.784,7.248H8.462z M16.037,17.404h-0.54v4.64h0.54V23.2h-2.694v-1.156h0.541  v-4.64h-0.541v-0.936L11.736,23.2h-1.632L9.12,18.861L8.025,23.2H6.351l-1.497-6.952h1.688l0.815,4.398l1.076-4.398h1.597  l0.99,4.398l0.901-4.398h1.422h0.053h2.642V17.404z M20.698,22.328c-0.48,0.578-1.21,0.872-2.167,0.872h-1.933v-6.952h2.063  c0.914,0,1.61,0.279,2.069,0.832c0.451,0.541,0.68,1.392,0.68,2.527C21.411,20.864,21.178,21.754,20.698,22.328z M25.876,23.2H22.07  v-6.952h3.767v1.156h-2.158v1.471h1.745v1.166h-1.745v2.003h2.197V23.2z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30" x="0.002"/>
+<rect fill="none" height="30" width="30"/>
 </g>
-<path d="M0,3v24h30v-24h-30zm27,21h-24v-18h24v18z"/>
-<path d="M5.806,17.91l-1.254-5.824h1.133l0.848,4.578,1.121-4.578h1.136l1.031,4.578,0.938-4.578h0.94l-1.391,5.824h-1.168l-1.008-4.441-1.121,4.441h-1.207z"/>
-<path d="M13.37,17.91l-1.547-5.824h1.121l1.129,4.695,1.16-4.695h0.957l-1.613,5.824h-1.212z"/>
-<path d="M18.56,17.98c-0.651,0-1.142-0.235-1.473-0.705s-0.496-1.251-0.496-2.342c0-0.942,0.205-1.662,0.615-2.158s1.017-0.744,1.818-0.744c0.411,0,0.798,0.051,1.16,0.152v0.664c-0.323-0.097-0.684-0.145-1.082-0.145-0.456,0-0.802,0.193-1.037,0.58s-0.354,0.929-0.354,1.627c0,0.919,0.086,1.55,0.258,1.893s0.422,0.514,0.75,0.514c0.208,0,0.374-0.073,0.496-0.221s0.184-0.342,0.184-0.584v-1.09h-0.77v-0.66h1.824v3.152h-0.605l-0.16-0.52c-0.109,0.183-0.267,0.325-0.473,0.428s-0.42,0.16-0.65,0.16z"/>
-<path d="M24.31,17.91l-0.336-1.281h-1.762l-0.344,1.281h-0.977l1.68-5.824h1.266l1.609,5.824h-1.137zm-0.49-1.93l-0.715-2.895-0.734,2.895h1.447z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M28,6V5c0-1.104-0.896-2-2-2H4C2.896,3,2,3.896,2,5v1h2v2H2v1c0,1.104,0.896,2,2,2h1h1v8H5H4c-1.104,0-2,0.896-2,2v1h2v2H2  v1c0,1.104,0.896,2,2,2h22c1.104,0,2-0.896,2-2v-1h-2v-2h2v-1c0-1.104-0.896-2-2-2h-2v-8h2c1.104,0,2-0.896,2-2V8h-2V6H28z M16,6h3  v2h-3V6z M11,6h3v2h-3V6z M6,6h3v2H6V6z M9,24H6v-2h3V24z M9,11h12v8H9V11z M14,24h-3v-2h3V24z M19,24h-3v-2h3V24z M24,24h-3v-2h3  V24z M24,8h-3V6h3V8z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M2,6h2v2h-2v3h4v8h-4v3h2v2h-2v3h26v-3h-2v-2h2v-3h-4v-8h4v-3h-2v-2h2v-3h-26v3zm4,0h3v2h-3v-2zm8,2h-3v-2h3v2zm2-2h3v2h-3v-2zm-10,16h3v2h-3v-2zm8,2h-3v-2h3v2zm2-2h3v2h-3v-2zm8,2h-3v-2h3v2zm-3-5h-12v-8h12v8zm3-11h-3v-2h3v2z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<rect fill="none" height="30" width="30"/>
-<path d="M10.79,10.17c1.569-1.567,4.066-3.208,5.188-3.79v0.004c0.002-0.001,0.005-0.006,0.006-0.008l1.278,2.142c0.183,0.313,0.589,0.408,0.952,0.256l7.36-4.248c0.384-0.22,0.532-0.68,0.333-1.022,0,0-0.202-0.305-0.818-1.062,0.002,0.001,0.004,0.003,0.005,0.005-0.001-0.002-0.001-0.005-0.003-0.008-0.311-0.383-0.349-0.397-0.75-0.765-1.205-1.103-2.531-1.536-2.531-1.536-0.513-0.182-2.24-0.282-4.416,0.374s-7.119,3.823-10.3,7.005c-3.18,3.183-5.9,7.49-6.42,8.854-0.814,2.148-0.74,4.517-0.563,5.205,0,0,0.169,0.513,0.56,1.211,0.005,0.007,0.01,0.016,0.015,0.024,0.038,0.068,0.076,0.136,0.119,0.207,0.001,0.002,0.004,0.001,0.005,0.002,0.21,0.35,0.464,0.729,0.783,1.114,0.374,0.449,0.392,0.578,0.785,0.925h0.003c0.723,0.636,1.021,0.83,1.021,0.83,0.345,0.224,0.827,0.103,1.08-0.268l4.794-7.042c0.254-0.372,0.186-0.856-0.158-1.078l-2.725-1.743c-0.01-0.001-0.019-0.001-0.027-0.003,0.002-0.002,0.008-0.01,0.008-0.01,1.264-2.19,2.782-3.95,4.41-5.58z"/>
-<circle cx="22" cy="18" r="3"/>
-<path d="M27,27h-3v-1.262c3.449-0.89,6-4.012,6-7.738,0-4.419-3.581-8-8-8s-8,3.581-8,8c0,3.727,2.551,6.849,6,7.738v1.26h-3c-1.1,0-2,0.9-2,2v1h14v-1c0-1.1-0.9-2-2-2zm-10-9c0-2.757,2.243-5,5-5s5,2.243,5,5-2.243,5-5,5-5-2.24-5-5z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30" y="0.001"/>
+</g>
+<path d="M10.794,10.169c1.569-1.568,4.066-3.209,5.188-3.791v0.004c0.002,0,0.005-0.006,0.006-0.008l1.278,2.143  c0.183,0.313,0.589,0.408,0.952,0.256l7.36-4.248c0.384-0.221,0.532-0.68,0.333-1.023c0,0-0.202-0.305-0.818-1.061  c0.002,0,0.004,0.002,0.005,0.004c-0.001-0.002-0.001-0.004-0.003-0.008c-0.311-0.383-0.349-0.396-0.75-0.764  c-1.205-1.104-2.531-1.537-2.531-1.537c-0.513-0.182-2.24-0.281-4.416,0.375s-7.119,3.822-10.3,7.004  c-3.18,3.184-5.9,7.49-6.42,8.855c-0.814,2.148-0.74,4.516-0.563,5.205c0,0,0.169,0.512,0.56,1.211  c0.005,0.006,0.01,0.016,0.015,0.023c0.038,0.068,0.076,0.137,0.119,0.207c0.001,0.002,0.004,0.002,0.004,0.002  c0.211,0.35,0.465,0.73,0.784,1.115c0.374,0.449,0.392,0.578,0.785,0.924c0.001,0,0.002,0,0.003,0  c0.723,0.637,1.021,0.83,1.021,0.83c0.345,0.225,0.827,0.104,1.08-0.268l4.794-7.041c0.254-0.373,0.186-0.857-0.158-1.078  l-2.725-1.744c-0.01,0-0.019,0-0.027-0.002c0.002-0.002,0.008-0.01,0.008-0.01C7.644,13.562,9.162,11.804,10.794,10.169z"/>
+<path d="M22,13.001c2.757,0,5,2.242,5,5c0,2.756-2.243,5-5,5s-5-2.244-5-5C17,15.243,19.243,13.001,22,13.001 M22,10.001  c-4.419,0-8,3.58-8,8c0,4.418,3.581,8,8,8s8-3.582,8-8C30,13.581,26.419,10.001,22,10.001L22,10.001z"/>
+<g>
+<circle cx="22" cy="18.001" r="3"/>
+</g>
+<rect height="4" width="4" x="20" y="23.001"/>
+<path d="M29,30.001v-1c0-1.1-0.9-2-2-2H17c-1.1,0-2,0.9-2,2v1H29z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_collection.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_collection.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_collection.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M27,1H8C6.896,1,6,1.896,6,3v1h20v17v3h1c1.104,0,2-0.896,2-2V3C29,1.896,28.104,1,27,1z"/>
+<rect height="5" width="7" x="9" y="15"/>
+<rect height="2" width="2" x="7" y="22"/>
+<rect height="2" width="2" x="10" y="22"/>
+<rect height="2" width="2" x="7" y="11"/>
+<rect height="2" width="2" x="13" y="11"/>
+<rect height="2" width="2" x="10" y="11"/>
+<rect height="2" width="2" x="16" y="11"/>
+<rect height="2" width="2" x="13" y="22"/>
+<path d="M22,6H3C1.896,6,1,6.896,1,8v19c0,1.104,0.896,2,2,2h19c1.104,0,2-0.896,2-2V8C24,6.896,23.104,6,22,6z M20,13  c0.553,0,1,0.447,1,1s-0.447,1-1,1h-2v5h2c0.553,0,1,0.447,1,1s-0.447,1-1,1h-1v2h1c0.553,0,1,0.447,1,1s-0.447,1-1,1H5  c-0.553,0-1-0.447-1-1s0.447-1,1-1h1v-2H5c-0.553,0-1-0.447-1-1s0.447-1,1-1h2v-5H5c-0.553,0-1-0.447-1-1s0.447-1,1-1h1v-2H5  c-0.553,0-1-0.447-1-1s0.447-1,1-1h15c0.553,0,1,0.447,1,1s-0.447,1-1,1h-1v2H20z"/>
+<rect height="2" width="2" x="16" y="22"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M6,13h2v1h-2v2h2v3h-2v2h2v1h-2v2h13v-2h-1v-1h1v-2h-2v-3h2v-2h-1v-1h1v-2h-13v2zm3,0h2v1h-2v-1zm3,1v-1h2v1h-2zm-3,7h2v1h-2v-1zm5,0v1h-2v-1h2zm3,1h-2v-1h2v1zm-2-3h-5v-3h5v3zm2-5h-2v-1h2v1z"/>
-<polygon points="5.999,1,5.999,4,26,4,26,24,29,24,29,1"/>
-<path d="M1,29h23v-23h-23v23zm3-20h17v17h-17v-17z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_services.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_services.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_services.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M14,23v1h-3v-2h3V23c0-1.439,0.346-2.794,0.946-4H9v-8h12v3.23c0.645-0.146,1.312-0.23,2-0.23c0.338,0,0.672,0.022,1,0.059  V11h2c1.104,0,2-0.896,2-2V8h-2V6h2V5c0-1.104-0.896-2-2-2H4C2.896,3,2,3.896,2,5v1h2v2H2v1c0,1.104,0.896,2,2,2h1h1v8H5H4  c-1.104,0-2,0.896-2,2v1h2v2H2v1c0,1.104,0.896,2,2,2h10.946C14.346,25.794,14,24.439,14,23z M21,6h3v2h-3V6z M16,6h3v2h-3V6z M11,6  h3v2h-3V6z M6,6h3v2H6V6z M9,24H6v-2h3V24z"/>
+<polygon points="25.063,19.561 22.313,18.875 20.293,19.635 24.375,20.938 "/>
+<path d="M29.964,22.284C29.605,18.755,26.625,16,23,16s-6.605,2.755-6.964,6.284C16.012,22.52,16,22.758,16,23  s0.012,0.48,0.036,0.716C16.395,27.246,19.375,30,23,30s6.605-2.754,6.964-6.284C29.988,23.48,30,23.242,30,23  S29.988,22.52,29.964,22.284z M26.217,26.796L26,26.6l0.116-1.6l1.273,0.344C27.091,25.9,26.695,26.39,26.217,26.796z M18.74,20.418  c0.285-0.265,1.355-1,1.355-1l-0.162-0.232c-0.016-0.035-0.01-0.071,0.004-0.108c0.203-0.158,0.416-0.298,0.643-0.425  c0.236,0.12,0.395-0.021,0.395-0.021l0.071-0.182l-0.012-0.044C21.639,18.146,22.303,18,23,18c0.496,0,0.967,0.095,1.42,0.23  l0.643,0.645l0.27-0.271c0.953,0.509,1.723,1.304,2.184,2.284l-0.48-0.088l-0.789-0.305l0.449,0.607l0.322-0.143  c0,0,0.395,0.377,0.377,0.502s-0.609,0.699-0.609,0.699l-0.519,0.186l-0.684-0.563l-0.521-0.43l0.323,0.771l0.431,0.447  c0,0,0.754-0.107,0.86-0.018c0.108,0.09-0.143,0.771-0.143,0.771l-1.256,1.291l-0.126,1.291c-0.699,0.359-0.771,0.912-0.771,0.912  s-0.178-0.033-0.645,0.488c-0.467,0.518-0.969,0.383-0.969,0.383c-0.592,0-0.699-0.383-0.699-0.51c0-0.125-0.592-1.094-0.592-1.418  c0-0.322,0.18-0.717,0.18-0.717c0.035-0.467-0.467-1.721-0.467-1.721h-0.52l-0.18-0.395c-1.686,0.359-1.758-0.072-2.009-0.539  c-0.195-0.363-0.065-1.197,0.079-1.645C18.617,20.637,18.676,20.525,18.74,20.418z M19.066,24.025L20,24.959l-1.152,0.822  c-0.355-0.529-0.613-1.129-0.746-1.774L19.066,24.025z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M13.13,21c0.17-1.069,0.508-2.081,1.003-3h-5.13v-8h12v3.13c0.49-0.078,0.988-0.13,1.5-0.13s1.01,0.052,1.5,0.13v-3.13h4v-3h-2v-2h2v-3h-26v3h2v2h-2v3h4v8h-4v3h2v2h-2v3h11.67c-0.371-0.937-0.594-1.945-0.648-3h-2.02v-2h2.13zm7.87-16h3v2h-3v-2zm-5,0h3v2h-3v-2zm-5,0h3v2h-3v-2zm-5,0h3v2h-3v-2zm3,18h-3v-2h3v2z"/>
-<polygon points="19.6,18.89,23.97,20.29,24.71,18.82,21.76,18.08"/>
-<path d="M22.5,15c-4.143,0-7.5,3.357-7.5,7.5s3.357,7.5,7.5,7.5,7.5-3.357,7.5-7.5-3.36-7.5-7.5-7.5zm3.96,5.47l0.346-0.152s0.422,0.403,0.403,0.537c-0.019,0.135-0.653,0.749-0.653,0.749l-0.56,0.19-0.732-0.603-0.557-0.46,0.346,0.826,0.461,0.48s0.807-0.115,0.922-0.02-0.152,0.827-0.152,0.827l-1.346,1.383-0.135,1.383c-0.75,0.386-0.826,0.979-0.826,0.979s-0.191-0.036-0.691,0.521c-0.5,0.556-1.039,0.41-1.039,0.41-0.633,0-0.748-0.41-0.748-0.546,0-0.134-0.635-1.172-0.635-1.519,0-0.345,0.192-0.769,0.192-0.769,0.038-0.499-0.499-1.843-0.499-1.843h-0.558l-0.192-0.424c-1.806,0.385-1.883-0.077-2.152-0.577-0.268-0.499,0.039-1.843,0.212-2.055s1.519-1.134,1.519-1.134l-0.174-0.25c-0.115-0.25,0.635-0.595,0.635-0.595,0.288,0.192,0.48,0,0.48,0l0.076-0.193-0.051-0.188c0.67-0.28,1.39-0.44,2.15-0.44,0.55,0,1.08,0.083,1.581,0.234l-0.108,0.107,0.737,0.737,0.412-0.412c1.061,0.577,1.907,1.495,2.401,2.604l-0.699-0.129-0.846-0.326,0.49,0.66zm-9.25,3.51l0.79,0.02,1,1-0.97,0.692c-0.37-0.51-0.65-1.09-0.82-1.71zm8.67,2.74l0.12-1.72,1.209,0.326c-0.334,0.555-0.76,1.048-1.262,1.453l-0.07-0.06z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_virtual_input.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_virtual_input.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_virtual_input.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M28,5H2C0.896,5,0,5.896,0,7v16c0,1.104,0.896,2,2,2h26c1.104,0,2-0.896,2-2V7C30,5.896,29.104,5,28,5z M18,8h3v3h-3V8z   M13,8h3v3h-3V8z M13,12.999h3v3h-3V12.999z M8,8h3v3H8V8z M8,12.999h3v3H8V12.999z M6,21H3v-3h3V21z M6,15.999H3v-3h3V15.999z   M6,11H3V8h3V11z M21,21H8v-3h13V21z M26,21h-3v-3h3V21z M26,15.999h-8v-3h5V8h3V15.999z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M0,4v20h30v-20h-30zm18,3h3v3h-3v-3zm-5,0h3v3h-3v-3zm0,5h3v3h-3v-3.001zm-5-5h3v3h-3v-3zm0,5h3v3h-3v-3.001zm-2,8h-3v-3h3v3zm0-5h-3v-3h3v2.999zm0-5h-3v-3h3v3zm15,10h-13v-3h13v3zm5,0h-3v-3h3v3zm0-5h-8v-3h5v-5h3v7.999z"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_voice_mailbox.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_voice_mailbox.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_voice_mailbox.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M23.5,8.5c-3.59,0-6.5,2.91-6.5,6.5,0,1.748,0.693,3.332,1.816,4.5h-7.633c1.12-1.17,1.81-2.75,1.81-4.5,0-3.59-2.91-6.5-6.5-6.5s-6.5,2.91-6.5,6.5,2.91,6.5,6.5,6.5h17c3.59,0,6.5-2.91,6.5-6.5s-2.91-6.5-6.5-6.5zm-20.5,6.5c0-1.93,1.57-3.5,3.5-3.5s3.5,1.57,3.5,3.5-1.57,3.5-3.5,3.5-3.5-1.57-3.5-3.5zm20.5,3.5c-1.93,0-3.5-1.57-3.5-3.5s1.57-3.5,3.5-3.5,3.5,1.57,3.5,3.5-1.57,3.5-3.5,3.5z"/>
+</g>
+<path d="M23.5,8.5c-3.59,0-6.5,2.91-6.5,6.5c0,1.748,0.693,3.332,1.816,4.5h-7.633C12.306,18.332,13,16.748,13,15  c0-3.59-2.91-6.5-6.5-6.5S0,11.41,0,15s2.91,6.5,6.5,6.5h17c3.59,0,6.5-2.91,6.5-6.5S27.09,8.5,23.5,8.5z M3,15  c0-1.93,1.57-3.5,3.5-3.5S10,13.07,10,15s-1.57,3.5-3.5,3.5S3,16.93,3,15z M23.5,18.5c-1.93,0-3.5-1.57-3.5-3.5s1.57-3.5,3.5-3.5  S27,13.07,27,15S25.43,18.5,23.5,18.5z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_down.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_down.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_down.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M8,9H3c-1.104,0-2,0.896-2,2v8c0,1.104,0.896,2,2,2h5V9z"/>
+<path d="M14,23c0-4.274,2.998-7.855,7-8.769V4c0-0.354-0.188-0.682-0.492-0.861C20.351,3.046,20.176,3,20,3  c-0.167,0-0.334,0.042-0.486,0.126l-9,5C10.197,8.303,10,8.637,10,9v12c0,0.363,0.197,0.697,0.514,0.874l3.529,1.96  C14.017,23.56,14,23.281,14,23z"/>
+<path d="M23.936,14.049c0.711,0.074,1.395,0.239,2.047,0.47c-0.084-2.138-0.713-4.362-1.731-6.038  c-0.286-0.471-0.901-0.621-1.374-0.335c-0.472,0.287-0.622,0.901-0.335,1.374C23.307,10.777,23.791,12.416,23.936,14.049z"/>
+<path d="M23,16c-3.866,0-7,3.134-7,7s3.134,7,7,7s7-3.134,7-7S26.866,16,23,16z M18,24v-2h10v2H18z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="12" width="7" x="1" y="9"/>
-<path d="M13,22.5c0-4.727,3.474-8.646,8-9.37V3L10,8v14l3.045,1.384C13.018,23.093,13,22.799,13,22.5z"/>
-<path d="M25.916,13.646c-0.22-1.963-0.904-3.876-2.027-5.6L22.213,9.14c0.805,1.232,1.341,2.578,1.602,3.962  C24.545,13.204,25.248,13.387,25.916,13.646z"/>
-<path d="M22.5,15c-4.136,0-7.5,3.364-7.5,7.5s3.364,7.5,7.5,7.5s7.5-3.364,7.5-7.5S26.636,15,22.5,15z M22.5,28  c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5s5.5,2.468,5.5,5.5S25.533,28,22.5,28z"/>
-<rect height="3" width="9" x="18" y="21"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_up.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_up.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_up.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M8,9H3c-1.104,0-2,0.896-2,2v8c0,1.104,0.896,2,2,2h5V9z"/>
+<path d="M14,23c0-4.274,2.998-7.855,7-8.769V4c0-0.354-0.188-0.682-0.492-0.861C20.351,3.046,20.176,3,20,3  c-0.167,0-0.334,0.042-0.486,0.126l-9,5C10.197,8.303,10,8.637,10,9v12c0,0.363,0.197,0.697,0.514,0.874l3.528,1.96  C14.017,23.559,14,23.281,14,23z"/>
+<path d="M23.936,14.049c0.711,0.074,1.395,0.239,2.047,0.47c-0.084-2.138-0.713-4.362-1.731-6.038  c-0.286-0.471-0.901-0.621-1.374-0.335c-0.472,0.287-0.622,0.901-0.335,1.374C23.307,10.777,23.791,12.416,23.936,14.049z"/>
+<path d="M28,15c0,0.172-0.012,0.34-0.019,0.511c0.696,0.465,1.323,1.026,1.864,1.661C29.947,16.458,30,15.734,30,15  c0-3.035-0.866-5.909-2.575-8.544c-0.301-0.464-0.921-0.597-1.383-0.295c-0.464,0.3-0.596,0.919-0.295,1.383  C27.242,9.85,28,12.357,28,15z"/>
+<path d="M23,16c-3.866,0-7,3.134-7,7s3.134,7,7,7s7-3.134,7-7S26.866,16,23,16z M24,24v4h-2v-4h-4v-2h4v-4h2v4h4v2H24z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="12" width="7" x="1" y="9"/>
-<path d="M13,22.5c0-4.727,3.474-8.646,8-9.37V3L10,8v14l3.045,1.384C13.018,23.093,13,22.799,13,22.5z"/>
-<path d="M25.916,13.646c-0.22-1.963-0.904-3.876-2.027-5.6L22.213,9.14c0.805,1.232,1.341,2.578,1.602,3.962  C24.545,13.204,25.248,13.387,25.916,13.646z"/>
-<path d="M29.91,16.57C29.964,16.05,30,15.526,30,15c0-3.416-1.141-6.735-3.298-9.602l-1.598,1.203  c1.844,2.449,2.833,5.265,2.886,8.159C28.711,15.273,29.357,15.881,29.91,16.57z"/>
-<path d="M22.5,15c-4.136,0-7.5,3.364-7.5,7.5s3.364,7.5,7.5,7.5s7.5-3.364,7.5-7.5S26.636,15,22.5,15z M22.5,28  c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5s5.5,2.468,5.5,5.5S25.533,28,22.5,28z"/>
-<polygon points="24,21 24,18 21,18 21,21 18,21 18,24 21,24 21,27 24,27 24,24 27,24 27,21 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M10.25,14.79c1.246-0.87,1.945-2.136,1.945-3.633,0-2.197-1.599-4.414-5.167-4.414-1.955,0-3.651,0.719-4.516,1.333l-0.428,0.301,1.068,2.846,0.708-0.509c0.592-0.421,1.666-0.912,2.751-0.912,1.34,0,2.079,0.604,2.079,1.695,0,1.457-1.691,1.986-2.83,1.986h-1.854v2.935h1.855c0.561,0,3.36,0.118,3.386,2.477,0.01,0.607-0.211,1.189-0.608,1.598-0.504,0.5-1.262,0.76-2.269,0.76-1.327,0-2.6-0.544-3.134-0.868l-0.702-0.42-1.032,2.883,0.44,0.293c0.828,0.54,2.483,1.169,4.449,1.169,4.396,0,6.397-2.788,6.397-5.377,0-1.81-0.98-3.33-2.54-4.14z"/>
-<path d="M21.91,14.16v3.031h3.286v3.71c-0.373,0.11-1.022,0.236-2.133,0.236-3.517,0-5.608-2.206-5.608-5.897,0-3.621,2.248-5.872,5.869-5.872,1.342,0,2.396,0.202,3.313,0.635l0.697,0.33,0.932-3.003-0.518-0.25c-0.775-0.376-2.391-0.815-4.371-0.815-2.813,0-5.209,0.891-6.922,2.573-1.656,1.624-2.561,3.932-2.561,6.5,0,2.64,0.901,5.023,2.473,6.544,1.65,1.572,3.788,2.337,6.551,2.337,2.625,0,4.689-0.718,5.266-0.938l0.424-0.167v-8.953h-6.7z"/>
-<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.775"/>
-<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.775"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M10.031,14.484c1.288-0.898,2.01-2.207,2.01-3.754c0-2.27-1.652-4.561-5.34-4.561c-2.02,0-3.773,0.743-4.667,1.379  L1.601,7.859l1.104,2.94l0.731-0.526c0.612-0.435,1.722-0.942,2.843-0.942c1.385,0,2.148,0.624,2.148,1.752  c0,1.505-1.748,2.052-2.924,2.052H3.587v3.033h1.917c0.58,0,3.472,0.121,3.499,2.559c0.01,0.627-0.218,1.229-0.629,1.65  c-0.52,0.525-1.304,0.791-2.344,0.791c-1.371,0-2.687-0.563-3.239-0.898l-0.725-0.434l-1.067,2.979l0.455,0.303  c0.856,0.558,2.566,1.207,4.598,1.207c4.543,0,6.611-2.881,6.611-5.555C12.663,16.895,11.645,15.322,10.031,14.484z"/>
+<path d="M22.079,13.834v3.132h3.396v3.833c-0.385,0.114-1.056,0.244-2.204,0.244c-3.634,0-5.795-2.279-5.795-6.094  c0-3.742,2.323-6.067,6.065-6.067c1.386,0,2.475,0.208,3.422,0.656l0.721,0.341l0.963-3.104l-0.535-0.258  c-0.801-0.389-2.47-0.844-4.517-0.844c-2.907,0-5.382,0.922-7.152,2.66c-1.712,1.678-2.647,4.063-2.647,6.717  c0,2.727,0.931,5.191,2.556,6.762c1.705,1.625,3.914,2.414,6.769,2.414c2.713,0,4.846-0.741,5.441-0.969L29,23.084v-9.25H22.079z"/>
+<rect fill="none" height="30" width="30"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_attach.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_attach.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_attach.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="9.66,24.72,9.665,24.72,8.199,22.36,5.432,22.36,9.497,28.87,11.48,27.63,10.79,26.52"/>
-<polygon points="10.48,22.36,11.94,24.72,15.93,24.72,14.47,22.36"/>
-<polygon points="16.74,22.36,18.21,24.72,22.22,24.72,20.76,22.36"/>
-<polygon points="23.03,22.36,24.25,24.31,24.25,22.36"/>
-<polygon points="19.97,17.5,21.43,19.86,24.25,19.86,20.18,13.35,18.18,14.6,19.99,17.5"/>
-<polygon points="19.16,19.86,17.69,17.5,13.74,17.5,15.2,19.86"/>
-<polygon points="12.93,19.86,11.46,17.5,7.463,17.5,8.929,19.86"/>
-<polygon points="5.432,17.89,5.432,19.86,6.652,19.86"/>
-<path d="M11.89,6.522c0.646-0.499,1.015-1.193,1.015-2.013,0-0.698-0.272-1.336-0.764-1.802-0.542-0.512-1.313-0.779-2.238-0.779-1.125,0-2.102,0.415-2.598,0.767l-0.301,0.215,0.674,1.803,0.509-0.364c0.322-0.227,0.9-0.491,1.482-0.491,0.485,0,1.06,0.146,1.06,0.844,0,0.824-1.07,1.006-1.482,1.006h-1.146v1.857h1.148c0.295,0,1.779,0.062,1.792,1.284,0.002,0.148-0.024,0.521-0.313,0.814-0.262,0.26-0.664,0.397-1.195,0.397-0.72,0-1.409-0.298-1.699-0.472l-0.507-0.306-0.652,1.822,0.319,0.208c0.47,0.312,1.427,0.676,2.55,0.676,2.534,0,3.69-1.62,3.69-3.123,0-1.005-0.52-1.859-1.35-2.345z"/>
-<path d="M19.04,6.136v1.915h1.838v1.876c-0.242,0.064-0.57,0.12-1.084,0.12-1.901,0-3.036-1.196-3.036-3.197,0-0.982,0.297-1.794,0.859-2.348,0.554-0.547,1.358-0.836,2.323-0.836,0.735,0,1.311,0.11,1.813,0.345l0.501,0.238,0.585-1.887-0.378-0.181c-0.441-0.218-1.366-0.467-2.494-0.467-3.244,0-5.422,2.087-5.422,5.19,0,1.509,0.519,2.874,1.42,3.744,0.945,0.9,2.167,1.341,3.743,1.341,1.488,0,2.664-0.407,2.987-0.532l0.3-0.12v-5.2h-3.965z"/>
-<rect fill="none" height="29.03" width="29.03" x="0.323" y="0.775"/>
-<rect fill="none" height="29.03" width="29.03" x="0.323" y="0.775"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<polygon points="9.648,24.737 9.653,24.737 8.139,22.303 5.279,22.303 9.48,29.029 11.525,27.748 10.818,26.609 "/>
+<polygon points="10.491,22.301 12.008,24.737 16.132,24.737 14.617,22.301 "/>
+<polygon points="16.97,22.301 18.488,24.737 22.631,24.737 21.117,22.301 "/>
+<polygon points="23.469,22.301 24.721,24.32 24.721,22.301 "/>
+<polygon points="20.303,17.284 21.814,19.719 24.721,19.719 20.52,12.992 18.453,14.283 20.325,17.284 "/>
+<polygon points="19.462,19.719 17.95,17.284 13.861,17.287 15.376,19.719 "/>
+<polygon points="13.023,19.719 11.514,17.287 7.378,17.287 8.893,19.721 "/>
+<polygon points="5.279,17.688 5.279,19.721 6.54,19.721 "/>
+<path d="M11.949,5.938c0.667-0.515,1.049-1.233,1.049-2.079c0-0.721-0.281-1.381-0.789-1.862c-0.56-0.528-1.357-0.806-2.313-0.806  c-1.163,0-2.172,0.43-2.685,0.793L6.903,2.205l0.697,1.863l0.526-0.377c0.333-0.234,0.93-0.506,1.531-0.506  c0.501,0,1.095,0.15,1.095,0.871c0,0.852-1.106,1.039-1.532,1.039H8.038v1.92h1.187c0.305,0,1.838,0.064,1.852,1.326  c0.002,0.154-0.025,0.539-0.323,0.842c-0.271,0.27-0.686,0.41-1.235,0.41c-0.744,0-1.456-0.309-1.756-0.487L7.24,8.791l-0.674,1.883  l0.33,0.215c0.486,0.322,1.475,0.699,2.635,0.699c2.619,0,3.813-1.674,3.813-3.227C13.344,7.322,12.806,6.44,11.949,5.938z"/>
+<path d="M19.336,5.539v1.979h1.9v1.939c-0.251,0.066-0.59,0.125-1.121,0.125c-1.964,0-3.137-1.236-3.137-3.305  c0-1.014,0.307-1.854,0.888-2.426c0.573-0.564,1.404-0.863,2.401-0.863c0.76,0,1.354,0.113,1.874,0.355l0.518,0.246l0.604-1.949  l-0.391-0.188c-0.456-0.225-1.411-0.483-2.577-0.483c-3.352,0-5.603,2.157-5.603,5.363c0,1.56,0.536,2.97,1.468,3.868  c0.976,0.931,2.239,1.387,3.868,1.387c1.538,0,2.753-0.422,3.087-0.551l0.318-0.125V5.539H19.336z"/>
+<rect fill="none" height="30" width="30"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_context.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_context.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_context.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<polygon points="24.67,22.36,5.854,22.36,9.92,28.87,11.92,27.62,10.1,24.72,10.12,24.72,10.12,24.72,24.67,24.72"/>
-<polygon points="20.6,13.35,18.6,14.6,20.42,17.5,5.854,17.5,5.854,19.86,24.67,19.86"/>
-<path d="M12.31,6.521c0.646-0.499,1.014-1.193,1.014-2.013,0-0.698-0.271-1.336-0.761-1.802-0.542-0.512-1.316-0.78-2.239-0.78-1.124,0-2.103,0.415-2.598,0.767l-0.295,0.215,0.674,1.803,0.51-0.365c0.321-0.227,0.9-0.491,1.479-0.491,0.485,0,1.061,0.146,1.061,0.844,0,0.825-1.068,1.005-1.481,1.005h-1.144v1.857h1.149c0.295,0,1.778,0.062,1.79,1.284,0.002,0.148-0.022,0.522-0.313,0.814-0.262,0.26-0.662,0.397-1.193,0.397-0.723,0-1.411-0.298-1.701-0.472l-0.506-0.307-0.65,1.819,0.317,0.208c0.473,0.312,1.429,0.676,2.553,0.676,2.534,0,3.688-1.619,3.688-3.123,0-1.006-0.52-1.861-1.35-2.346z"/>
-<path d="M19.46,6.134v1.915h1.84v1.876c-0.244,0.065-0.572,0.12-1.084,0.12-1.902,0-3.035-1.196-3.035-3.197,0-0.982,0.294-1.794,0.856-2.348,0.554-0.547,1.358-0.835,2.325-0.835,0.736,0,1.312,0.109,1.812,0.344l0.501,0.238,0.587-1.887-0.378-0.181c-0.443-0.218-1.367-0.467-2.494-0.467-3.246,0-5.423,2.087-5.423,5.191,0,1.509,0.519,2.874,1.421,3.744,0.941,0.9,2.164,1.341,3.743,1.341,1.485,0,2.661-0.407,2.984-0.532l0.312-0.121v-5.196h-3.963z"/>
-<rect fill="none" height="29.03" width="29.03" x="0.746" y="0.775"/>
-<rect fill="none" height="29.03" width="29.03" x="0.746" y="0.775"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<polygon points="24.722,22.301 5.279,22.303 9.48,29.03 11.544,27.742 9.672,24.738 9.684,24.738 9.684,24.738 24.722,24.738 "/>
+<polygon points="20.521,12.994 18.452,14.281 20.326,17.285 5.279,17.287 5.279,19.721 24.722,19.719 "/>
+<path d="M11.948,5.938c0.667-0.516,1.048-1.234,1.048-2.08c0-0.721-0.28-1.381-0.786-1.861c-0.56-0.529-1.36-0.807-2.314-0.807  c-1.161,0-2.173,0.43-2.685,0.793L6.904,2.203l0.697,1.863l0.526-0.377c0.332-0.233,0.93-0.506,1.528-0.506  c0.501,0,1.096,0.15,1.096,0.871c0,0.853-1.104,1.039-1.531,1.039H8.039v1.92h1.187c0.305,0,1.838,0.064,1.85,1.327  c0.002,0.153-0.023,0.54-0.323,0.841c-0.271,0.27-0.684,0.41-1.233,0.41c-0.747,0-1.458-0.309-1.758-0.486L7.238,8.789l-0.672,1.883  l0.328,0.215c0.489,0.322,1.477,0.699,2.638,0.699c2.619,0,3.811-1.674,3.811-3.227C13.343,7.321,12.807,6.439,11.948,5.938z"/>
+<path d="M19.335,5.537v1.98h1.902v1.938c-0.253,0.067-0.592,0.124-1.121,0.124c-1.966,0-3.136-1.236-3.136-3.304  c0-1.015,0.304-1.854,0.885-2.427c0.573-0.564,1.404-0.863,2.403-0.863c0.761,0,1.355,0.113,1.872,0.355l0.518,0.246l0.606-1.949  l-0.391-0.188c-0.457-0.225-1.412-0.483-2.577-0.483c-3.354,0-5.604,2.157-5.604,5.364c0,1.559,0.536,2.969,1.468,3.868  c0.974,0.931,2.237,1.386,3.869,1.386c1.535,0,2.75-0.422,3.084-0.551l0.321-0.125V5.537H19.335z"/>
+<rect fill="none" height="30" width="30"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_multipdp.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_multipdp.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_multipdp.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M11.7,6.565c0.646-0.499,1.016-1.192,1.016-2.011,0-0.699-0.272-1.336-0.762-1.803-0.537-0.512-1.314-0.779-2.239-0.779-1.125,0-2.098,0.414-2.593,0.768l-0.312,0.213,0.678,1.803,0.512-0.365c0.317-0.227,0.9-0.49,1.48-0.49,0.483,0,1.062,0.147,1.062,0.844,0,0.825-1.072,1.005-1.483,1.005h-1.151v1.857h1.148c0.294,0,1.778,0.062,1.79,1.284,0.003,0.148-0.022,0.523-0.31,0.816-0.261,0.26-0.664,0.397-1.196,0.397-0.721,0-1.409-0.299-1.698-0.472l-0.504-0.303-0.649,1.824,0.317,0.207c0.472,0.312,1.428,0.676,2.552,0.676,2.533,0,3.688-1.619,3.688-3.122,0-1.012-0.52-1.865-1.35-2.353z"/>
-<path d="M18.85,6.18v1.914h1.838v1.876c-0.24,0.065-0.572,0.121-1.087,0.121-1.903,0-3.036-1.197-3.036-3.198,0-0.98,0.296-1.793,0.857-2.348,0.555-0.547,1.359-0.836,2.326-0.836,0.735,0,1.311,0.111,1.812,0.345l0.503,0.238,0.584-1.888-0.373-0.181c-0.445-0.217-1.365-0.467-2.498-0.467-3.244,0-5.421,2.087-5.421,5.19,0,1.51,0.517,2.874,1.418,3.745,0.945,0.901,2.168,1.339,3.745,1.339,1.487,0,2.661-0.407,2.99-0.532l0.309-0.121v-5.2h-3.968z"/>
-<polygon points="20,13.4,17.99,14.64,19.81,17.55,16.85,17.55,14.26,13.4,12.26,14.64,14.06,17.55,5.247,17.55,5.247,19.91,24.06,19.9"/>
-<polygon points="9.312,28.82,11.31,27.58,9.506,24.67,12.45,24.67,15.05,28.82,17.05,27.58,15.24,24.67,24.06,24.67,24.06,22.31,5.247,22.31"/>
-<rect fill="none" height="29.03" width="29.03" x="0.14" y="0.775"/>
-<rect fill="none" height="29.03" width="29.03" x="0.14" y="0.775"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M11.944,5.982c0.667-0.514,1.05-1.232,1.05-2.078c0-0.722-0.281-1.381-0.787-1.863c-0.555-0.528-1.358-0.805-2.314-0.805  c-1.162,0-2.168,0.428-2.68,0.793L6.9,2.25L7.6,4.113l0.529-0.377c0.328-0.234,0.93-0.507,1.53-0.507  c0.499,0,1.097,0.151,1.097,0.872c0,0.852-1.108,1.039-1.533,1.039H8.036V7.06h1.187c0.304,0,1.837,0.064,1.849,1.327  c0.004,0.153-0.023,0.539-0.32,0.843c-0.27,0.269-0.686,0.409-1.236,0.409C8.77,9.639,8.059,9.33,7.76,9.15L7.236,8.835  l-0.671,1.884l0.328,0.215c0.487,0.322,1.475,0.698,2.637,0.698c2.618,0,3.812-1.673,3.812-3.226  C13.346,7.369,12.807,6.486,11.944,5.982z"/>
+<path d="M19.337,5.585v1.978h1.899v1.939c-0.249,0.066-0.592,0.125-1.123,0.125c-1.967,0-3.137-1.236-3.137-3.305  c0-1.014,0.305-1.853,0.886-2.426c0.573-0.565,1.404-0.863,2.403-0.863c0.76,0,1.354,0.114,1.872,0.356l0.52,0.245l0.604-1.95  l-0.386-0.187c-0.46-0.226-1.411-0.484-2.582-0.484c-3.352,0-5.602,2.157-5.602,5.363c0,1.561,0.534,2.971,1.466,3.871  c0.977,0.93,2.24,1.384,3.87,1.384c1.537,0,2.75-0.421,3.09-0.55l0.319-0.125V5.585H19.337z"/>
+<polygon points="20.52,13.04 18.451,14.327 20.324,17.332 17.27,17.332 14.589,13.04 12.522,14.327 14.391,17.332 5.278,17.334   5.278,19.768 24.721,19.766 "/>
+<polygon points="9.479,28.984 11.543,27.694 9.679,24.689 12.725,24.689 15.408,28.984 17.473,27.694 15.604,24.689 24.721,24.689   24.721,22.256 5.278,22.256 "/>
+<rect fill="none" height="30" width="30"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_suspended.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_suspended.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_suspended.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M12.4,6.522c0.646-0.5,1.016-1.195,1.016-2.014,0-0.698-0.272-1.335-0.761-1.802-0.541-0.51-1.314-0.779-2.239-0.779-1.125,0-2.103,0.413-2.598,0.768l-0.299,0.215,0.677,1.802,0.509-0.363c0.32-0.227,0.898-0.491,1.479-0.491,0.483,0,1.061,0.146,1.061,0.843,0,0.824-1.071,1.004-1.483,1.004h-1.145v1.859h1.149c0.294,0,1.777,0.061,1.789,1.282,0.004,0.15-0.022,0.523-0.31,0.817-0.263,0.26-0.665,0.397-1.196,0.397-0.721,0-1.409-0.298-1.698-0.474l-0.504-0.304-0.653,1.821,0.321,0.208c0.47,0.312,1.427,0.675,2.552,0.675,2.534,0,3.689-1.617,3.689-3.123,0-0.995-0.52-1.848-1.36-2.335z"/>
-<path d="M19.56,6.135v1.914h1.838v1.876c-0.242,0.064-0.569,0.121-1.084,0.121-1.902,0-3.035-1.195-3.035-3.198,0-0.981,0.295-1.793,0.857-2.346,0.555-0.55,1.358-0.837,2.325-0.837,0.735,0,1.311,0.11,1.812,0.346l0.504,0.238,0.584-1.888-0.377-0.182c-0.441-0.217-1.367-0.467-2.495-0.467-3.243,0-5.421,2.087-5.421,5.191,0,1.509,0.517,2.875,1.418,3.744,0.945,0.902,2.168,1.34,3.746,1.34,1.486,0,2.66-0.407,2.986-0.532l0.309-0.119v-5.205h-3.975z"/>
-<polygon points="24.77,22.33,24.77,24.68,20.51,24.68,20.51,24.68,14.73,24.68,16.69,22.33"/>
-<polygon points="5.953,22.32,11.08,22.32,9.094,24.68,5.953,24.68"/>
-<polygon points="24.77,17.47,24.77,19.83,18.78,19.83,20.75,17.47"/>
-<polygon points="5.953,19.82,5.953,17.47,15.17,17.47,13.19,19.83"/>
-<polygon points="21.58,14.84,21.65,14.9,21.6,14.95,10.89,27.72,9.925,28.87,8.121,27.35,9.494,25.71,19.84,13.38"/>
-<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.775"/>
-<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.775"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M11.944,5.938c0.667-0.517,1.05-1.235,1.05-2.081c0-0.721-0.281-1.379-0.787-1.861c-0.559-0.527-1.358-0.805-2.314-0.805  c-1.162,0-2.173,0.426-2.684,0.793L6.9,2.205L7.6,4.067l0.526-0.376c0.331-0.234,0.928-0.506,1.529-0.506  c0.499,0,1.096,0.15,1.096,0.87c0,0.853-1.107,1.038-1.533,1.038H8.036v1.922h1.187c0.304,0,1.837,0.063,1.849,1.324  c0.004,0.154-0.023,0.541-0.32,0.844c-0.272,0.27-0.687,0.41-1.236,0.41c-0.745,0-1.456-0.309-1.755-0.49L7.236,8.791l-0.675,1.881  l0.332,0.216c0.486,0.321,1.475,0.698,2.637,0.698c2.618,0,3.812-1.672,3.812-3.227C13.342,7.322,12.804,6.441,11.944,5.938z"/>
+<path d="M19.334,5.539v1.977h1.899v1.939c-0.25,0.066-0.589,0.125-1.12,0.125c-1.967,0-3.137-1.234-3.137-3.305  c0-1.014,0.305-1.853,0.886-2.424c0.573-0.567,1.404-0.865,2.403-0.865c0.76,0,1.354,0.114,1.872,0.357l0.52,0.246l0.604-1.951  l-0.39-0.188c-0.456-0.225-1.412-0.484-2.578-0.484c-3.352,0-5.602,2.157-5.602,5.365c0,1.56,0.534,2.971,1.466,3.869  c0.977,0.932,2.24,1.385,3.87,1.385c1.537,0,2.75-0.422,3.086-0.551l0.32-0.123V5.539H19.334z"/>
+<polygon points="24.721,22.27 24.721,24.703 20.316,24.703 20.32,24.703 14.344,24.703 16.376,22.27 "/>
+<polygon points="5.278,22.266 10.58,22.266 8.523,24.703 5.278,24.703 "/>
+<polygon points="24.721,17.253 24.721,19.688 18.529,19.688 20.566,17.253 "/>
+<polygon points="5.278,19.682 5.278,17.253 14.805,17.253 12.752,19.688 "/>
+<polygon points="21.424,14.528 21.499,14.59 21.447,14.65 10.381,27.84 9.382,29.031 7.518,27.465 8.937,25.768 19.63,13.027 "/>
+<rect fill="none" height="30" width="30"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="30" width="30" y="0"/>
-<path d="M0.998,3v24h28v-24h-28zm25,21h-22v-18h22v18z"/>
-<path d="M8.205,19.37l-1.881-8.736h1.699l1.271,6.867,1.682-6.867h1.705l1.547,6.867,1.406-6.867h1.412l-2.086,8.736h-1.752l-1.512-6.662-1.682,6.662h-1.815z"/>
-<path d="M20.74,19.37h-2.713v-8.736h2.918c0.836,0,1.463,0.177,1.881,0.53s0.627,0.882,0.627,1.585c0,1-0.484,1.672-1.453,2.016,1.113,0.254,1.67,0.969,1.67,2.145,0,0.82-0.244,1.436-0.732,1.846-0.5,0.41-1.23,0.62-2.21,0.62zm-1.1-5.03h0.791c0.48,0,0.834-0.115,1.059-0.346s0.337-0.596,0.337-1.096c0-0.426-0.103-0.746-0.308-0.961s-0.512-0.322-0.918-0.322h-0.961v2.731zm0,4.04h0.885c0.521,0,0.896-0.12,1.129-0.36,0.232-0.239,0.349-0.635,0.349-1.187,0-0.517-0.12-0.896-0.36-1.144-0.24-0.247-0.615-0.368-1.127-0.368h-0.873v3.059h0.003z"/>
+<path d="M20.326,15.157h-0.673v2.658h0.685c0.461,0,0.792-0.101,0.984-0.3c0.193-0.199,0.292-0.553,0.292-1.047  c0-0.459-0.102-0.797-0.304-1.003C21.111,15.261,20.779,15.157,20.326,15.157z"/>
+<path d="M27,4H3C1.896,4,1,4.896,1,6v18c0,1.104,0.896,2,2,2h24c1.104,0,2-0.896,2-2V6C29,4.896,28.104,4,27,4z M14.93,19.2h-2.07  l-1.362-6.004L9.982,19.2H7.854l-1.968-9.137H8l1.133,6.116l1.497-6.116h2.022l1.377,6.116l1.253-6.116h1.828L14.93,19.2z   M22.881,18.538c-0.523,0.438-1.306,0.662-2.326,0.662h-2.913v-9.137h3.118c0.881,0,1.557,0.194,2.01,0.577  c0.463,0.393,0.698,0.977,0.698,1.738c0,0.904-0.368,1.569-1.097,1.982c0.872,0.366,1.313,1.096,1.313,2.178  C23.685,17.418,23.414,18.09,22.881,18.538z"/>
+<path d="M21.158,13.487c0.187-0.19,0.28-0.513,0.28-0.956c0-0.371-0.085-0.647-0.252-0.822c-0.165-0.174-0.425-0.261-0.772-0.261  h-0.761v2.324h0.591C20.666,13.772,20.974,13.677,21.158,13.487z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_cloudy.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_cloudy.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_cloudy.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" fill-rule="evenodd" height="30" width="30"/>
-<path d="M3.143,12c0-0.363,0.034-0.719,0.082-1.07H1.06C1.021,11.281,1,11.639,1,12  c0,0.363,0.021,0.719,0.06,1.072h2.165C3.177,12.721,3.143,12.365,3.143,12z" fill-rule="evenodd"/>
-<path d="M6.26,5.744L4.73,4.217C4.173,4.666,3.665,5.174,3.216,5.73L4.744,7.26  C5.179,6.689,5.688,6.18,6.26,5.744z" fill-rule="evenodd"/>
-<path d="M11,4.143c0.364,0,0.72,0.035,1.071,0.082V2.061C11.719,2.021,11.362,2,11,2  s-0.719,0.021-1.071,0.061v2.164C10.28,4.178,10.636,4.143,11,4.143z" fill-rule="evenodd"/>
-<path d="M17.256,7.26l1.528-1.529c-0.449-0.557-0.957-1.064-1.515-1.514L15.74,5.744  C16.312,6.18,16.821,6.689,17.256,7.26z" fill-rule="evenodd"/>
-<path d="M6.832,15.748c0.137-0.33,0.302-0.643,0.478-0.947  c0.11-0.201,0.229-0.395,0.354-0.584c0.001-0.002,0.002-0.004,0.003-0.006c-0.426-0.635-0.676-1.4-0.676-2.223c0-2.209,1.791-4,4-4  c1.512,0,2.812,0.85,3.492,2.086C14.81,10.039,15.137,10,15.473,10c0.409,0,0.81,0.035,1.205,0.088  c-0.795-2.383-3.039-4.1-5.688-4.1c-3.313,0-6,2.686-6,6c0,1.453,0.518,2.787,1.378,3.824C6.523,15.791,6.676,15.762,6.832,15.748z" fill-rule="evenodd"/>
-<path d="M23.523,20.045h-0.718c0.021-0.223,0.034-0.449,0.034-0.678  c0-4.068-3.298-7.367-7.367-7.367c-3.51,0-6.44,2.455-7.182,5.74c-0.212-0.02-0.428-0.031-0.646-0.031  C3.976,17.709,1,20.684,1,24.354c0,1.348,0.402,2.6,1.092,3.646h26.312C28.782,27.254,29,26.414,29,25.521  C29,22.496,26.548,20.045,23.523,20.045z" fill-rule="evenodd"/>
+<path d="M5.688,7.103C6.1,6.574,6.574,6.1,7.103,5.688L5.636,4.222c-0.391-0.391-1.023-0.391-1.414,0s-0.391,1.024,0,1.414  L5.688,7.103z"/>
+<path d="M12,4c0.339,0,0.672,0.028,1,0.069V2c0-0.553-0.447-1-1-1s-1,0.447-1,1v2.069C11.328,4.028,11.661,4,12,4z"/>
+<path d="M18.312,7.103l1.467-1.467c0.391-0.392,0.391-1.023,0-1.415c-0.391-0.39-1.023-0.391-1.415,0l-1.467,1.467  C17.426,6.099,17.9,6.573,18.312,7.103z"/>
+<path d="M4,12c0-0.34,0.028-0.672,0.069-1H2c-0.553,0-1,0.447-1,1s0.447,1,1,1h2.069C4.028,12.672,4,12.34,4,12z"/>
+<path d="M7.339,16.002c0.122-0.451,0.28-0.885,0.463-1.307C7.3,13.916,7,12.994,7,12c0-2.757,2.243-5,5-5  c1.637,0,3.079,0.802,3.992,2.021C16.161,9.013,16.329,9,16.5,9c0.654,0,1.293,0.066,1.91,0.193C17.328,6.726,14.867,5,12,5  c-3.866,0-7,3.134-7,7c0,1.527,0.495,2.938,1.326,4.088C6.658,16.041,6.995,16.008,7.339,16.002z"/>
+<path d="M18.949,27C18.969,26.834,19,26.672,19,26.5c0-2.481-2.019-4.5-4.5-4.5c-0.33,0-0.65,0.041-0.96,0.108  c-0.126-0.319-0.278-0.624-0.452-0.916C13.54,21.072,14.011,21,14.5,21c3.032,0,5.5,2.467,5.5,5.5c0,0.17-0.016,0.334-0.031,0.5  h8.818C28.923,26.522,29,26.021,29,25.5c0-2.92-2.279-5.303-5.154-5.482C23.947,19.527,24,19.02,24,18.5c0-4.142-3.359-7.5-7.5-7.5  c-4.034,0-7.317,3.19-7.484,7.186C8.529,18.068,8.023,18,7.5,18C3.91,18,1,20.91,1,24.5c0,0.887,0.179,1.73,0.5,2.5H18.949z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
+<rect fill="none" height="30" width="30"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_fluorescent.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_fluorescent.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_fluorescent.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M28,10h-1v10h1c1.104,0,2-0.896,2-2v-6C30,10.896,29.104,10,28,10z"/>
+<path d="M5,20h20V10H5V20z M22,13v4H8v-4H22z"/>
+<path d="M3,10H2c-1.104,0-2,0.896-2,2v6c0,1.104,0.896,2,2,2h1V10z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="10" width="3" y="10"/>
-<rect height="10" width="3" x="27" y="10"/>
-<path d="M5,10v10h20v-10h-20zm17,7h-14v-4h14v4z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_incandescent.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_incandescent.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_incandescent.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect height="2" width="10" x="10" y="23"/>
+<path d="M12,28h6c1.104,0,2-0.896,2-2H10C10,27.104,10.896,28,12,28z"/>
+<path d="M15,2c-4.971,0-9,2.864-9,9c0,3.221,1.383,6.082,3.271,8.083L10,22h10l0.729-2.917C22.617,17.082,24,14.221,24,11  C24,4.864,19.971,2,15,2z M16,18.795V14h1c0.553,0,1-0.448,1-1c0-0.553-0.447-1-1-1h-4c-0.553,0-1,0.447-1,1c0,0.552,0.447,1,1,1h1  v4.795C11.856,18.02,9,15.028,9,11c0-4.959,3.263-6,6-6s6,1.041,6,6C21,15.028,18.145,18.02,16,18.795z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M15,2c-5.238,0-9.5,3.701-9.5,8.25,0,2.645,1.417,5.395,3.501,7.01l1.53,4.74h8.938l1.53-4.738c2.085-1.617,3.501-4.369,3.501-7.012,0-4.549-4.26-8.25-9.5-8.25zm3.47,13.33l-1.19,3.67h-4.57l-1.184-3.668c-1.819-0.93-3.03-3.21-3.03-5.08,0-2.9,2.91-5.25,6.5-5.25s6.5,2.35,6.5,5.25c0,1.87-1.21,4.15-3.03,5.08z"/>
-<rect height="2" width="9" x="10.5" y="23"/>
-<rect height="2" width="9" x="10.5" y="26"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_sunny.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_sunny.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_sunny.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M7.259,8.673c0.423-0.518,0.896-0.991,1.414-1.414L6.515,5.101c-0.391-0.392-1.024-0.391-1.414,0  c-0.391,0.391-0.391,1.022,0,1.414L7.259,8.673z"/>
+<path d="M15,5c0.337,0,0.671,0.018,1,0.051V2c0-0.553-0.448-1-1-1c-0.553,0-1,0.447-1,1v3.051C14.329,5.018,14.663,5,15,5z"/>
+<path d="M22.741,8.673l2.158-2.158c0.391-0.392,0.391-1.024,0-1.414c-0.391-0.391-1.023-0.392-1.414,0l-2.158,2.158  C21.845,7.682,22.318,8.155,22.741,8.673z"/>
+<path d="M28,14h-3.051C24.982,14.329,25,14.662,25,15s-0.018,0.671-0.051,1H28c0.553,0,1-0.447,1-1S28.553,14,28,14z"/>
+<path d="M5,15c0-0.338,0.018-0.671,0.05-1H2c-0.553,0-1,0.447-1,1s0.447,1,1,1h3.05C5.018,15.671,5,15.338,5,15z"/>
+<path d="M22.741,21.327c-0.423,0.518-0.896,0.991-1.414,1.414l2.158,2.158c0.391,0.391,1.023,0.391,1.414,0s0.391-1.024,0-1.414  L22.741,21.327z"/>
+<path d="M15,25c-0.337,0-0.671-0.018-1-0.051V28c0,0.553,0.447,1,1,1s1-0.447,1-1v-3.051C15.671,24.982,15.337,25,15,25z"/>
+<path d="M7.259,21.327l-2.158,2.158c-0.391,0.391-0.391,1.023,0,1.414s1.023,0.391,1.414,0l2.158-2.158  C8.155,22.318,7.682,21.845,7.259,21.327z"/>
+<path d="M15,7c-4.411,0-8,3.589-8,8s3.589,8,8,8s8-3.589,8-8S19.411,7,15,7z M15,20c-2.757,0-5-2.243-5-5s2.243-5,5-5s5,2.243,5,5  S17.757,20,15,20z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M15.133,6.023c-4.971,0-9,4.029-9,9s4.029,9,9,9s9-4.029,9-9  S20.104,6.023,15.133,6.023z M15.133,21.023c-3.313,0-6-2.688-6-6c0-3.314,2.688-6,6-6c3.314,0,6,2.686,6,6  C21.133,18.336,18.447,21.023,15.133,21.023z" fill-rule="evenodd"/>
-<path d="M16.633,28.943v-4.037c-0.994,0.15-2.006,0.146-3-0.004v4.041  C14.631,29.049,15.637,29.049,16.633,28.943z" fill-rule="evenodd"/>
-<path d="M13.633,1.104v4.035c0.994-0.148,2.006-0.146,3,0.006V1.104  C15.635,0.996,14.629,0.996,13.633,1.104z" fill-rule="evenodd"/>
-<path d="M1.213,16.523h4.036c-0.149-0.994-0.146-2.006,0.005-3H1.213  C1.106,14.521,1.106,15.527,1.213,16.523z" fill-rule="evenodd"/>
-<path d="M29.053,13.523h-4.036c0.149,0.994,0.146,2.006-0.005,3h4.041  C29.159,15.525,29.159,14.52,29.053,13.523z" fill-rule="evenodd"/>
-<path d="M23.915,4.119l-2.854,2.854c0.81,0.598,1.522,1.316,2.118,2.125l2.857-2.857  C25.406,5.459,24.694,4.748,23.915,4.119z" fill-rule="evenodd"/>
-<path d="M6.351,25.926l2.854-2.854c-0.809-0.598-1.521-1.314-2.117-2.125l-2.857,2.857  C4.859,24.586,5.571,25.297,6.351,25.926z" fill-rule="evenodd"/>
-<path d="M4.229,6.24l2.854,2.855c0.598-0.811,1.315-1.523,2.125-2.119L6.351,4.119  C5.569,4.75,4.858,5.461,4.229,6.24z" fill-rule="evenodd"/>
-<path d="M26.036,23.805l-2.854-2.854c-0.598,0.809-1.315,1.521-2.125,2.117l2.857,2.857  C24.696,25.297,25.407,24.584,26.036,23.805z" fill-rule="evenodd"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.016"/>
-<polygon points="1.508,13.46,4.905,13.46,5.106,19.98,8.233,13.46,10.95,13.46,10.95,19.98,13.87,13.46,17.47,13.46,12.03,23.65,8.845,23.65,8.777,17.31,5.924,23.65,2.663,23.65"/>
-<path d="M22.78,12.06c0-1.082-1.186-1.956-2.646-1.956-1.462,0-2.649,0.874-2.649,1.956,0,0.579,0.343,1.096,0.883,1.456v10.14h3.53v-10.15c0.55-0.362,0.89-0.872,0.89-1.452z"/>
-<path d="M13.29,13.09s1.869-3.837,6.86-3.837c4.989,0,6.825,3.77,6.825,3.77s-0.916-4.89-6.926-4.89c-6.01,0.002-6.76,4.96-6.76,4.96z"/>
-<path d="M11.25,12s2.173-5.229,8.896-5.229c6.721,0,8.452,5.16,8.452,5.16s-1.56-6.519-8.554-6.519c-7,0.003-8.8,6.589-8.8,6.589z"/>
-<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.016"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<polygon points="1,13.894 4.511,13.894 4.719,20.632 7.95,13.894 10.757,13.894 10.757,20.632 13.771,13.894 17.492,13.894   11.878,24.421 8.582,24.421 8.512,17.875 5.564,24.421 2.194,24.421 "/>
+<path d="M22.984,12.442c0-1.117-1.227-2.021-2.736-2.021s-2.738,0.904-2.738,2.021c0,0.598,0.355,1.133,0.912,1.504v10.475h3.65  V13.946C22.633,13.575,22.984,13.04,22.984,12.442z"/>
+<path d="M13.177,13.509c0,0,1.931-3.965,7.089-3.965c5.156,0,7.053,3.895,7.053,3.895s-0.947-5.053-7.158-5.053  C13.946,8.386,13.177,13.509,13.177,13.509z"/>
+<path d="M11.072,12.387c0,0,2.246-5.403,9.193-5.403c6.945,0,8.734,5.332,8.734,5.332s-1.611-6.736-8.84-6.736  S11.072,12.387,11.072,12.387z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_attach.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_attach.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_attach.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="29.03" width="29.03" x="0.323" y="0.016"/>
-<polygon points="5.432,6.967,7.365,6.967,7.48,10.68,9.261,6.967,10.81,6.967,10.81,10.68,12.47,6.967,14.52,6.967,11.43,12.77,9.61,12.77,9.57,9.16,7.947,12.77,6.091,12.77"/>
-<path d="M17.54,6.166c0-0.615-0.674-1.112-1.508-1.112-0.833,0-1.508,0.498-1.508,1.112,0,0.33,0.195,0.625,0.503,0.829v5.772h2.009v-5.774c0.32-0.204,0.51-0.5,0.51-0.83z"/>
-<path d="M12.14,6.755s1.063-2.185,3.905-2.185c2.841,0,3.887,2.146,3.887,2.146s-0.521-2.784-3.944-2.784c-3.43,0-3.85,2.823-3.85,2.823z"/>
-<path d="M10.98,6.136s1.237-2.978,5.064-2.978c3.826,0,4.813,2.938,4.813,2.938s-0.889-3.711-4.87-3.711c-3.97,0-5,3.751-5,3.751z"/>
-<polygon points="9.66,22.52,9.664,22.52,8.199,20.17,5.432,20.17,9.497,26.68,11.48,25.44,10.79,24.34"/>
-<polygon points="10.48,20.16,11.94,22.52,15.93,22.52,14.47,20.16"/>
-<polygon points="16.74,20.16,18.21,22.52,22.22,22.52,20.76,20.16"/>
-<polygon points="23.03,20.16,24.25,22.12,24.25,20.16"/>
-<polygon points="19.97,15.31,21.43,17.67,24.25,17.67,20.18,11.16,18.18,12.41,19.99,15.31"/>
-<polygon points="19.16,17.67,17.69,15.31,13.74,15.31,15.2,17.67"/>
-<polygon points="12.92,17.67,11.46,15.31,7.463,15.31,8.928,17.67"/>
-<polygon points="5.432,15.7,5.432,17.67,6.651,17.67"/>
-<rect fill="none" height="29.03" width="29.03" x="0.323" y="0.016"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<polygon points="5.279,7.183 7.277,7.183 7.396,11.019 9.236,7.183 10.834,7.183 10.834,11.019 12.551,7.183 14.671,7.183   11.473,13.177 9.597,13.177 9.556,9.45 7.878,13.177 5.96,13.177 "/>
+<path d="M17.795,6.356c0-0.637-0.695-1.15-1.557-1.15c-0.859,0-1.558,0.514-1.558,1.15c0,0.34,0.201,0.645,0.52,0.855v5.965h2.075  V7.212C17.596,7.001,17.795,6.696,17.795,6.356z"/>
+<path d="M12.213,6.964c0,0,1.099-2.258,4.035-2.258c2.936,0,4.016,2.218,4.016,2.218s-0.539-2.878-4.076-2.878  S12.213,6.964,12.213,6.964z"/>
+<path d="M11.015,6.325c0,0,1.278-3.078,5.233-3.078s4.973,3.037,4.973,3.037s-0.918-3.836-5.033-3.836  C12.073,2.448,11.015,6.325,11.015,6.325z"/>
+<polygon points="9.648,23.259 9.652,23.259 8.139,20.825 5.279,20.825 9.48,27.552 11.524,26.271 10.818,25.132 "/>
+<polygon points="10.491,20.822 12.008,23.259 16.131,23.259 14.617,20.822 "/>
+<polygon points="16.969,20.822 18.486,23.259 22.629,23.259 21.115,20.822 "/>
+<polygon points="23.469,20.822 24.721,22.841 24.721,20.822 "/>
+<polygon points="20.301,15.806 21.814,18.239 24.721,18.239 20.52,11.513 18.451,12.804 20.324,15.806 "/>
+<polygon points="19.461,18.239 17.949,15.806 13.861,15.808 15.374,18.239 "/>
+<polygon points="13.022,18.239 11.513,15.808 7.378,15.808 8.892,18.242 "/>
+<polygon points="5.279,16.21 5.279,18.242 6.539,18.242 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_context.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_context.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_context.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="29.03" width="29.03" x="0.746" y="0.016"/>
-<polygon points="5.854,6.967,7.789,6.967,7.903,10.68,9.685,6.967,11.23,6.967,11.23,10.68,12.89,6.967,14.94,6.967,11.85,12.77,10.03,12.77,9.995,9.161,8.371,12.77,6.515,12.77"/>
-<path d="M17.97,6.167c0-0.616-0.674-1.113-1.508-1.113-0.832,0-1.508,0.498-1.508,1.113,0,0.329,0.194,0.625,0.503,0.828v5.772h2.009v-5.774c0.32-0.204,0.51-0.5,0.51-0.829z"/>
-<path d="M12.56,6.755s1.063-2.185,3.905-2.185c2.841,0,3.888,2.146,3.888,2.146s-0.522-2.785-3.944-2.785c-3.42,0.001-3.85,2.824-3.85,2.824z"/>
-<path d="M11.4,6.137s1.238-2.979,5.065-2.979c3.826,0,4.814,2.939,4.814,2.939s-0.891-3.712-4.871-3.712c-3.97,0-5,3.752-5,3.752z"/>
-<polygon points="24.67,20.17,5.854,20.17,9.92,26.68,11.92,25.43,10.1,22.52,10.12,22.52,10.12,22.52,24.67,22.52"/>
-<polygon points="20.6,11.16,18.6,12.4,20.42,15.31,5.854,15.31,5.854,17.67,24.67,17.67"/>
-<rect fill="none" height="29.03" width="29.03" x="0.746" y="0.016"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<polygon points="5.279,7.184 7.278,7.184 7.396,11.021 9.237,7.184 10.835,7.184 10.835,11.021 12.552,7.184 14.672,7.184   11.474,13.178 9.598,13.178 9.557,9.45 7.879,13.178 5.961,13.178 "/>
+<path d="M17.797,6.356c0-0.637-0.697-1.15-1.557-1.15c-0.86,0-1.559,0.514-1.559,1.15c0,0.341,0.201,0.646,0.52,0.856v5.965h2.076  V7.213C17.596,7.003,17.797,6.697,17.797,6.356z"/>
+<path d="M12.214,6.965c0,0,1.099-2.259,4.036-2.259c2.934,0,4.016,2.219,4.016,2.219s-0.539-2.879-4.076-2.879  C12.651,4.046,12.214,6.965,12.214,6.965z"/>
+<path d="M11.015,6.325c0,0,1.279-3.077,5.235-3.077c3.953,0,4.973,3.036,4.973,3.036s-0.918-3.836-5.033-3.836  S11.015,6.325,11.015,6.325z"/>
+<polygon points="24.721,20.823 5.279,20.825 9.48,27.552 11.544,26.263 9.672,23.259 9.684,23.259 9.684,23.259 24.721,23.259 "/>
+<polygon points="20.52,11.516 18.451,12.803 20.326,15.808 5.279,15.808 5.279,18.242 24.721,18.241 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_multipdp.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_multipdp.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_multipdp.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="29.03" width="29.03" x="0.14" y="0.016"/>
-<polygon points="5.247,6.99,7.181,6.99,7.296,10.7,9.077,6.99,10.62,6.99,10.62,10.7,12.28,6.99,14.34,6.99,11.24,12.79,9.426,12.79,9.387,9.183,7.763,12.79,5.907,12.79"/>
-<path d="M17.36,6.189c0-0.616-0.673-1.113-1.507-1.113-0.833,0-1.508,0.498-1.508,1.113,0,0.33,0.194,0.625,0.503,0.828v5.772h2.009v-5.772c0.32-0.205,0.51-0.498,0.51-0.829z"/>
-<path d="M11.96,6.778s1.063-2.186,3.905-2.186c2.84,0,3.888,2.146,3.888,2.146s-0.522-2.785-3.944-2.785c-3.43,0-3.85,2.825-3.85,2.825z"/>
-<path d="M10.8,6.159s1.237-2.978,5.065-2.978c3.826,0,4.813,2.938,4.813,2.938s-0.89-3.711-4.87-3.711c-3.98,0-5,3.751-5,3.751z"/>
-<polygon points="20,11.23,17.99,12.47,19.81,15.38,5.247,15.38,5.247,17.74,24.06,17.73"/>
-<polygon points="9.312,26.66,11.31,25.41,9.506,22.5,12.45,22.5,15.05,26.66,17.05,25.41,15.24,22.5,24.06,22.5,24.06,20.14,5.247,20.14"/>
-<rect fill="none" height="29.03" width="29.03" x="0.14" y="0.016"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<polygon points="5.278,7.206 7.277,7.206 7.396,11.042 9.236,7.206 10.834,7.206 10.834,11.042 12.551,7.206 14.671,7.206   11.473,13.2 9.597,13.2 9.556,9.473 7.878,13.2 5.96,13.2 "/>
+<path d="M17.795,6.38c0-0.637-0.695-1.15-1.557-1.15c-0.859,0-1.558,0.514-1.558,1.15c0,0.34,0.201,0.645,0.52,0.855V13.2h2.075  V7.235C17.596,7.024,17.795,6.72,17.795,6.38z"/>
+<path d="M12.213,6.987c0,0,1.099-2.258,4.035-2.258c2.936,0,4.018,2.217,4.018,2.217s-0.541-2.877-4.076-2.877  C12.65,4.069,12.213,6.987,12.213,6.987z"/>
+<path d="M11.014,6.348c0,0,1.279-3.077,5.234-3.077s4.975,3.036,4.975,3.036s-0.92-3.835-5.033-3.835  C12.073,2.472,11.014,6.348,11.014,6.348z"/>
+<polygon points="20.52,11.583 18.451,12.87 20.324,15.875 5.278,15.878 5.278,18.312 24.721,18.31 "/>
+<polygon points="9.479,27.528 11.543,26.237 9.679,23.233 12.725,23.233 15.408,27.528 17.473,26.237 15.604,23.233 24.721,23.233   24.721,20.8 5.278,20.8 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_suspended.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_suspended.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_suspended.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.016"/>
-<polygon points="5.954,6.974,7.889,6.974,8.003,10.69,9.785,6.974,11.33,6.974,11.33,10.69,12.99,6.974,15.04,6.974,11.95,12.78,10.13,12.78,10.09,9.168,8.47,12.78,6.614,12.78"/>
-<path d="M18.07,6.174c0-0.616-0.674-1.113-1.508-1.113-0.832,0-1.508,0.498-1.508,1.113,0,0.33,0.194,0.625,0.503,0.829v5.772h2.009v-5.777c0.32-0.204,0.51-0.499,0.51-0.829z"/>
-<path d="M12.66,6.763s1.064-2.185,3.905-2.185,3.888,2.146,3.888,2.146-0.522-2.784-3.944-2.784c-3.42-0.001-3.85,2.823-3.85,2.823z"/>
-<path d="M11.5,6.144s1.238-2.978,5.065-2.978c3.826,0,4.814,2.938,4.814,2.938s-0.89-3.712-4.871-3.712c-3.97,0-5,3.752-5,3.752z"/>
-<polygon points="24.77,20.12,24.77,22.48,20.51,22.48,20.51,22.48,14.73,22.48,16.69,20.12"/>
-<polygon points="5.954,20.12,11.08,20.12,9.094,22.48,5.954,22.48"/>
-<polygon points="24.77,15.27,24.77,17.63,18.78,17.63,20.75,15.27"/>
-<polygon points="5.954,17.62,5.954,15.27,15.17,15.27,13.19,17.63"/>
-<polygon points="21.58,12.64,21.65,12.7,21.6,12.75,10.89,25.52,9.926,26.67,8.122,25.15,9.495,23.51,19.84,11.18"/>
-<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.016"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<rect fill="none" height="30" width="30"/>
+<polygon points="5.279,7.19 7.278,7.19 7.396,11.026 9.237,7.19 10.835,7.19 10.835,11.026 12.552,7.19 14.672,7.19 11.474,13.185   9.598,13.185 9.557,9.458 7.879,13.185 5.961,13.185 "/>
+<path d="M17.797,6.364c0-0.637-0.697-1.15-1.557-1.15c-0.86,0-1.559,0.514-1.559,1.15c0,0.34,0.201,0.645,0.52,0.855v5.965h2.076  V7.22C17.596,7.009,17.797,6.704,17.797,6.364z"/>
+<path d="M12.214,6.972c0,0,1.099-2.258,4.036-2.258c2.934,0,4.016,2.218,4.016,2.218s-0.539-2.878-4.076-2.878  C12.651,4.054,12.214,6.972,12.214,6.972z"/>
+<path d="M11.015,6.333c0,0,1.279-3.078,5.235-3.078c3.953,0,4.973,3.037,4.973,3.037s-0.918-3.836-5.033-3.836  S11.015,6.333,11.015,6.333z"/>
+<polygon points="24.721,20.78 24.721,23.215 20.316,23.215 20.32,23.215 14.345,23.215 16.377,20.78 "/>
+<polygon points="5.279,20.777 10.581,20.777 8.524,23.215 5.279,23.215 "/>
+<polygon points="24.721,15.765 24.721,18.199 18.529,18.199 20.566,15.765 "/>
+<polygon points="5.279,18.194 5.279,15.765 14.806,15.765 12.753,18.199 "/>
+<polygon points="21.424,13.04 21.5,13.103 21.447,13.162 10.382,26.351 9.383,27.544 7.519,25.978 8.938,24.28 19.631,11.539 "/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M23,25h-3.294l-2.746-9.336C16.345,15.878,15.688,16,15,16s-1.345-0.122-1.96-0.336L10.294,25H7c-1.104,0-2,0.896-2,2v2h20  v-2C25,25.896,24.104,25,23,25z"/>
+<circle cx="15" cy="10" r="4"/>
+<path d="M20.877,16.855C21.039,16.953,21.219,17,21.396,17c0.338,0,0.667-0.17,0.855-0.48C23.346,14.719,24,12.281,24,10  c0-2.28-0.654-4.717-1.749-6.52c-0.286-0.471-0.901-0.621-1.374-0.334c-0.472,0.287-0.622,0.901-0.335,1.373  C21.455,6.021,22,8.07,22,10c0,1.931-0.545,3.979-1.458,5.48C20.255,15.953,20.405,16.568,20.877,16.855z"/>
+<path d="M26.425,1.457c-0.301-0.464-0.921-0.598-1.383-0.295c-0.464,0.3-0.596,0.919-0.295,1.383C26.242,4.85,27,7.358,27,10  c0,2.643-0.758,5.15-2.253,7.457c-0.301,0.463-0.169,1.082,0.295,1.383C25.21,18.949,25.398,19,25.585,19  c0.327,0,0.648-0.16,0.84-0.455C28.134,15.91,29,13.035,29,10C29,6.966,28.134,4.092,26.425,1.457z"/>
+<path d="M8.604,17c0.177,0,0.356-0.047,0.519-0.145c0.472-0.287,0.622-0.902,0.335-1.375C8.545,13.979,8,11.931,8,10  c0-1.93,0.545-3.979,1.458-5.48c0.287-0.472,0.137-1.086-0.335-1.373C8.65,2.859,8.035,3.01,7.749,3.48C6.654,5.283,6,7.72,6,10  c0,2.281,0.654,4.719,1.749,6.52C7.938,16.83,8.267,17,8.604,17z"/>
+<path d="M5.253,17.457C3.758,15.15,3,12.643,3,10c0-2.642,0.758-5.15,2.253-7.455c0.301-0.464,0.169-1.083-0.295-1.383  C4.496,0.859,3.876,0.993,3.575,1.457C1.866,4.092,1,6.966,1,10c0,3.035,0.866,5.91,2.575,8.545C3.767,18.84,4.088,19,4.415,19  c0.187,0,0.375-0.051,0.543-0.16C5.422,18.539,5.554,17.92,5.253,17.457z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M18.23,21.4l-2.349-9.384c1.031-0.366,1.775-1.323,1.775-2.477,0-1.469-1.188-2.656-2.655-2.656s-2.655,1.186-2.655,2.656c0,1.153,0.741,2.107,1.769,2.477l-2.345,9.384h-3.405v2.654h13.28v-2.654h-3.403z"/>
-<path d="M6,9.54c0,2.967,1.627,5.158,1.676,5.232,0.267-0.181,0.721-0.494,0.99-0.674-0.052-0.071-1.474-2.087-1.474-4.558,0-2.675,1.422-4.486,1.474-4.561-0.269-0.186-0.721-0.499-0.985-0.68-0.052,0.074-1.681,2.359-1.681,5.239z"/>
-<path d="M9.169,9.54c0,1.972,1.073,3.372,1.125,3.443,0.269-0.18,0.721-0.494,0.99-0.675-0.057-0.077-0.921-1.374-0.921-2.769,0-1.553,0.864-2.698,0.919-2.771-0.267-0.18-0.724-0.491-0.988-0.68-0.05,0.091-1.121,1.448-1.121,3.46z"/>
-<path d="M24,9.535c0-2.969-1.629-5.159-1.682-5.234-0.264,0.181-0.72,0.494-0.983,0.674,0.047,0.071,1.472,2.088,1.472,4.56,0,2.673-1.425,4.484-1.472,4.558,0.264,0.185,0.72,0.498,0.983,0.679,0.04-0.07,1.68-2.35,1.68-5.235z"/>
-<path d="M20.83,9.535c0-1.974-1.072-3.373-1.125-3.445-0.264,0.18-0.721,0.494-0.99,0.675,0.057,0.08,0.923,1.378,0.923,2.77,0,1.553-0.866,2.697-0.921,2.769,0.268,0.18,0.718,0.493,0.986,0.679,0.05-0.08,1.13-1.44,1.13-3.445z"/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan_offline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan_offline.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan_offline.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,21 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M26.425,1.457c-0.301-0.464-0.921-0.598-1.383-0.295c-0.464,0.3-0.596,0.919-0.295,1.383C26.242,4.85,27,7.358,27,10  c0,2.643-0.758,5.15-2.253,7.457c-0.301,0.463-0.169,1.082,0.295,1.383C25.21,18.949,25.398,19,25.585,19  c0.327,0,0.648-0.16,0.84-0.455C28.134,15.91,29,13.035,29,10C29,6.966,28.134,4.092,26.425,1.457z"/>
+<path d="M3,10c0-0.881,0.092-1.745,0.26-2.594L1.603,5.748C1.205,7.123,1,8.543,1,10c0,3.035,0.866,5.91,2.575,8.545  C3.767,18.84,4.088,19,4.415,19c0.187,0,0.375-0.051,0.543-0.16c0.464-0.301,0.596-0.92,0.295-1.383C3.758,15.15,3,12.643,3,10z"/>
+<path d="M9.194,5.045C9.283,4.871,9.359,4.682,9.458,4.52c0.287-0.472,0.137-1.086-0.335-1.373C8.65,2.859,8.035,3.01,7.749,3.48  C7.734,3.506,7.722,3.533,7.707,3.557L9.194,5.045z"/>
+<path d="M8.295,12.441l-2.29-2.289c0.028,2.236,0.674,4.605,1.744,6.367C7.938,16.83,8.267,17,8.604,17  c0.177,0,0.356-0.047,0.519-0.145c0.472-0.287,0.622-0.902,0.335-1.375C8.929,14.61,8.543,13.551,8.295,12.441z"/>
+<path d="M20.457,16.307l0.646,0.646C21.199,16.982,21.297,17,21.396,17c0.338,0,0.667-0.17,0.855-0.48  C23.346,14.719,24,12.281,24,10c0-2.28-0.654-4.717-1.749-6.52c-0.286-0.471-0.901-0.621-1.374-0.334  c-0.472,0.287-0.622,0.901-0.335,1.373C21.455,6.021,22,8.07,22,10c0,1.931-0.545,3.979-1.458,5.48  C20.384,15.74,20.369,16.039,20.457,16.307z"/>
+<path d="M17.362,13.213C18.351,12.484,19,11.322,19,10c0-2.209-1.791-4-4-4c-1.322,0-2.484,0.648-3.213,1.638L17.362,13.213z"/>
+<path d="M20.853,25h-1.146l-0.478-1.625l-6.534-6.534L10.294,25H7c-1.104,0-2,0.896-2,2v2h19.853L20.853,25z"/>
+<path d="M27.693,26.372c0.389,0.389,0.41,1.005,0.048,1.368c-0.362,0.362-0.978,0.343-1.366-0.046L2.307,3.625  C1.918,3.236,1.896,2.621,2.26,2.258c0.363-0.362,0.979-0.34,1.367,0.049L27.693,26.372z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M16.14,13.04l-0.258-1.03c1.031-0.366,1.775-1.323,1.775-2.477,0-1.469-1.188-2.656-2.655-2.656-1.382,0-2.503,1.056-2.63,2.407l3.77,3.756z"/>
-<polygon points="18.62,21.4,18.23,21.4,18.1,20.88,13.13,15.94,11.77,21.4,8.355,21.4,8.355,24.05,21.28,24.05"/>
-<path d="M8.413,5.349c0.141-0.223,0.24-0.351,0.253-0.369-0.269-0.185-0.721-0.498-0.985-0.679-0.008,0.011-0.059,0.087-0.127,0.192l0.859,0.856z"/>
-<path d="M6.045,8.871c-0.019,0.221-0.045,0.44-0.045,0.669,0,2.967,1.627,5.158,1.676,5.232,0.267-0.181,0.721-0.494,0.99-0.674-0.049-0.066-1.267-1.82-1.439-4.05l-1.182-1.179z"/>
-<path d="M10.76,7.692c0.234-0.54,0.488-0.884,0.518-0.922-0.267-0.18-0.724-0.491-0.988-0.68-0.021,0.033-0.213,0.288-0.432,0.703l0.902,0.899z"/>
-<path d="M22.32,4.301c-0.264,0.181-0.72,0.494-0.983,0.674,0.047,0.071,1.472,2.088,1.472,4.56,0,2.673-1.425,4.484-1.472,4.558,0.264,0.185,0.72,0.498,0.983,0.679,0.04-0.07,1.68-2.35,1.68-5.235,0-2.969-1.63-5.16-1.68-5.234z"/>
-<path d="M18.71,12.3c0.268,0.18,0.718,0.493,0.986,0.679,0.053-0.078,1.127-1.438,1.127-3.448,0-1.974-1.072-3.373-1.125-3.445-0.264,0.18-0.721,0.494-0.99,0.675,0.057,0.08,0.923,1.378,0.923,2.77,0,1.558-0.86,2.698-0.92,2.768z"/>
-<rect height="33.24" transform="matrix(0.7057 -0.7085 0.7085 0.7057 -6.2107 15.042)" width="1.4" x="14.3" y="-1.622"/>
-<g display="none">
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<polygon points="13.66,10.55,15.87,3.375,11.37,3.375,10.22,7.104"/>
-<polygon points="19.54,16.43,21.25,10.88,18.62,10.88,16.74,10.88,13.99,10.88"/>
-<polygon points="14.63,17.74,13.74,20.63,10.38,20.63,16.01,26.62,19.64,22.75"/>
-<polygon points="8.754,11.86,8.361,13.13,9.613,13.13,10.02,13.13"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_work.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_work.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_work.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M26,8h-6c-1.104,0-2,0.896-2,2v16c0,1.105,0.896,2,2,2h6c1.104,0,2-0.895,2-2V10C28,8.896,27.104,8,26,8z M26,23h-6v-2h6V23  z M26,18h-6v-2h6V18z M26,13h-6v-2h6V13z"/>
+<path d="M16.576,2.183C16.405,2.063,16.203,2,16,2c-0.113,0-0.227,0.02-0.336,0.059l-13,5C2.266,7.2,2,7.577,2,8v18  c0,1.104,0.896,2,2,2h4h3h4c1.104,0,2-0.896,2-2V3C17,2.675,16.842,2.37,16.576,2.183z M11,10h3v4h-3V10z M11,16h3v4h-3V16z M5,10h3  v4H5V10z M5,16h3v4H5V16z M7,27v-4.25C7,22.336,7.448,22,8,22h3c0.552,0,1,0.336,1,0.75V27H7z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<rect height="3" width="2" x="7" y="10"/>
-<rect height="3" width="2" x="11" y="10"/>
-<rect height="3" width="2" x="7" y="15"/>
-<rect height="3" width="2" x="11" y="15"/>
-<path d="M18,8V1L2,7v21h26V8H18z M15,25h-3v-5H8v5H5V9.079l10-3.75V25z M25,23h-6v-2h6V23z M25,18h-6v-2h6V18z M25,13h-6v-2h6V13z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_world_clock.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_world_clock.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_world_clock.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<rect fill="none" height="30" width="30"/>
-<path d="M15,1c-7.732,0-14,6.268-14,14s6.268,14,14,14c7.733,0,14-6.268,14-14s-6.27-14-14-14zm-9.16,20.42c-0.775-1.102-1.351-2.348-1.689-3.689l1.636-0.323,1.4,2.8-1.347,1.21zm16.27,2.22l-0.701-0.635,1.398-2.799,1.885,0.371c-0.68,1.18-1.55,2.22-2.59,3.07zm1.11-13.12l-1.61-0.62,0.914,1.239,0.656-0.291s0.803,0.768,0.766,1.021c-0.035,0.257-1.238,1.424-1.238,1.424l-1.057,0.376-1.391-1.144-1.06-0.88,0.656,1.567,0.877,0.914s1.533-0.219,1.752-0.037c0.221,0.182-0.291,1.572-0.291,1.572l-2.557,2.626-0.256,2.627c-1.424,0.732-1.569,1.859-1.569,1.859s-0.364-0.068-1.313,0.99-1.973,0.781-1.973,0.781c-1.204,0-1.423-0.781-1.423-1.039,0-0.254-1.205-2.225-1.205-2.885,0-0.656,0.365-1.459,0.365-1.459,0.072-0.949-0.949-3.501-0.949-3.501h-1.059l-0.365-0.806c-3.432,0.73-3.577-0.146-4.089-1.096-0.511-0.949,0.074-3.504,0.402-3.905,0.21-0.257,1.328-1.063,2.109-1.614l7.998,2.552,1.41-2.78-5.6-1.399-3.122,1.175c0.058-0.04,0.1-0.068,0.1-0.068l-0.329-0.475c-0.22-0.473,1.205-1.131,1.205-1.131,0.548,0.366,0.912,0,0.912,0l0.146-0.365-0.15-0.547,0.677-0.842c1.08-0.352,2.24-0.548,3.44-0.548,1.259,0,2.465,0.219,3.595,0.604l-0.8,0.796,1.399,1.4,1.326-1.326c2.934,1.677,5.043,4.64,5.546,8.119-0.585-1.176-1.067-2.545-1.067-2.545l-1.79-0.32z"/>
+<svg baseProfile="tiny" height="30px" version="1.1" viewBox="-2 -2 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M13,0C5.82,0,0,5.82,0,13s5.82,13,13,13s13-5.82,13-13S20.18,0,13,0z M3.84,19.422c-0.775-1.102-1.351-2.348-1.689-3.689  l1.637-0.324l1.4,2.801L3.84,19.422z M20.115,21.643l-0.703-0.635l1.4-2.799l1.884,0.371C22.021,19.748,21.151,20.789,20.115,21.643  z M21.215,8.52L19.609,7.9l0.913,1.238l0.656-0.291c0,0,0.802,0.768,0.766,1.021c-0.036,0.258-1.239,1.424-1.239,1.424L19.65,11.67  l-1.393-1.145L17.2,9.652l0.657,1.566l0.876,0.914c0,0,1.533-0.219,1.752-0.037c0.22,0.182-0.291,1.572-0.291,1.572l-2.557,2.627  l-0.255,2.627c-1.424,0.732-1.57,1.859-1.57,1.859s-0.365-0.068-1.314,0.99c-0.948,1.059-1.972,0.781-1.972,0.781  c-1.204,0-1.423-0.781-1.423-1.039c0-0.254-1.205-2.225-1.205-2.885c0-0.656,0.365-1.459,0.365-1.459  c0.072-0.949-0.949-3.502-0.949-3.502H8.256l-0.365-0.805c-3.432,0.73-3.577-0.146-4.089-1.096  c-0.511-0.949,0.073-3.504,0.401-3.906c0.211-0.256,1.328-1.063,2.109-1.613l7.998,2.551L15.711,6L10.11,4.6L6.988,5.775  c0.058-0.039,0.1-0.068,0.1-0.068L6.759,5.232C6.539,4.76,7.964,4.102,7.964,4.102c0.548,0.365,0.912,0,0.912,0l0.146-0.365  L8.876,3.189l0.677-0.842C10.641,1.996,11.797,1.799,13,1.799c1.26,0,2.465,0.219,3.596,0.605l-0.797,0.795l1.4,1.4l1.326-1.326  c2.934,1.678,5.043,4.641,5.546,8.119c-0.585-1.176-1.067-2.545-1.067-2.545L21.215,8.52z"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M10.572,19.428c-0.359-0.361-0.68-0.746-0.982-1.139l-1.542,1.542c-0.766-0.451-1.767-0.354-2.425,0.304l-2.828,2.828  l4.242,4.242l2.828-2.828c0.659-0.658,0.756-1.658,0.304-2.425l1.542-1.542C11.318,20.107,10.934,19.787,10.572,19.428z"/>
+<path d="M26.129,3.871c-4.1-4.102-10.748-4.102-14.85-0.002c-4.1,4.102-4.1,10.75,0.002,14.85c4.1,4.102,10.748,4.102,14.848,0  C30.23,14.619,30.23,7.971,26.129,3.871z M24.008,16.598c-2.928,2.93-7.678,2.93-10.605,0C10.473,13.67,10.473,8.92,13.4,5.99  c2.93-2.928,7.678-2.928,10.607,0.002S26.938,13.67,24.008,16.598z"/>
+<path d="M1.381,27.205l1.414,1.414c0.781,0.781,2.047,0.781,2.828,0l-4.242-4.242C0.6,25.158,0.6,26.424,1.381,27.205z"/>
+<path d="M21,8h-1V7c0-0.553-0.447-1-1-1h-1c-0.553,0-1,0.447-1,1v1h-1c-0.552,0-1,0.447-1,1v1c0,0.553,0.448,1,1,1h1v1  c0,0.553,0.447,1,1,1h1c0.553,0,1-0.447,1-1v-1h1c0.553,0,1-0.447,1-1V9C22,8.447,21.553,8,21,8z"/>
+<path d="M21,14h-5c-0.552,0-1,0.447-1,1v1c0,0.553,0.448,1,1,1h5c0.553,0,1-0.447,1-1v-1C22,14.447,21.553,14,21,14z"/>
+<g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
-<path d="M25.809,4.191c-4.1-4.102-10.748-4.102-14.849,0C7.221,7.93,6.902,13.782,9.983,17.895l-1.499,1.499l-0.707-0.707  l-4.949,4.95l3.535,3.535l4.95-4.95l-0.707-0.707l1.499-1.498c4.112,3.081,9.965,2.763,13.703-0.977  C29.91,14.939,29.91,8.291,25.809,4.191z M23.688,16.918c-2.924,2.925-7.683,2.924-10.605,0c-2.924-2.923-2.926-7.682,0-10.605  c2.924-2.925,7.682-2.924,10.605,0S26.612,13.994,23.688,16.918z"/>
-<rect height="2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -15.239 48.7386)" width="4.999" x="-0.025" y="26.525"/>
-<rect height="3" width="7" x="15" y="14"/>
-<polygon points="20,6 17,6 17,8 15,8 15,11 17,11 17,13 20,13 20,11 22,11 22,8 20,8 "/>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_in.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_in.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_in.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M10.572,19.428c-0.359-0.361-0.68-0.746-0.982-1.139l-1.542,1.542c-0.766-0.451-1.767-0.354-2.425,0.304l-2.828,2.828  l4.242,4.242l2.828-2.828c0.659-0.658,0.756-1.658,0.304-2.425l1.542-1.542C11.318,20.107,10.934,19.787,10.572,19.428z"/>
+<path d="M26.129,3.871c-4.1-4.102-10.748-4.102-14.85-0.002c-4.1,4.102-4.1,10.75,0.002,14.85c4.1,4.102,10.748,4.102,14.848,0  C30.23,14.619,30.23,7.971,26.129,3.871z M24.008,16.598c-2.928,2.93-7.678,2.93-10.605,0C10.473,13.67,10.473,8.92,13.4,5.99  c2.93-2.928,7.678-2.928,10.607,0.002S26.938,13.67,24.008,16.598z"/>
+<path d="M1.381,27.205l1.414,1.414c0.781,0.781,2.047,0.781,2.828,0l-4.242-4.242C0.6,25.158,0.6,26.424,1.381,27.205z"/>
+<path d="M22.5,10H20V7.5C20,6.672,19.328,6,18.5,6S17,6.672,17,7.5V10h-2.5c-0.828,0-1.5,0.672-1.5,1.5s0.672,1.5,1.5,1.5H17v2.5  c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5V13h2.5c0.828,0,1.5-0.672,1.5-1.5S23.328,10,22.5,10z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M25.92,4.191c-4.1-4.102-10.75-4.102-14.85,0-3.739,3.738-4.057,9.591-0.977,13.7l-1.49,1.5-0.707-0.707-4.949,4.95,3.535,3.535,4.95-4.95-0.707-0.707,1.499-1.498c4.112,3.081,9.965,2.763,13.7-0.977,4.1-4.08,4.1-10.73,0-14.83zm-2.12,12.73c-2.924,2.925-7.683,2.924-10.6,0-2.924-2.923-2.926-7.682,0-10.6,2.924-2.925,7.682-2.924,10.6,0s2.93,7.67,0,10.6z"/>
-<rect height="2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -15.0422 48.8201)" width="4.999" x="0.09" y="26.52"/>
-<polygon points="20,7,17,7,17,10,14,10,14,13,17,13,17,16,20,16,20,13,23,13,23,10,20,10"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_out.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_out.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_out.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<path d="M10.572,19.428c-0.359-0.361-0.68-0.746-0.982-1.139l-1.542,1.542c-0.766-0.451-1.767-0.354-2.425,0.304l-2.828,2.828  l4.242,4.242l2.828-2.828c0.659-0.658,0.756-1.658,0.304-2.425l1.542-1.542C11.318,20.107,10.934,19.787,10.572,19.428z"/>
+<path d="M26.129,3.871c-4.1-4.102-10.748-4.102-14.85-0.002c-4.1,4.102-4.1,10.75,0.002,14.85c4.1,4.102,10.748,4.102,14.848,0  C30.23,14.619,30.23,7.971,26.129,3.871z M24.008,16.598c-2.928,2.93-7.678,2.93-10.605,0C10.473,13.67,10.473,8.92,13.4,5.99  c2.93-2.928,7.678-2.928,10.607,0.002S26.938,13.67,24.008,16.598z"/>
+<path d="M1.381,27.205l1.414,1.414c0.781,0.781,2.047,0.781,2.828,0l-4.242-4.242C0.6,25.158,0.6,26.424,1.381,27.205z"/>
+<path d="M22.5,10h-8c-0.828,0-1.5,0.672-1.5,1.5s0.672,1.5,1.5,1.5h8c0.828,0,1.5-0.672,1.5-1.5S23.328,10,22.5,10z"/>
 <g fill-opacity="0.5" stroke-opacity="0.5">
 <rect fill="none" height="30" width="30"/>
 </g>
-<path d="M25.92,4.191c-4.1-4.102-10.75-4.102-14.85,0-3.739,3.738-4.057,9.591-0.977,13.7l-1.49,1.5-0.707-0.707-4.949,4.95,3.535,3.535,4.95-4.95-0.707-0.707,1.499-1.498c4.112,3.081,9.965,2.763,13.7-0.977,4.1-4.08,4.1-10.73,0-14.83zm-2.12,12.73c-2.924,2.925-7.683,2.924-10.6,0-2.924-2.923-2.926-7.682,0-10.6,2.924-2.925,7.682-2.924,10.6,0s2.93,7.67,0,10.6z"/>
-<rect height="2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -15.0422 48.8201)" width="4.999" x="0.09" y="26.52"/>
-<rect height="3" width="9" x="14" y="10"/>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_add.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_add.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_add.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -10,9 +10,9 @@
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="10" x="18" y="12"/>
 <rect fill="none" height="30" width="30"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="593.9609" x2="593.9609" y1="814.0391" y2="840.0391">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_anniversary.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_anniversary.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_anniversary.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -29,29 +29,29 @@
 <rect fill="url(#SVGID_3_)" height="5" width="4" x="20.5" y="11"/>
 <rect fill-opacity="0.6" height="14" stroke-opacity="0.6" width="26" x="2" y="15"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -66 -46)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="69" x2="93" y1="-68" y2="-68">
-<stop offset="0" style="stop-color:#FFC222"/>
-<stop offset="0.2303" style="stop-color:#FFE896"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+<stop offset="0" style="stop-color:#BDA664"/>
+<stop offset="0.2303" style="stop-color:#E0D9B5"/>
+<stop offset="1" style="stop-color:#B3964D"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="12" width="24" x="3" y="16"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="24" x="3" y="16"/>
 <rect fill-opacity="0.5" height="2" stroke-opacity="0.5" width="24" x="3" y="21"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -72 -681)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="79.5" x2="79.5" y1="685.8193" y2="692.2366">
-<stop offset="0" style="stop-color:#FFE692"/>
-<stop offset="0.5879" style="stop-color:#ED8C0D"/>
-<stop offset="1" style="stop-color:#ED8C0D"/>
+<stop offset="0" style="stop-color:#DED7B3"/>
+<stop offset="0.5879" style="stop-color:#AA8250"/>
+<stop offset="1" style="stop-color:#AA8250"/>
 </linearGradient>
 <path d="M5,6.375C5,7.824,5.834,9,7.5,9S10,7.824,10,6.375C10,3.75,7.5,2,7.5,2S5,3.75,5,6.375z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -72 -681)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="87" x2="87" y1="685.8193" y2="692.2366">
-<stop offset="0" style="stop-color:#FFE692"/>
-<stop offset="0.5879" style="stop-color:#ED8C0D"/>
-<stop offset="1" style="stop-color:#ED8C0D"/>
+<stop offset="0" style="stop-color:#DED7B3"/>
+<stop offset="0.5879" style="stop-color:#AA8250"/>
+<stop offset="1" style="stop-color:#AA8250"/>
 </linearGradient>
 <path d="M12.5,6.375C12.5,7.824,13.334,9,15,9s2.5-1.176,2.5-2.625C17.5,3.75,15,2,15,2S12.5,3.75,12.5,6.375  z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -72 -681)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="94.5" x2="94.5" y1="685.8193" y2="692.2366">
-<stop offset="0" style="stop-color:#FFE692"/>
-<stop offset="0.5879" style="stop-color:#ED8C0D"/>
-<stop offset="1" style="stop-color:#ED8C0D"/>
+<stop offset="0" style="stop-color:#DED7B3"/>
+<stop offset="0.5879" style="stop-color:#AA8250"/>
+<stop offset="1" style="stop-color:#AA8250"/>
 </linearGradient>
 <path d="M20,6.375C20,7.824,20.834,9,22.5,9S25,7.824,25,6.375C25,3.75,22.5,2,22.5,2S20,3.75,20,6.375z" fill="url(#SVGID_7_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_assistant.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_assistant.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_assistant.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,69 +3,66 @@
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <rect fill="none" height="30" width="30"/>
-<path d="M15.591,29c-0.845,0-1.65-0.228-2.338-0.659c-0.373-0.132-0.747-0.308-1.116-0.522H9.091  c-2.506,0-4.545-2.039-4.545-4.545v-0.378c-0.774-0.247-1.49-0.751-2.076-1.476l-0.092-0.13c-0.146-0.187-0.309-0.417-0.453-0.671  c-0.041-0.07-0.077-0.148-0.112-0.227l-0.063-0.129c-0.091-0.18-0.181-0.359-0.256-0.555c-0.049-0.127-0.089-0.266-0.128-0.404  L1.29,19.057c-0.037-0.113-0.073-0.227-0.101-0.347c-0.081-0.358-0.136-0.723-0.165-1.085c-0.028-0.353-0.031-0.715-0.008-1.074  c0.007-0.119,0.024-0.234,0.042-0.35l0.029-0.221c0.018-0.15,0.036-0.3,0.067-0.443c0.038-0.178,0.089-0.346,0.143-0.515l0.05-0.167  c0.024-0.086,0.049-0.17,0.079-0.251c0.091-0.243,0.202-0.466,0.319-0.687c0.026-0.057,0.051-0.107,0.079-0.154  c0.136-0.238,0.298-0.471,0.492-0.703c0.34-0.403,0.707-0.719,1.103-0.949C3.928,5.832,8.905,1,15,1s11.072,4.832,11.581,11.111  c0.394,0.229,0.757,0.537,1.083,0.925c0.213,0.257,0.375,0.489,0.516,0.733l0.072,0.143c0.119,0.227,0.23,0.449,0.322,0.693  c0.029,0.08,0.055,0.164,0.078,0.25l0.051,0.167c0.053,0.169,0.104,0.337,0.143,0.517c0.03,0.142,0.049,0.291,0.066,0.441  l0.029,0.221c0.019,0.115,0.035,0.23,0.043,0.352c0.021,0.357,0.02,0.72-0.009,1.074c-0.028,0.36-0.084,0.725-0.164,1.08  c-0.028,0.124-0.065,0.242-0.104,0.359l-0.068,0.229c-0.04,0.143-0.081,0.283-0.133,0.416c-0.074,0.196-0.165,0.377-0.257,0.557  l-0.062,0.127c-0.035,0.077-0.07,0.154-0.111,0.227c-0.145,0.252-0.307,0.482-0.477,0.701l-0.073,0.103  c-0.839,1.038-1.933,1.623-3.083,1.65c0,0-0.172,0.011-0.217,0.011c-0.734-0.039-1.35-0.281-1.834-0.713  c-0.498,1.055-1.043,2.051-1.623,2.969l-0.047,0.106l-0.08,0.118c-0.185,0.246-0.39,0.49-0.605,0.729  c-0.201,0.218-0.339,0.359-0.484,0.496l-0.104,0.094c-0.133,0.119-0.241,0.213-0.348,0.301C18.429,28.295,17.078,29,15.591,29  L15.591,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<radialGradient cx="-109.0669" cy="28.1328" gradientTransform="matrix(0.9352 0 0 0.9448 112.9225 -13.3229)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="18.8576">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+<path d="M15.591,29c-0.845,0-1.65-0.229-2.338-0.659  c-0.373-0.132-0.747-0.308-1.116-0.522H9.091c-2.506,0-4.545-2.039-4.545-4.545v-0.377c-0.774-0.248-1.49-0.752-2.076-1.477  l-0.092-0.13c-0.146-0.187-0.309-0.417-0.453-0.671c-0.041-0.07-0.077-0.148-0.112-0.227L1.75,20.264  c-0.091-0.181-0.181-0.359-0.256-0.556c-0.049-0.127-0.089-0.267-0.128-0.403L1.29,19.057c-0.037-0.113-0.073-0.227-0.101-0.347  c-0.081-0.358-0.136-0.724-0.165-1.085c-0.028-0.354-0.031-0.715-0.008-1.074c0.007-0.119,0.024-0.234,0.042-0.35l0.029-0.221  c0.018-0.15,0.036-0.301,0.067-0.443c0.038-0.178,0.089-0.346,0.143-0.515l0.05-0.167c0.024-0.086,0.049-0.17,0.079-0.251  c0.091-0.243,0.202-0.466,0.319-0.687c0.026-0.057,0.051-0.107,0.079-0.154c0.136-0.238,0.298-0.471,0.492-0.703  c0.34-0.403,0.707-0.719,1.103-0.949C3.928,5.832,8.905,1,15,1c6.096,0,11.072,4.832,11.581,11.111  c0.394,0.229,0.757,0.537,1.083,0.925c0.213,0.257,0.375,0.489,0.516,0.733l0.072,0.143c0.119,0.227,0.23,0.449,0.322,0.693  c0.029,0.08,0.055,0.164,0.078,0.25l0.051,0.167c0.053,0.169,0.104,0.337,0.143,0.517c0.03,0.143,0.049,0.291,0.066,0.441  l0.029,0.221c0.019,0.115,0.035,0.23,0.043,0.352c0.021,0.357,0.02,0.721-0.01,1.074c-0.027,0.359-0.084,0.725-0.164,1.08  c-0.027,0.124-0.064,0.242-0.104,0.359l-0.067,0.229c-0.039,0.143-0.08,0.283-0.134,0.416c-0.073,0.195-0.165,0.377-0.257,0.557  l-0.063,0.127c-0.035,0.078-0.069,0.154-0.11,0.229c-0.146,0.252-0.308,0.48-0.478,0.699l-0.074,0.105  c-0.838,1.037-1.933,1.622-3.082,1.649c0,0-0.172,0.011-0.217,0.011c-0.733-0.039-1.351-0.279-1.834-0.713  c-0.498,1.057-1.043,2.051-1.623,2.969l-0.047,0.106l-0.08,0.116c-0.186,0.246-0.391,0.49-0.604,0.729  c-0.201,0.218-0.341,0.358-0.483,0.496l-0.105,0.095c-0.133,0.118-0.24,0.213-0.348,0.301C18.43,28.295,17.078,29,15.591,29  L15.591,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<radialGradient cx="509.0391" cy="887.6172" gradientTransform="matrix(0.9352 0 0 0.9448 -465.1303 -825.3632)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="18.857">
+<stop offset="0" style="stop-color:#F4EDE4"/>
+<stop offset="0.5091" style="stop-color:#E8D9CA"/>
+<stop offset="0.7636" style="stop-color:#DDC4B0"/>
+<stop offset="1" style="stop-color:#BF9C89"/>
 </radialGradient>
-<path d="M23.583,16.562c-0.045-0.021-0.093-0.025-0.139-0.039V16.52c-0.009-0.001-0.016-0.003-0.026-0.004  c-0.067-0.018-0.135-0.033-0.207-0.038c-8.628-1.522-12.587-6.368-12.886-5.084c-0.237,1.021-2.656,3.228-3.923,4.33  c0.01,0.048,0.017,0.094,0.026,0.142c0,0,0.046,0.228,0.142,0.612c-0.101,0.011-0.2,0.03-0.295,0.073  c-0.806,0.344-1.059,1.686-0.564,2.992c0.495,1.31,1.548,2.092,2.353,1.749c0.051-0.021,0.094-0.059,0.138-0.087  c0.47,1.066,1.044,2.212,1.749,3.359c1.18,1.422,2.988,3.091,4.984,3.091c2.415,0,3.894-1.341,4.909-2.69  c0.025-0.057,0.053-0.111,0.08-0.157c0.754-1.192,1.363-2.389,1.859-3.504c0.788,0.278,1.801-0.464,2.303-1.724  C24.607,18.277,24.381,16.926,23.583,16.562z" fill="url(#SVGID_1_)"/>
-<path d="M19.673,25.178c-0.265-1.736-1.984-3.087-4.082-3.087c-1.524,0-2.844,0.718-3.561,1.772H9.556  c0.133,0.234,0.25,0.466,0.394,0.701c1.18,1.422,2.988,3.091,4.984,3.091C17.221,27.655,18.663,26.452,19.673,25.178z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.8647" x2="14.8647" y1="4.5264" y2="15.6558">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<path d="M23.583,16.563c-0.045-0.021-0.093-0.024-0.14-0.039V16.52c-0.008,0-0.016-0.002-0.025-0.004  c-0.066-0.018-0.135-0.033-0.207-0.037c-8.628-1.521-12.587-6.369-12.886-5.083c-0.237,1.021-2.656,3.228-3.923,4.332  c0.01,0.047,0.017,0.094,0.026,0.142c0,0,0.046,0.228,0.142,0.612c-0.101,0.01-0.2,0.028-0.295,0.072  c-0.806,0.344-1.059,1.686-0.564,2.991c0.495,1.312,1.548,2.093,2.353,1.749c0.051-0.021,0.094-0.061,0.138-0.087  c0.47,1.065,1.044,2.212,1.749,3.358c1.18,1.422,2.988,3.09,4.984,3.09c2.415,0,3.894-1.34,4.909-2.688  c0.025-0.057,0.053-0.11,0.08-0.155c0.754-1.192,1.363-2.391,1.859-3.504c0.787,0.276,1.801-0.466,2.303-1.726  C24.607,18.277,24.381,16.926,23.583,16.563z" fill="url(#SVGID_1_)"/>
+<path d="M19.673,25.178c-0.265-1.736-1.983-3.087-4.082-3.087  c-1.524,0-2.844,0.718-3.561,1.772H9.556c0.133,0.234,0.25,0.466,0.394,0.701c1.18,1.422,2.988,3.09,4.984,3.09  C17.221,27.654,18.663,26.452,19.673,25.178z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="593.8262" x2="593.8262" y1="816.5674" y2="827.6968">
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3758" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
-<path d="M14.691,4.363c-2.99,0-4.43,1.381-5.541,2.821C7.344,7.467,4.48,9.146,6.503,16.5  c1.267-1.102,3.585-4.086,3.822-5.106c0.302-1.296,4.328,3.652,13.12,5.126c0.103-0.41,0.15-0.654,0.15-0.654  C24.976,9.587,21.972,4.609,14.691,4.363z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15.0005" x2="15.0005" y1="13.9004" y2="2.2864">
-<stop offset="0" style="stop-color:#838487"/>
-<stop offset="0.4727" style="stop-color:#BDBEC3"/>
-<stop offset="1" style="stop-color:#E4E6EB"/>
+<path d="M14.691,4.363c-2.99,0-4.43,1.381-5.541,2.821C7.344,7.467,4.48,9.146,6.503,16.5  c1.267-1.102,3.585-4.086,3.822-5.106c0.302-1.296,4.328,3.652,13.12,5.125c0.103-0.41,0.15-0.653,0.15-0.653  C24.977,9.587,21.973,4.609,14.691,4.363z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="593.9609" x2="593.9609" y1="825.9395" y2="814.3264">
+<stop offset="0" style="stop-color:#848586"/>
+<stop offset="0.4727" style="stop-color:#BFC1C1"/>
+<stop offset="1" style="stop-color:#E6E9E8"/>
 </linearGradient>
-<path d="M6.389,13.818c-0.015-0.219-0.031-0.434-0.031-0.656c0-5.068,3.876-9.191,8.642-9.191  s8.643,4.123,8.643,9.191c0,0.223-0.018,0.438-0.031,0.656h1.993c0.013-0.219,0.032-0.434,0.032-0.656C25.637,6.996,20.875,2,15,2  S4.364,6.996,4.364,13.162c0,0.223,0.02,0.438,0.032,0.656H6.389z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.6821" x2="9.6821" y1="26.708" y2="20.8698">
+<path d="M6.389,13.818c-0.015-0.219-0.031-0.434-0.031-0.656c0-5.068,3.876-9.191,8.642-9.191  c4.766,0,8.643,4.123,8.643,9.191c0,0.223-0.018,0.438-0.031,0.656h1.994c0.014-0.219,0.031-0.434,0.031-0.656  C25.637,6.996,20.875,2,15,2S4.364,6.996,4.364,13.162c0,0.223,0.02,0.438,0.032,0.656H6.389z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="588.6416" x2="588.6416" y1="838.748" y2="832.9103">
 <stop offset="0" style="stop-color:#969696"/>
 <stop offset="1" style="stop-color:#464646"/>
 </linearGradient>
-<path d="M13.818,25.045H9.091c-0.978,0-1.772-0.795-1.772-1.771v-2.364H5.545v2.364  c0,1.949,1.596,3.545,3.545,3.545h4.728V25.045z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="9.6821" x2="9.6821" y1="21.2051" y2="25.5689">
-<stop offset="0" style="stop-color:#838487"/>
-<stop offset="0.4727" style="stop-color:#BDBEC3"/>
-<stop offset="1" style="stop-color:#E4E6EB"/>
+<path d="M13.818,25.045H9.091c-0.978,0-1.772-0.795-1.772-1.771V20.91H5.545v2.363  c0,1.949,1.596,3.545,3.545,3.545h4.728V25.045z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="588.6426" x2="588.6426" y1="833.2441" y2="837.6084">
+<stop offset="0" style="stop-color:#848586"/>
+<stop offset="0.4727" style="stop-color:#BFC1C1"/>
+<stop offset="1" style="stop-color:#E6E9E8"/>
 </linearGradient>
-<path d="M7.318,23.273v-1.183v-1.182H5.545v1.182c0,1.95,1.596,3.546,3.545,3.546h4.728v-0.592H9.091  C8.113,25.045,7.318,24.25,7.318,23.273z" fill="url(#SVGID_5_)"/>
-<path d="M25.604,13.816C25.278,7.959,20.663,3.313,15,3.313S4.722,7.959,4.396,13.816c0,0,0,0,0,0.002h1.994  c-0.015-0.219-0.031-0.434-0.031-0.656c0-5.068,3.876-9.191,8.642-9.191s8.643,4.123,8.643,9.191c0,0.223-0.018,0.438-0.031,0.656  h1.993C25.604,13.816,25.604,13.816,25.604,13.816z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.5903" x2="15.5903" y1="23.2168" y2="27.3616">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="0.7636" style="stop-color:#0487BF"/>
-<stop offset="1" style="stop-color:#059FE0"/>
+<path d="M7.318,23.273V22.09v-1.182H5.545v1.182c0,1.95,1.596,3.547,3.545,3.547h4.728v-0.593H9.091  C8.113,25.045,7.318,24.25,7.318,23.273z" fill="url(#SVGID_5_)"/>
+<path d="M25.604,13.816C25.277,7.959,20.663,3.313,15,3.313S4.722,7.959,4.396,13.816  c0,0,0,0,0,0.002H6.39c-0.015-0.219-0.031-0.434-0.031-0.656c0-5.068,3.876-9.191,8.642-9.191c4.767,0,8.644,4.123,8.644,9.191  c0,0.223-0.019,0.438-0.031,0.656h1.992C25.604,13.816,25.604,13.816,25.604,13.816z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="594.5518" x2="594.5518" y1="835.2559" y2="839.4011">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 <ellipse cx="15.591" cy="25.635" fill="url(#SVGID_6_)" rx="2.954" ry="2.365"/>
-<path d="M15.591,24.455c1.376,0,2.521,0.754,2.851,1.771c0.062-0.189,0.104-0.386,0.104-0.592  c0-1.305-1.321-2.361-2.954-2.361c-1.632,0-2.955,1.057-2.955,2.361c0,0.206,0.043,0.402,0.104,0.592  C13.07,25.209,14.215,24.455,15.591,24.455z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="4.9546" x2="4.9546" y1="12.833" y2="22.1473">
+<path d="M15.591,24.455c1.376,0,2.521,0.754,2.851,1.771  c0.063-0.189,0.104-0.388,0.104-0.594c0-1.305-1.321-2.359-2.954-2.359c-1.632,0-2.955,1.057-2.955,2.359  c0,0.206,0.043,0.402,0.104,0.594C13.07,25.209,14.215,24.455,15.591,24.455z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="583.9141" x2="583.9141" y1="824.873" y2="834.1864">
 <stop offset="0" style="stop-color:#7A7A7A"/>
 <stop offset="1" style="stop-color:#212121"/>
 </linearGradient>
-<path d="M2.021,17.547c0.207,2.609,1.889,4.644,3.758,4.539c1.867-0.102,2.29-2.248,2.082-4.857  c-0.207-2.608-0.968-4.69-2.837-4.589C3.156,12.742,1.813,14.939,2.021,17.547z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="4.2163" x2="4.2163" y1="12.8813" y2="22.1374">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="0.7636" style="stop-color:#0487BF"/>
-<stop offset="1" style="stop-color:#059FE0"/>
+<path d="M2.021,17.547c0.207,2.609,1.889,4.645,3.758,4.539c1.867-0.102,2.29-2.248,2.082-4.857  c-0.207-2.606-0.968-4.688-2.837-4.587C3.156,12.742,1.813,14.939,2.021,17.547z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="583.1758" x2="583.1758" y1="824.9219" y2="834.177">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
-<path d="M6.432,18.152c0-2.214-0.646-4.167-1.641-5.467c-1.742,0.27-2.969,2.365-2.77,4.861  c0.204,2.566,1.834,4.564,3.666,4.533C6.156,20.954,6.432,19.605,6.432,18.152z" fill="url(#SVGID_8_)"/>
-<path d="M2.064,17.828c0.238-1.885,1.303-3.335,2.727-3.555c0.897,1.174,1.484,2.893,1.595,4.842  c0.026-0.316,0.045-0.636,0.045-0.963c0-2.214-0.646-4.167-1.641-5.467c-1.742,0.27-2.969,2.365-2.77,4.861  C2.029,17.645,2.052,17.732,2.064,17.828z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 -911 0)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-936.0454" x2="-936.0454" y1="12.833" y2="22.1473">
+<path d="M6.432,18.152c0-2.215-0.646-4.167-1.641-5.467c-1.742,0.27-2.969,2.365-2.77,4.861  c0.204,2.565,1.834,4.563,3.666,4.533C6.156,20.954,6.432,19.605,6.432,18.152z" fill="url(#SVGID_8_)"/>
+<path d="M2.064,17.828c0.238-1.885,1.303-3.335,2.727-3.555  c0.897,1.174,1.484,2.893,1.595,4.842c0.026-0.316,0.045-0.637,0.045-0.963c0-2.215-0.646-4.167-1.641-5.467  c-1.742,0.27-2.969,2.365-2.77,4.861C2.029,17.645,2.052,17.732,2.064,17.828z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<linearGradient gradientTransform="matrix(-1 0 0 1 -1461.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-1487.0063" x2="-1487.0063" y1="824.873" y2="834.1864">
 <stop offset="0" style="stop-color:#7A7A7A"/>
 <stop offset="1" style="stop-color:#212121"/>
 </linearGradient>
-<path d="M27.979,17.547c-0.207,2.609-1.889,4.644-3.758,4.539c-1.867-0.102-2.289-2.248-2.082-4.857  c0.207-2.608,0.969-4.69,2.837-4.589C26.844,12.742,28.188,14.939,27.979,17.547z" fill="url(#SVGID_9_)"/>
-<linearGradient gradientTransform="matrix(-1 0 0 1 -911 0)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-936.7837" x2="-936.7837" y1="12.8813" y2="22.1374">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="0.7636" style="stop-color:#0487BF"/>
-<stop offset="1" style="stop-color:#059FE0"/>
+<path d="M27.979,17.547c-0.207,2.609-1.889,4.645-3.758,4.539c-1.867-0.102-2.289-2.248-2.082-4.857  c0.207-2.606,0.969-4.688,2.838-4.587C26.844,12.742,28.188,14.939,27.979,17.547z" fill="url(#SVGID_9_)"/>
+<linearGradient gradientTransform="matrix(-1 0 0 1 -1461.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-1487.7446" x2="-1487.7446" y1="824.9219" y2="834.177">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
-<path d="M23.568,18.152c0-2.214,0.646-4.167,1.641-5.467c1.742,0.27,2.969,2.365,2.77,4.861  c-0.203,2.566-1.834,4.564-3.666,4.533C23.844,20.954,23.568,19.605,23.568,18.152z" fill="url(#SVGID_10_)"/>
-<path d="M27.936,17.828c-0.237-1.885-1.303-3.335-2.727-3.555c-0.896,1.174-1.484,2.893-1.596,4.842  c-0.025-0.316-0.045-0.636-0.045-0.963c0-2.214,0.646-4.167,1.641-5.467c1.742,0.27,2.969,2.365,2.77,4.861  C27.971,17.645,27.948,17.732,27.936,17.828z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M23.568,18.152c0-2.215,0.646-4.167,1.641-5.467c1.742,0.27,2.969,2.365,2.77,4.861  c-0.203,2.565-1.834,4.563-3.666,4.533C23.844,20.954,23.568,19.605,23.568,18.152z" fill="url(#SVGID_10_)"/>
+<path d="M27.936,17.828c-0.235-1.885-1.303-3.335-2.727-3.555  c-0.896,1.174-1.484,2.893-1.596,4.842c-0.025-0.316-0.045-0.637-0.045-0.963c0-2.215,0.646-4.167,1.641-5.467  c1.742,0.27,2.969,2.365,2.77,4.861C27.971,17.645,27.947,17.732,27.936,17.828z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_attachment.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_attachment.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_attachment.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,9 +7,9 @@
 <path d="M22,2h-8c-1.101,0-2,0.9-2,2v14.5c0,1.934,1.567,3.5,3.5,3.5s3.5-1.566,3.5-3.5V7h-2v11.5  c0,0.827-0.673,1.5-1.5,1.5S14,19.327,14,18.5V4h8v17.395L18.93,26H12.07L9,21.395V10H7v12l4,6h9l4-6V4C24,2.9,23.101,2,22,2z" fill="url(#SVGID_1_)"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.5005" x2="15.5005" y1="28" y2="2.0005">
-<stop offset="0" style="stop-color:#8C8E8F"/>
+<stop offset="0" style="stop-color:#8D8E8E"/>
 <stop offset="0.6545" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#AEB2B3"/>
+<stop offset="1" style="stop-color:#B0B2B1"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_authorised.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_authorised.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_authorised.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,44 +2,42 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
-<polygon fill="none" points="0,0 0,30 4.358,30 25.643,30 30,30 30,0 "/>
-<g>
 <rect fill="none" height="30" width="30"/>
-</g>
-<path d="M4.358,30c-0.942,0-1.709-0.768-1.709-1.71V13.747  c0-0.943,0.767-1.711,1.709-1.711h0.663V9.979C5.099,4.471,9.63,0,15.122,0c5.491,0,10.022,4.471,10.101,9.966v2.07h0.42  c0.941,0,1.709,0.768,1.709,1.711V28.29c0,0.942-0.768,1.71-1.709,1.71H4.358z M20.145,12.036V9.979  c-0.058-2.692-2.312-4.9-5.021-4.9s-4.965,2.208-5.021,4.922v2.035H20.145z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="273.6377" x2="291.5699" y1="-368.7476" y2="-368.7476">
+<path d="M25,13h-1v-3c0-4.963-4.037-9-9-9c-4.963,0-9,4.037-9,9v3H5c-1.654,0-3,1.346-3,3v10  c0,1.654,1.346,3,3,3h20c1.654,0,3-1.346,3-3V16C28,14.346,26.654,13,25,13z M12,10c0-1.654,1.346-3,3-3c1.654,0,3,1.346,3,3v3h-6  V10z" fill-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.0005" x2="23" y1="14" y2="14">
+<stop offset="0" style="stop-color:#B4B4B4"/>
+<stop offset="0.2083" style="stop-color:#F0F0F0"/>
+<stop offset="0.526" style="stop-color:#969696"/>
+<stop offset="0.8061" style="stop-color:#A1A1A1"/>
+<stop offset="1" style="stop-color:#BEBEBE"/>
+</linearGradient>
+<path d="M15,6c2.207,0,4,1.794,4,4v8c0,2.206-1.793,4-4,4c-2.206,0-4-1.794-4-4v-8C11,7.794,12.794,6,15,6   M15,2c-4.4,0-8,3.6-8,8v8c0,4.4,3.6,8,8,8c4.4,0,8-3.6,8-8v-8C23,5.6,19.4,2,15,2L15,2z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="7.0005" x2="23" y1="9" y2="9">
 <stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="0.5333" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#808080"/>
-</linearGradient>
-<path d="M15.122,1c-4.984,0-9.03,4.009-9.101,8.979v3.338H9.1V9.979c0.069-3.266,2.74-5.9,6.021-5.9  s5.951,2.635,6.021,5.9v4.477h3.078V9.979C24.152,5.009,20.107,1,15.122,1z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="274.1973" x2="291.0081" y1="-369.0322" y2="-369.0322">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.5152" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+<stop offset="0.2083" style="stop-color:#BDBDBD"/>
+<stop offset="0.526" style="stop-color:#707070"/>
+<stop offset="1" style="stop-color:#8F8F8F"/>
 </linearGradient>
-<path d="M21.714,13.888V9.979c-0.077-3.574-3.032-6.469-6.592-6.469c-3.559,0-6.514,2.895-6.592,6.458v4.488  H6.591V9.979c0.065-4.636,3.893-8.41,8.531-8.41c4.64,0,8.465,3.774,8.53,8.418v3.9L21.714,13.888L21.714,13.888z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="274.5469" x2="290.6592" y1="-369.0322" y2="-369.0322">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.5" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+<path d="M11,16v-6c0-2.206,1.794-4,4-4c2.207,0,4,1.794,4,4v6h4v-6c0-4.4-3.6-8-8-8c-4.4,0-8,3.6-8,8v6H11z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.0005" x2="22" y1="9.5" y2="9.5">
+<stop offset="0" style="stop-color:#B4B4B4"/>
+<stop offset="0.2083" style="stop-color:#F0F0F0"/>
+<stop offset="0.526" style="stop-color:#969696"/>
+<stop offset="0.8061" style="stop-color:#A1A1A1"/>
+<stop offset="1" style="stop-color:#BEBEBE"/>
 </linearGradient>
-<path d="M6.945,14.102V9.979c0.063-4.44,3.731-8.055,8.177-8.055S23.234,5.542,23.3,9.99v3.541h-1.231V9.979  c-0.08-3.767-3.196-6.824-6.945-6.824c-3.75,0-6.865,3.053-6.946,6.805v4.142H6.945z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="271.1289" x2="293.832" y1="-382.0376" y2="-382.0376">
-<stop offset="0" style="stop-color:#ED8C0D"/>
-<stop offset="0.24" style="stop-color:#FFE692"/>
-<stop offset="0.75" style="stop-color:#ED8C0D"/>
-<stop offset="0.8667" style="stop-color:#FFB81F"/>
-<stop offset="1" style="stop-color:#ED8C0D"/>
+<path d="M10,16v-6c0-2.757,2.243-5,5-5c2.757,0,5,2.243,5,5v6h2v-6c0-3.859-3.141-7-7-7c-3.859,0-7,3.141-7,7  v6H10z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="3.0005" x2="27" y1="21" y2="21">
+<stop offset="0" style="stop-color:#C2A770"/>
+<stop offset="0.24" style="stop-color:#DED7B3"/>
+<stop offset="0.75" style="stop-color:#AA8250"/>
+<stop offset="1" style="stop-color:#BCA162"/>
 </linearGradient>
-<path d="M26.352,28.29c0,0.392-0.317,0.71-0.709,0.71H4.358c-0.392,0-0.709-0.318-0.709-0.71V13.747  c0-0.392,0.317-0.711,0.709-0.711h21.283c0.393,0,0.709,0.319,0.709,0.711V28.29H26.352z" fill="url(#SVGID_4_)"/>
-<path d="M25.643,13.036H4.358c-0.392,0-0.709,0.319-0.709,0.711v0.709  c0-0.392,0.317-0.709,0.709-0.709h21.283c0.393,0,0.709,0.317,0.709,0.709v-0.709C26.352,13.355,26.033,13.036,25.643,13.036z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M25.643,29H4.358c-0.392,0-0.709-0.318-0.709-0.71v-0.709  c0,0.392,0.317,0.709,0.709,0.709h21.283c0.393,0,0.709-0.317,0.709-0.709v0.709C26.352,28.682,26.033,29,25.643,29z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<path d="M15,25.82c-0.689,0-1.25-0.562-1.25-1.25v-1.838  c-0.769-0.441-1.25-1.256-1.25-2.162c0-1.379,1.122-2.5,2.5-2.5c1.379,0,2.5,1.121,2.5,2.5c0,0.904-0.48,1.721-1.25,2.162v1.838  C16.25,25.26,15.689,25.82,15,25.82L15,25.82z" fill="#FFE591" fill-opacity="0.25" stroke-opacity="0.25"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="282.4805" x2="282.4805" y1="-386.0986" y2="-379.7186">
-<stop offset="0" style="stop-color:#A67C52"/>
-<stop offset="1" style="stop-color:#603813"/>
-</linearGradient>
-<path d="M17,20.57c0-1.104-0.896-2-2-2c-1.104,0-2,0.896-2,2c0,0.839,0.518,1.555,1.25,1.852v2.148  c0,0.414,0.336,0.75,0.75,0.75s0.75-0.336,0.75-0.75v-2.148C16.482,22.125,17,21.409,17,20.57z" fill="url(#SVGID_5_)"/>
+<path d="M27,26c0,1.1-0.9,2-2,2H5c-1.1,0-2-0.9-2-2V16c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V26z" fill="url(#SVGID_4_)"/>
+<path d="M25,27H5c-1.1,0-2-0.9-2-2v1c0,1.1,0.9,2,2,2h20c1.1,0,2-0.9,2-2v-1C27,26.1,26.1,27,25,27z" fill="#5E2D29" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M25,14H5c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2v-1C27,14.9,26.1,14,25,14z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill-opacity="0.2" height="2" stroke-opacity="0.2" width="24" x="3" y="23"/>
+<rect fill-opacity="0.2" height="2" stroke-opacity="0.2" width="24" x="3" y="19"/>
+<rect fill="none" height="30" width="30" x="0"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_blocked.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_blocked.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_blocked.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,18 +2,19 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
-<path d="M15,0.502c-8.009,0-14.5,6.489-14.5,14.499s6.491,14.5,14.5,14.5c8.009,0,14.5-6.49,14.5-14.5  S23.009,0.502,15,0.502z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -376.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="297.4795" x2="297.4795" y1="-381.5396" y2="-400.9155">
-<stop offset="0" style="stop-color:#EBEBEB"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+<rect fill="none" height="30" width="30"/>
+<path d="M15,29C7.279,29,1,22.72,1,15S7.279,1,15,1c7.719,0,14,6.28,14,14S22.719,29,15,29L15,29z" fill-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9985" x2="14.9985" y1="4.7378" y2="61.75">
+<stop offset="0" style="stop-color:#FFFFFF"/>
+<stop offset="1" style="stop-color:#4F4F4F"/>
 </linearGradient>
-<path d="M15,1.502c-7.457,0-13.5,6.042-13.5,13.499s6.043,13.5,13.5,13.5c7.456,0,13.5-6.043,13.5-13.5  S22.456,1.502,15,1.502z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -376.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="297.4795" x2="297.4795" y1="-377.5215" y2="-404.4265">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<circle cx="14.999" cy="15" fill="url(#SVGID_1_)" r="10"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="2" y2="27.9507">
+<stop offset="0" style="stop-color:#B36B4D"/>
+<stop offset="1" style="stop-color:#5A2633"/>
 </linearGradient>
-<path d="M15,1.502c-7.457,0-13.5,6.042-13.5,13.499s6.043,13.5,13.5,13.5c7.456,0,13.5-6.043,13.5-13.5  S22.456,1.502,15,1.502z M15,5.024c1.9,0,3.673,0.543,5.187,1.47L6.493,20.189c-0.928-1.514-1.471-3.285-1.471-5.188  C5.022,9.5,9.498,5.024,15,5.024z M15,24.979c-1.901,0-3.672-0.544-5.187-1.47L23.508,9.813c0.926,1.513,1.471,3.286,1.471,5.186  C24.979,20.503,20.503,24.979,15,24.979z" fill="url(#SVGID_2_)"/>
-<rect fill="none" height="30.001" width="30"/>
+<path d="M15,2C7.82,2,2,7.82,2,15s5.82,13,13,13s13-5.82,13-13S22.18,2,15,2z M15.001,6  c1.788,0,3.45,0.527,4.851,1.427L7.428,19.852C6.528,18.451,6,16.788,6,15C6,10.028,10.03,6,15.001,6z M15.001,24  c-1.929,0-3.711-0.611-5.176-1.645l12.53-12.531C23.389,11.289,24,13.071,24,15C24,19.971,19.971,24,15.001,24z" fill="url(#SVGID_2_)"/>
+<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13  S2,7.82,2,15c0,0.169,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bluetooth_offline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bluetooth_offline.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bluetooth_offline.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,9 +5,9 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,30C7.495,30,4,25.224,4,14.969C4,4.757,7.495,0,15,0  s11,4.757,11,14.969C26,25.364,22.607,30,15,30L15,30z" fill-opacity="0.6" fill-rule="evenodd" stroke-opacity="0.6"/>
 <radialGradient cx="41.9736" cy="5.1909" gradientTransform="matrix(0.9686 0 0 1 -26.1192 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.5175">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="0.7636" style="stop-color:#0487BF"/>
-<stop offset="1" style="stop-color:#059FE0"/>
+<stop offset="0" style="stop-color:#83CABF"/>
+<stop offset="0.7636" style="stop-color:#3C6287"/>
+<stop offset="1" style="stop-color:#477D9E"/>
 </radialGradient>
 <path d="M15,29c5.941,0,10-2.915,10-14.031C25,3.915,20.941,1,15,1  C9.115,1,5,3.915,5,14.969C5,26.085,9.115,29,15,29L15,29z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
 <path d="M14.537,3.475v9.976l-4.043-4.168L9,10.798l5.1,5.177L9,21.215  l1.494,1.515l4.043-4.166v9.911L22,20.962l-4.914-4.987L22,11.05L14.537,3.475z M19.014,20.962L16.65,23.36v-4.797L19.014,20.962z   M16.65,13.45V8.651l2.363,2.398L16.65,13.45z" fill-opacity="0.2" fill-rule="evenodd" stroke-opacity="0.2"/>
@@ -20,9 +20,9 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="339.8" x2="339.8" y1="-397.3" y2="-425.3">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.2606" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.2606" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_low_battery.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_low_battery.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_low_battery.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,9 +6,9 @@
 <polygon fill-opacity="0.35" points="6.199,29 6.199,3.6 11.4,3.6 11.4,1 18.6,1 18.6,3.6 23.799,3.6 23.799,29 " stroke-opacity="0.35"/>
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.1992" x2="22.7988" y1="16.2998" y2="16.2998">
-<stop offset="0" style="stop-color:#7C7E87"/>
-<stop offset="0.4182" style="stop-color:#D0D0D2"/>
-<stop offset="1" style="stop-color:#94979D"/>
+<stop offset="0" style="stop-color:#7F8084"/>
+<stop offset="0.4182" style="stop-color:#D1D1D1"/>
+<stop offset="1" style="stop-color:#97999A"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="23.4" width="15.6" x="7.199" y="4.6"/>
 </g>
@@ -22,16 +22,16 @@
 </g>
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="12.4004" x2="17.5996" y1="3.2998" y2="3.2998">
-<stop offset="0" style="stop-color:#7C7E87"/>
-<stop offset="0.5394" style="stop-color:#D0D0D2"/>
-<stop offset="1" style="stop-color:#94979D"/>
+<stop offset="0" style="stop-color:#7F8084"/>
+<stop offset="0.5394" style="stop-color:#D1D1D1"/>
+<stop offset="1" style="stop-color:#97999A"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="2.6" width="5.199" x="12.4" y="2"/>
 </g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.416" x2="20.4993" y1="23.8594" y2="23.8594">
-<stop offset="0" style="stop-color:#D4270D"/>
-<stop offset="0.3394" style="stop-color:#EB7A29"/>
-<stop offset="1" style="stop-color:#C90000"/>
+<stop offset="0" style="stop-color:#984E49"/>
+<stop offset="0.3394" style="stop-color:#B18563"/>
+<stop offset="1" style="stop-color:#8D3C45"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="3" width="11" x="9.5" y="22.359"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_high.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_high.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_high.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,33 +7,33 @@
 <rect fill-opacity="0.35" height="18" stroke-opacity="0.35" width="8" x="11" y="9"/>
 <rect fill-opacity="0.35" height="24" stroke-opacity="0.35" width="8" x="21" y="3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="15.8965" y2="26.0217">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="10" width="6" x="2" y="16"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="7.3999" y2="24.801">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="8" width="4" x="3" y="17"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="9.959" y2="25.959">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="16" width="6" x="12" y="10"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15" x2="15" y1="5.75" y2="24.7824">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="14" width="4" x="13" y="11"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="25" x2="25" y1="4" y2="25.7514">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="22" width="6" x="22" y="4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="25" x2="25" y1="5" y2="24.774">
-<stop offset="0" style="stop-color:#88E400"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#69A044"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="20" width="4" x="23" y="5"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_low.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_low.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_low.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,13 +7,13 @@
 <rect fill-opacity="0.35" height="18" stroke-opacity="0.35" width="8" x="11" y="9"/>
 <rect fill-opacity="0.35" height="24" stroke-opacity="0.35" width="8" x="21" y="3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="16" y2="26.1373">
-<stop offset="0" style="stop-color:#FBB03B"/>
-<stop offset="1" style="stop-color:#E14F16"/>
+<stop offset="0" style="stop-color:#C1A775"/>
+<stop offset="1" style="stop-color:#A46853"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="10" width="6" x="2" y="16"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="17" y2="25.1098">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<stop offset="0" style="stop-color:#A8835F"/>
+<stop offset="1" style="stop-color:#9A5047"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="8" width="4" x="3" y="17"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 11700.957 0)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="11685.957" x2="11685.957" y1="4" y2="26">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_medium.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_medium.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_medium.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,23 +7,23 @@
 <rect fill-opacity="0.35" height="18" stroke-opacity="0.35" width="8" x="11" y="9"/>
 <rect fill-opacity="0.35" height="24" stroke-opacity="0.35" width="8" x="21" y="3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="9.75" y2="25.5">
-<stop offset="0" style="stop-color:#FFF48F"/>
-<stop offset="1" style="stop-color:#FFB120"/>
+<stop offset="0" style="stop-color:#DDDAB1"/>
+<stop offset="1" style="stop-color:#BC9F63"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="10" width="6" x="2" y="16"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="12" y2="24.6">
-<stop offset="0" style="stop-color:#FECF5E"/>
-<stop offset="1" style="stop-color:#FF9E01"/>
+<stop offset="0" style="stop-color:#CEBF8E"/>
+<stop offset="1" style="stop-color:#B38C4D"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="8" width="4" x="3" y="17"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="9.917" y2="26.0034">
-<stop offset="0" style="stop-color:#FFF48F"/>
-<stop offset="1" style="stop-color:#FFB120"/>
+<stop offset="0" style="stop-color:#DDDAB1"/>
+<stop offset="1" style="stop-color:#BC9F63"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="16" width="6" x="12" y="10"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15" x2="15" y1="10.7813" y2="24.5625">
-<stop offset="0" style="stop-color:#FECF5E"/>
-<stop offset="1" style="stop-color:#FF9E01"/>
+<stop offset="0" style="stop-color:#CEBF8E"/>
+<stop offset="1" style="stop-color:#B38C4D"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="14" width="4" x="13" y="11"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 11381.0703 0)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11356.0703" x2="11356.0703" y1="4" y2="25.7514">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_business_card.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_business_card.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_business_card.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -13,13 +13,13 @@
 <rect fill="#020202" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="26" x="2" y="24"/>
 <rect fill="#FFFFFF" height="14" width="14" x="3" y="7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="10" x2="10" y1="20.1982" y2="7.7075">
-<stop offset="0" style="stop-color:#3FA8F4"/>
-<stop offset="1" style="stop-color:#8DC8E1"/>
+<stop offset="0" style="stop-color:#75B1BE"/>
+<stop offset="1" style="stop-color:#A6C8C1"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="12" width="12" x="4" y="8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="9.7114" x2="9.7114" y1="19.9209" y2="3.3869">
-<stop offset="0" style="stop-color:#146BAF"/>
-<stop offset="1" style="stop-color:#013B77"/>
+<stop offset="0" style="stop-color:#425A81"/>
+<stop offset="1" style="stop-color:#242954"/>
 </linearGradient>
 <path d="M15,20c-0.046-1.653-1.578-2.359-2.485-2.926l-1.296-0.788c-0.534-0.37,0.098-0.794,0.467-1.508  c0.547-1.06,0.667-1.647,0.667-2.505c0-1.559-1.161-2.851-2.616-2.851c-0.009,0-0.016,0.002-0.026,0.003  C9.703,9.425,9.695,9.423,9.686,9.423c-1.456,0-2.615,1.292-2.615,2.851c0,0.857,0.121,1.446,0.667,2.505  c0.37,0.716,1.001,1.138,0.466,1.508l-1.575,0.788C5.722,17.641,4.469,18.347,4.422,20H15z" fill="url(#SVGID_3_)"/>
 <rect fill="#020202" fill-opacity="0.5" height="2" stroke-opacity="0.5" width="7" x="19" y="8"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_calendar.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_calendar.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_calendar.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -20,28 +20,28 @@
 <path d="M21.843,22.811V24h-6.098v-0.745c0-0.711,0.123-1.343,0.369-1.894s0.55-1.021,0.909-1.412  c0.359-0.389,0.816-0.816,1.367-1.281c0.66-0.557,1.078-0.986,1.251-1.292s0.26-0.608,0.26-0.909c0-0.529-0.14-0.926-0.421-1.193  c-0.279-0.266-0.7-0.399-1.261-0.399c-0.593,0-1.31,0.153-2.153,0.458h-0.014v-1.217c0.885-0.277,1.746-0.417,2.584-0.417  c1.035,0,1.82,0.227,2.358,0.681c0.538,0.453,0.807,1.121,0.807,2.006c0,0.496-0.12,0.985-0.362,1.467  c-0.242,0.48-0.811,1.097-1.709,1.849c-0.502,0.424-0.893,0.776-1.176,1.06s-0.521,0.594-0.715,0.934  c-0.193,0.339-0.299,0.711-0.317,1.117H21.843z" fill="url(#SVGID_3_)"/>
 <polygon fill="#FFFFFF" points="8,22 8,27 3,22 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="5" y2="11">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C6957B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="6" width="24" x="3" y="5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="10" x2="10" y1="6" y2="10">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+<stop offset="0" style="stop-color:#351A25"/>
+<stop offset="1" style="stop-color:#803F4F"/>
 </linearGradient>
 <circle cx="10" cy="8" fill="url(#SVGID_5_)" r="2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="20" x2="20" y1="6" y2="10">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+<stop offset="0" style="stop-color:#351A25"/>
+<stop offset="1" style="stop-color:#803F4F"/>
 </linearGradient>
 <circle cx="20" cy="8" fill="url(#SVGID_6_)" r="2"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="24" x="3" y="5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="10" x2="10" y1="3" y2="9">
-<stop offset="0" style="stop-color:#FFFCFE"/>
+<stop offset="0" style="stop-color:#FEFDFD"/>
 <stop offset="1" style="stop-color:#8C8C8C"/>
 </linearGradient>
 <path d="M11,8c0,0.55-0.45,1-1,1l0,0C9.45,9,9,8.55,9,8V4c0-0.55,0.45-1,1-1l0,0c0.55,0,1,0.45,1,1V8z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="20" x2="20" y1="3" y2="9">
-<stop offset="0" style="stop-color:#FFFCFE"/>
+<stop offset="0" style="stop-color:#FEFDFD"/>
 <stop offset="1" style="stop-color:#8C8C8C"/>
 </linearGradient>
 <path d="M21,8c0,0.55-0.45,1-1,1l0,0c-0.55,0-1-0.45-1-1V4c0-0.55,0.45-1,1-1l0,0c0.55,0,1,0.45,1,1V8z" fill="url(#SVGID_8_)"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_car.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_car.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_car.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -17,8 +17,8 @@
 </linearGradient>
 <path d="M22,22v3c0,0.55,0.563,1,1.25,1h2.5c0.688,0,1.25-0.45,1.25-1v-3H22z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="4.0625" y2="14.942">
-<stop offset="0" style="stop-color:#F7CC01"/>
-<stop offset="1" style="stop-color:#FFAB01"/>
+<stop offset="0" style="stop-color:#AD9A4B"/>
+<stop offset="1" style="stop-color:#B3914D"/>
 </linearGradient>
 <path d="M27.5,15L25,7c-0.267-1.067-2-3-4-3H9C7,4,5.267,5.933,5,7l-2.5,8H27.5z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.0005" x2="15.0005" y1="5.5454" y2="13.4578">
@@ -27,45 +27,45 @@
 </linearGradient>
 <path d="M4.541,13.5l1.891-6.053C6.572,6.899,7.762,5.5,9,5.5h12c1.238,0,2.428,1.399,2.545,1.863  l1.916,6.137H4.541z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="2" x2="28" y1="17.5" y2="17.5">
-<stop offset="0" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+<stop offset="0" style="stop-color:#B39C4D"/>
+<stop offset="1" style="stop-color:#B3964D"/>
 </linearGradient>
 <path d="M25,12H5c-1.65,0-3,1.35-3,3v6c0,1.1,0.9,2,2,2h22c1.1,0,2-0.9,2-2v-6C28,13.35,26.65,12,25,12z" fill="url(#SVGID_5_)"/>
 <path d="M7.416,12l1.04,3.383C8.908,16.85,10.465,18,12,18h6c1.535,0,3.092-1.15,3.544-2.617  L22.584,12H7.416z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="6" x2="6" y1="18" y2="13.0005">
-<stop offset="0" style="stop-color:#F0B901"/>
-<stop offset="1" style="stop-color:#ED7E00"/>
+<stop offset="0" style="stop-color:#A88E49"/>
+<stop offset="1" style="stop-color:#A67447"/>
 </linearGradient>
 <path d="M6,18c-1.654,0-3-1.121-3-2.5S4.346,13,6,13s3,1.121,3,2.5S7.654,18,6,18L6,18z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="6" x2="6" y1="13.834" y2="17.1665">
 <stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="1" style="stop-color:#C8C8D2"/>
+<stop offset="1" style="stop-color:#CBCFCF"/>
 </linearGradient>
 <ellipse cx="6" cy="15.5" fill="url(#SVGID_7_)" rx="2" ry="1.666"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="24" x2="24" y1="18" y2="13.0005">
-<stop offset="0" style="stop-color:#F0B901"/>
-<stop offset="1" style="stop-color:#ED7E00"/>
+<stop offset="0" style="stop-color:#A88E49"/>
+<stop offset="1" style="stop-color:#A67447"/>
 </linearGradient>
 <path d="M24,18c-1.654,0-3-1.121-3-2.5s1.346-2.5,3-2.5s3,1.121,3,2.5S25.654,18,24,18L24,18z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="24" x2="24" y1="13.834" y2="17.1665">
 <stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="1" style="stop-color:#C8C8D2"/>
+<stop offset="1" style="stop-color:#CBCFCF"/>
 </linearGradient>
 <ellipse cx="24" cy="15.5" fill="url(#SVGID_9_)" rx="2" ry="1.666"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="2" x2="28" y1="19.5" y2="19.5">
-<stop offset="0" style="stop-color:#FF9000"/>
-<stop offset="0.511" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#FF8800"/>
+<stop offset="0" style="stop-color:#B3864D"/>
+<stop offset="0.511" style="stop-color:#B39C4D"/>
+<stop offset="1" style="stop-color:#B3834D"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="1" width="26" x="2" y="19"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="15.0005" x2="15.0005" y1="17" y2="12.0005">
-<stop offset="0" style="stop-color:#D67900"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#966640"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </linearGradient>
 <path d="M8.461,12l0.951,3.088C9.735,16.14,10.9,17,12,17h6c1.1,0,2.265-0.86,2.588-1.912L21.539,12H8.461z" fill="url(#SVGID_11_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="14.9995" x2="14.9995" y1="12.0625" y2="16.4384">
-<stop offset="0" style="stop-color:#FFE896"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+<stop offset="0" style="stop-color:#E0D9B5"/>
+<stop offset="1" style="stop-color:#B3964D"/>
 </linearGradient>
 <path d="M8.984,12l0.905,2.941C10.15,15.786,11.116,16.5,12,16.5h6c0.884,0,1.85-0.714,2.11-1.559L21.016,12  H8.984z" fill="url(#SVGID_12_)"/>
 <path d="M23.225,8.01l-0.164-0.523C22.977,7.199,21.979,6,21,6H9C8.035,6,7.01,7.203,6.908,7.596  L6.283,9.599L23.225,8.01z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_charger.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_charger.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_charger.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,9 +5,9 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M23,10V1h-5v9h-6V1H7v9H4v7c0,3.52,2.613,6.433,6,6.92V26h2v3h6v-3h2v-2.08c3.387-0.487,6-3.4,6-6.92v-7H23z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="8" x2="11" y1="7" y2="7">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.4" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#686E70"/>
+<stop offset="1" style="stop-color:#6A6C6E"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="10" width="3" x="8" y="2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8" x2="11" y1="9.5" y2="9.5">
@@ -23,9 +23,9 @@
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="4" width="3" x="19" y="8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="19" x2="22" y1="7" y2="7">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.4" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#686E70"/>
+<stop offset="1" style="stop-color:#6A6C6E"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="10" width="3" x="19" y="2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="19" x2="22" y1="9.5" y2="9.5">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_collapse.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_collapse.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_collapse.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -10,8 +10,8 @@
 <polygon fill="#FFFFFF" points="23,13,7,13,7,17,23,17"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1" y2="29.19">
-<stop offset="0" stop-color="#F7992E"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#BB986A"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_company_details.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_company_details.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_company_details.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -10,18 +10,18 @@
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="19" width="13" x="15" y="9"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="23.5" x2="23.5" y1="14" y2="11">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="3" width="9" x="19" y="11"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="23.5" x2="23.5" y1="19" y2="16">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="3" width="9" x="19" y="16"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="23.5" x2="23.5" y1="24" y2="21">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="3" width="9" x="19" y="21"/>
 <rect fill-opacity="0.6" height="28" stroke-opacity="0.6" width="19" x="1" y="1"/>
@@ -31,56 +31,56 @@
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="26" width="17" x="2" y="2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="5.5" x2="5.5" y1="4.0557" y2="8.9507">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#67A7B1"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="5" width="3" x="4" y="4"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="4" y="8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="5.5" x2="5.5" y1="12.0557" y2="16.9512">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#67A7B1"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="5" width="3" x="4" y="12"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="4" y="16"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="5.5" x2="5.5" y1="20.0557" y2="24.9507">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#67A7B1"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="5" width="3" x="4" y="20"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="4" y="24"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="10.5" x2="10.5" y1="4.0557" y2="8.9507">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#67A7B1"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="5" width="3" x="9" y="4"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="9" y="8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="10.5" x2="10.5" y1="12.0557" y2="16.9512">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#67A7B1"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="5" width="3" x="9" y="12"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="9" y="16"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="10.5" x2="10.5" y1="20.0557" y2="24.9507">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#67A7B1"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <rect fill="url(#SVGID_11_)" height="5" width="3" x="9" y="20"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="9" y="24"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="15.4995" x2="15.4995" y1="4.0557" y2="8.9507">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#67A7B1"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <rect fill="url(#SVGID_12_)" height="5" width="3" x="14" y="4"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="14" y="8"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="15.4995" x2="15.4995" y1="12.0557" y2="16.9512">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#67A7B1"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <rect fill="url(#SVGID_13_)" height="5" width="3" x="14" y="12"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="14" y="16"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="15.4995" x2="15.4995" y1="20.0557" y2="24.9507">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#67A7B1"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <rect fill="url(#SVGID_14_)" height="5" width="3" x="14" y="20"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="14" y="24"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connected.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connected.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connected.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -11,8 +11,8 @@
 <path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13  S2,7.82,2,15c0,0.169,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connection.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connection.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connection.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,30 +6,30 @@
 <path d="M20.752,15.001H1.27c-0.555,0-0.998,0.273-1.186,0.73c-0.186,0.459-0.059,0.966,0.34,1.355l10.515,10.314  c0.339,0.335,0.687,0.404,0.918,0.404c0.565,0,1.165-0.448,1.165-1.28v-4.398h7.73c0.842,0,1.527-0.69,1.527-1.538v-4.051  C22.279,15.69,21.594,15.001,20.752,15.001z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <path d="M29.58,12.911L19.063,2.596c-0.339-0.333-0.685-0.402-0.916-0.402c-0.564,0-1.165,0.449-1.165,1.281v4.399  h-7.73c-0.842,0-1.525,0.689-1.525,1.537v4.051c0,0.847,0.684,1.535,1.525,1.535h19.482c0.555,0,0.998-0.273,1.186-0.73  C30.105,13.808,29.979,13.301,29.58,12.911z" fill-opacity="0.35" stroke-opacity="0.35"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="11.1406" x2="11.1406" y1="16.103" y2="27.0009">
-<stop offset="0" style="stop-color:#CDEDBD"/>
-<stop offset="0.9879" style="stop-color:#139900"/>
-<stop offset="1" style="stop-color:#139900"/>
+<stop offset="0" style="stop-color:#D6DFCB"/>
+<stop offset="0.9879" style="stop-color:#2E6B4D"/>
+<stop offset="1" style="stop-color:#2E6B4D"/>
 </linearGradient>
 <path d="M21.279,20.589c0,0.294-0.236,0.538-0.527,0.538h-8.205c-0.287,0-0.525,0.241-0.525,0.537v4.861  c0,0.295-0.172,0.37-0.38,0.165L1.125,16.373c-0.211-0.205-0.144-0.372,0.145-0.372h19.482c0.289,0,0.527,0.241,0.527,0.537V20.589z  " fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.7783" x2="11.7783" y1="17.0737" y2="24.8819">
-<stop offset="0" style="stop-color:#82C94C"/>
-<stop offset="0.2545" style="stop-color:#439020"/>
-<stop offset="0.5091" style="stop-color:#0D4D07"/>
-<stop offset="1" style="stop-color:#0D4D07"/>
+<stop offset="0" style="stop-color:#88A372"/>
+<stop offset="0.2545" style="stop-color:#426E4B"/>
+<stop offset="0.5091" style="stop-color:#1C3837"/>
+<stop offset="1" style="stop-color:#1C3837"/>
 </linearGradient>
 <path d="M3.336,17.06h16.885v3.009h-7.674c-0.872,0-1.584,0.715-1.584,1.596v2.878L3.336,17.06z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="18.8643" x2="18.8643" y1="3.2227" y2="14.1618">
-<stop offset="0" style="stop-color:#CDEDBD"/>
-<stop offset="0.4909" style="stop-color:#CDEDBD"/>
-<stop offset="0.9879" style="stop-color:#139900"/>
-<stop offset="1" style="stop-color:#139900"/>
+<stop offset="0" style="stop-color:#D6DFCB"/>
+<stop offset="0.4909" style="stop-color:#D6DFCB"/>
+<stop offset="0.9879" style="stop-color:#2E6B4D"/>
+<stop offset="1" style="stop-color:#2E6B4D"/>
 </linearGradient>
 <path d="M8.727,9.411c0-0.296,0.235-0.537,0.525-0.537h8.206c0.288,0,0.524-0.242,0.524-0.538V3.475  c0-0.297,0.172-0.37,0.381-0.165l10.516,10.315c0.211,0.205,0.144,0.372-0.145,0.372H9.252c-0.289,0-0.525-0.241-0.525-0.535V9.411z  " fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="18.2266" x2="18.2266" y1="5.4292" y2="12.9712">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.703" style="stop-color:#439020"/>
-<stop offset="0.9879" style="stop-color:#0D4D07"/>
-<stop offset="1" style="stop-color:#0D4D07"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.703" style="stop-color:#426E4B"/>
+<stop offset="0.9879" style="stop-color:#1C3837"/>
+<stop offset="1" style="stop-color:#1C3837"/>
 </linearGradient>
 <path d="M9.785,12.938V9.933h7.673c0.872,0,1.583-0.718,1.583-1.597V5.458l7.627,7.48H9.785z" fill="url(#SVGID_4_)"/>
 <rect fill="none" height="30" width="30" x="0.002"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_contacts.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_contacts.svg	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<rect fill="none" height="30" width="30"/>
-<path d="M4,1v5C2.896,6,2,6.897,2,8s0.896,2,2,2v1c-1.104,0-2,0.897-2,2s0.896,2,2,2v1c-1.104,0-2,0.897-2,2  s0.896,2,2,2v1c-1.104,0-2,0.897-2,2s0.896,2,2,2v4h24V1H4z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="18" x2="18" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" height="26" width="18" x="9" y="2"/>
-<path d="M19.134,16.857c-0.005-0.08,0-0.161,0.002-0.242c0.532-0.371,0.993-0.9,1.274-1.472  c0.52-1.056,0.389-3.753,0.389-3.753c0-1.102-1.65-2.391-2.725-2.391h-0.386c-1.075,0-2.726,1.289-2.726,2.391  c0,0-0.098,2.688,0.39,3.753c0.267,0.582,0.736,1.116,1.281,1.487c0.001,0.075,0.007,0.151,0.002,0.227  c-0.066,1.08-3.579,2.914-3.751,3.148V23h10v-2.992C22.713,19.772,19.2,17.938,19.134,16.857z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="7" x2="7" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A5A5A5"/>
-</linearGradient>
-<rect fill="url(#SVGID_2_)" height="26" width="4" x="5" y="2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="5" x2="5" y1="6.75" y2="8.75">
-<stop offset="0" style="stop-color:#ABABAB"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
-</linearGradient>
-<path d="M7,8c0,0.55-0.45,1-1,1H4C3.45,9,3,8.55,3,8l0,0c0-0.55,0.45-1,1-1h2C6.55,7,7,7.45,7,8L7,8z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="5" x2="5" y1="11.75" y2="13.75">
-<stop offset="0" style="stop-color:#ABABAB"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
-</linearGradient>
-<path d="M7,13c0,0.55-0.45,1-1,1H4c-0.55,0-1-0.45-1-1l0,0c0-0.55,0.45-1,1-1h2C6.55,12,7,12.45,7,13L7,13z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="5" x2="5" y1="16.75" y2="18.75">
-<stop offset="0" style="stop-color:#ABABAB"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
-</linearGradient>
-<path d="M7,18c0,0.55-0.45,1-1,1H4c-0.55,0-1-0.45-1-1l0,0c0-0.55,0.45-1,1-1h2C6.55,17,7,17.45,7,18L7,18z" fill="url(#SVGID_5_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="5" x2="5" y1="21.75" y2="23.75">
-<stop offset="0" style="stop-color:#ABABAB"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
-</linearGradient>
-<path d="M7,23c0,0.55-0.45,1-1,1H4c-0.55,0-1-0.45-1-1l0,0c0-0.55,0.45-1,1-1h2C6.55,22,7,22.45,7,23L7,23z" fill="url(#SVGID_6_)"/>
-<path d="M19.134,15.857c-0.005-0.08,0-0.161,0.002-0.242c0.532-0.371,0.993-0.9,1.274-1.472  c0.52-1.056,0.389-3.753,0.389-3.753c0-1.102-1.65-2.391-2.725-2.391h-0.386c-1.075,0-2.726,1.289-2.726,2.391  c0,0-0.098,2.688,0.39,3.753c0.267,0.582,0.736,1.116,1.281,1.487c0.001,0.075,0.007,0.151,0.002,0.227  c-0.066,1.08-3.579,2.914-3.751,3.148V22h10v-2.992C22.713,18.772,19.2,16.938,19.134,15.857z" fill="#FFFFFF"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="22" x="5" y="2"/>
-<rect fill="none" height="30" width="30"/>
-</g>
-</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_corrupted.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_corrupted.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_corrupted.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,14 +4,14 @@
 <g>
 <polygon fill-opacity="0.6" points="17.131,28 13.66,22.792 18.681,18.775 13.68,10.775 18.772,6.701 16.683,2 28,2 28,28 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="21" x2="21" y1="3" y2="27.0005">
-<stop offset="0" style="stop-color:#FF7D45"/>
-<stop offset="1" style="stop-color:#A10000"/>
+<stop offset="0" style="stop-color:#C79A7D"/>
+<stop offset="1" style="stop-color:#71303C"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="17.666,27 27,27 27,3 18.222,3 20,7 15,11 20,19 15,23 "/>
 <polygon fill-opacity="0.6" points="8.586,28 2,21.414 2,2 13.872,2 16.228,7.299 11.32,11.225 16.319,19.225 11.341,23.208   14.535,28 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="9" x2="9" y1="3" y2="27.0005">
-<stop offset="0" style="stop-color:#FF7D45"/>
-<stop offset="1" style="stop-color:#A10000"/>
+<stop offset="0" style="stop-color:#C79A7D"/>
+<stop offset="1" style="stop-color:#71303C"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="12.667,27 10,23 15,19 10,11 15,7 13.222,3 3,3 3,21 9,27 "/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 30 0)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="24" x2="24" y1="21.0313" y2="26.9415">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_day.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_day.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_day.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -11,28 +11,28 @@
 <rect fill="url(#SVGID_1_)" height="22" width="22" x="4" y="5"/>
 <polygon fill="#FFFFFF" points="9,22 9,27 4,22 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="5" y2="11">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+<stop offset="0" style="stop-color:#C6957B"/>
+<stop offset="1" style="stop-color:#73414B"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="6" width="22" x="4" y="5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="10" x2="10" y1="6" y2="10">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+<stop offset="0" style="stop-color:#351A25"/>
+<stop offset="1" style="stop-color:#803F4F"/>
 </linearGradient>
 <circle cx="10" cy="8" fill="url(#SVGID_3_)" r="2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="20" x2="20" y1="6" y2="10">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+<stop offset="0" style="stop-color:#351A25"/>
+<stop offset="1" style="stop-color:#803F4F"/>
 </linearGradient>
 <circle cx="20" cy="8" fill="url(#SVGID_4_)" r="2"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="22" x="4" y="5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="10" x2="10" y1="3" y2="9">
-<stop offset="0" style="stop-color:#FFFCFE"/>
+<stop offset="0" style="stop-color:#FEFDFD"/>
 <stop offset="1" style="stop-color:#8C8C8C"/>
 </linearGradient>
 <path d="M11,8c0,0.55-0.45,1-1,1l0,0C9.45,9,9,8.55,9,8V4c0-0.55,0.45-1,1-1l0,0c0.55,0,1,0.45,1,1V8z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="20" x2="20" y1="3" y2="9">
-<stop offset="0" style="stop-color:#FFFCFE"/>
+<stop offset="0" style="stop-color:#FEFDFD"/>
 <stop offset="1" style="stop-color:#8C8C8C"/>
 </linearGradient>
 <path d="M21,8c0,0.55-0.45,1-1,1l0,0c-0.55,0-1-0.45-1-1V4c0-0.55,0.45-1,1-1l0,0c0.55,0,1,0.45,1,1V8z" fill="url(#SVGID_6_)"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_dictionary.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_dictionary.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_dictionary.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,20 +4,20 @@
 <g>
 <rect fill="none" height="30" width="30"/>
 <path d="M6,1C4.346,1,3,2.346,3,4v22c0,1.654,1.346,3,3,3h21V1H6z" fill-opacity="0.6"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -336)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="293" x2="293" y1="-338" y2="-364">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -854.9609 -1148.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="871.96" x2="871.96" y1="-1150.0391" y2="-1176.0391">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="26" width="18" x="8" y="2"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="18" x="8" y="2"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -336)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="282" x2="282" y1="-338" y2="-364">
+<linearGradient gradientTransform="matrix(1 0 0 -1 -854.9609 -1148.0391)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="860.96" x2="860.96" y1="-1150.0391" y2="-1176.0391">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#A5A5A5"/>
 </linearGradient>
 <path d="M8,2H6C4.9,2,4,2.9,4,4v22c0,1.1,0.9,2,2,2h2V2z" fill="url(#SVGID_2_)"/>
-<path d="M10.822,12.006h5.533V8.873h1.235v3.133h5.589v6.551h-1.178v-0.775H17.59v5.346h-1.235v-5.346H12v0.775  h-1.178V12.006z M12,16.718h4.354v-3.649H12V16.718z M22.001,13.068H17.59v3.649h4.411V13.068z" fill-opacity="0.2"/>
+<path d="M10.822,12.006h5.534V8.873h1.234v3.133h5.59v6.551h-1.179v-0.773H17.59v5.346h-1.234v-5.346H12v0.773  h-1.178V12.006z M12,16.718h4.354v-3.649H12V16.718z M22.001,13.068H17.59v3.649h4.411V13.068z" fill-opacity="0.2"/>
 <g>
-<path d="M10.822,11.006h5.533V7.873h1.235v3.133h5.589v6.551h-1.178v-0.775H17.59v5.346h-1.235v-5.346H12v0.775   h-1.178V11.006z M12,15.718h4.354v-3.649H12V15.718z M22.001,12.068H17.59v3.649h4.411V12.068z" fill="#FFFFFF"/>
+<path d="M10.822,11.006h5.534V7.873h1.234v3.133h5.59v6.551h-1.179v-0.773H17.59v5.346h-1.234v-5.346H12v0.773   h-1.178V11.006z M12,15.718h4.354v-3.649H12V15.718z M22.001,12.068H17.59v3.649h4.411V12.068z" fill="#FFFFFF"/>
 </g>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_disconnected.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_disconnected.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_disconnected.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -22,8 +22,8 @@
 <rect fill-opacity="0.5" height="3" stroke-opacity="0.5" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 0.661 28.1527)" width="1" x="5.661" y="12.44"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#CCF87C"/>
-<stop offset="1" style="stop-color:#689E4F"/>
+<stop offset="0" style="stop-color:#C5D3A1"/>
+<stop offset="1" style="stop-color:#6D8667"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_drm_rights_expired.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_drm_rights_expired.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_drm_rights_expired.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,36 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30px" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M23.984,8.778c-0.473-3.282-0.868-5.2-1.182-5.701C22.725,2.951,20.813,0,14.888,0  C8.912,0,7.265,3.002,7.227,3.079C6.853,3.7,6.363,6.517,6.012,8.826c-0.098,1.013,0.428,2.248,1.291,2.927  c1.198,0.784,2.063,1.291,2.696,1.623v2.622h1V25l4,4.824l4-4.825V23l-0.636-0.616l1.212-1.303l-1.244-1.34l1.351-1.388  l-1.302-1.276L19,16.43v-0.432h1v-2.632c0.646-0.34,1.527-0.859,2.756-1.665C23.544,11.078,24.075,9.847,23.984,8.778z M12.5,5h5  C17.771,5,18,5.229,18,5.5S17.771,6,17.5,6h-5C12.229,6,12,5.771,12,5.5S12.229,5,12.5,5z" fill-opacity="0.6"/>
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<path d="M23.984,8.778c-0.472-3.282-0.868-5.2-1.181-5.701C22.725,2.951,20.813,0,14.888,0  C8.912,0,7.265,3.002,7.227,3.079C6.853,3.7,6.363,6.517,6.012,8.826c-0.098,1.013,0.428,2.248,1.291,2.927  c1.198,0.784,2.063,1.291,2.696,1.623v2.622h1V25l4,4.824l4-4.825V23l-0.635-0.616l1.211-1.303l-1.244-1.34l1.351-1.388  l-1.302-1.276L19,16.43v-0.432h1v-2.632c0.646-0.34,1.527-0.859,2.756-1.665C23.544,11.078,24.075,9.847,23.984,8.778z M12.5,5h5  C17.771,5,18,5.229,18,5.5S17.771,6,17.5,6h-5C12.229,6,12,5.771,12,5.5S12.229,5,12.5,5z" fill-opacity="0.6"/>
 <polygon fill="url(#SVGID_1_)" points="12,24.641 12,14.998 11,14.998 11,12 19,12 19,14.998 18,14.998 18,16.027 16.977,17.102   18.271,18.37 16.952,19.727 18.211,21.081 16.967,22.42 18,23.423 18,24.639 15,28.258 "/>
 <polygon fill="url(#SVGID_1_)" points="12,24.641 12,14.998 11,14.998 11,12 19,12 19,14.998 18,14.998 18,16.027 16.977,17.102   18.271,18.37 16.952,19.727 18.211,21.081 16.967,22.42 18,23.423 18,24.639 15,28.258 "/>
 <rect fill-opacity="0.3" height="2" width="8" x="11" y="12"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 -334.8496 -984.8496)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="348.8506" x2="348.8506" y1="999.8496" y2="1013.1074">
-<stop offset="0" style="stop-color:#D0D2D3"/>
-<stop offset="1" style="stop-color:#F1F1F2"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -208.8501 -268.8496)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="222.8494" x2="222.8494" y1="-283.8496" y2="-297.1074">
+<stop offset="0" style="stop-color:#D1D2D2"/>
+<stop offset="1" style="stop-color:#F1F2F2"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="13,15 13,25.846 15,28.258 15,15 "/>
 <polygon fill-opacity="0.3" points="14,15 14,27.053 15,28.258 15,15 "/>
-<linearGradient gradientTransform="matrix(1 0 0 1 -334.8496 -984.8496)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="349.8496" x2="349.8496" y1="985.8496" y2="997.8496">
+<linearGradient gradientTransform="matrix(1 0 0 -1 -208.8501 -268.8496)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="223.8494" x2="223.8494" y1="-269.8496" y2="-281.8496">
 <stop offset="0" style="stop-color:#919191"/>
 <stop offset="1" style="stop-color:#0D0D0D"/>
 </linearGradient>
 <path d="M21.955,3.606c0,0-1.628-2.606-7.066-2.606c-5.44,0-6.806,2.595-6.806,2.595  C7.732,4.177,7.007,8.921,7.007,8.921C6.942,9.6,7.322,10.498,7.851,10.916c0,0,3.186,2.084,3.854,2.084h6.578  c0.668,0,3.854-2.084,3.854-2.084c0.528-0.418,0.914-1.316,0.857-1.996C22.994,8.92,22.314,4.183,21.955,3.606z M17.5,7h-5  C11.675,7,11,6.325,11,5.5S11.675,4,12.5,4h5C18.325,4,19,4.675,19,5.5S18.325,7,17.5,7z" fill="url(#SVGID_4_)"/>
-<path d="M8.083,4.595c0,0,1.364-2.595,6.806-2.595  c5.438,0,7.066,2.606,7.066,2.606c0.297,0.476,0.813,3.783,0.98,4.923c0.049-0.21,0.072-0.418,0.059-0.609  c0,0-0.68-4.737-1.039-5.313c0,0-1.628-2.606-7.066-2.606c-5.44,0-6.806,2.595-6.806,2.595C7.732,4.177,7.007,8.921,7.007,8.921  c-0.019,0.197,0.01,0.413,0.059,0.63C7.242,8.432,7.791,5.078,8.083,4.595z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M12.5,8h5C18.325,8,19,7.325,19,6.5  c0-0.176-0.036-0.343-0.093-0.5c-0.208,0.58-0.759,1-1.407,1h-5c-0.648,0-1.199-0.42-1.407-1C11.036,6.157,11,6.324,11,6.5  C11,7.325,11.675,8,12.5,8z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.6" height="34.272" stroke-opacity="0.6" transform="matrix(-0.7073 0.707 -0.707 -0.7073 36.2215 14.9987)" width="3.17" x="13.421" y="-2.137"/>
-<linearGradient gradientTransform="matrix(0.8824 0 0 0.8824 -430.2275 -1024.9561)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="504.5674" x2="504.5674" y1="1164.0771" y2="1192.0762">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
-</linearGradient>
-<polygon fill="url(#SVGID_5_)" points="26,26.99 3.015,4.005 4.006,3.014 26.99,26 "/>
-<rect fill="none" height="30" width="30"/>
+<path d="M8.083,4.595c0,0,1.364-2.595,6.806-2.595  c5.438,0,7.066,2.606,7.066,2.606c0.297,0.476,0.812,3.783,0.981,4.923c0.048-0.21,0.072-0.418,0.058-0.609  c0,0-0.68-4.737-1.039-5.313c0,0-1.628-2.606-7.066-2.606c-5.44,0-6.806,2.595-6.806,2.595C7.732,4.177,7.007,8.921,7.007,8.921  c-0.019,0.197,0.01,0.413,0.059,0.63C7.242,8.432,7.791,5.078,8.083,4.595z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M12.5,8h5C18.325,8,19,7.325,19,6.5  c0-0.176-0.036-0.343-0.093-0.5c-0.208,0.58-0.758,1-1.407,1h-5c-0.648,0-1.199-0.42-1.407-1C11.036,6.157,11,6.324,11,6.5  C11,7.325,11.675,8,12.5,8z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill="none" height="30" width="30" x="0"/>
 <defs>
-<linearGradient gradientTransform="matrix(1 0 0 1 -334.8496 -984.8496)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="349.8506" x2="349.8506" y1="996.8496" y2="1013.1074">
-<stop offset="0" style="stop-color:#8C8E8F"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -208.8501 -268.8496)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="223.8494" x2="223.8494" y1="-280.8496" y2="-297.1074">
+<stop offset="0" style="stop-color:#8D8E8E"/>
 <stop offset="1" style="stop-color:#D9D9D9"/>
 </linearGradient>
 </defs>
+</g>
+<g>
+<rect fill-opacity="0.6" height="34.27" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(0.7073 -0.707 0.707 0.7073 -6.2126 14.9968)" width="3.169" x="13.42" y="-2.134"/>
+<polygon fill="url(#SVGID_1__)" points="26,26.99,3.015,4.005,4.006,3.014,26.99,26"/>
+<rect fill="none" height="30" width="30"/>
+<defs>
+<linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="339.8" x2="339.8" y1="-397.3" y2="-425.3">
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.2606" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
+</linearGradient>
+</defs>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,16 +3,16 @@
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <rect fill="none" height="30" width="30"/>
-<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1s14,6.28,14,14S22.72,29,15,29L15,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M15,29C7.28,29,1,22.721,1,15C1,7.28,7.28,1,15,1c7.721,0,14,6.28,14,14  C29,22.721,22.721,29,15,29L15,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.179-5.82-13-13-13  S2,7.821,2,15c0,0.169,0.02,0.333,0.025,0.5C2.29,8.555,7.988,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M24.75,16.235c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115  c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621  c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574  c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62  c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26  c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467  c1.503,1.512,3.32,2.263,5.453,2.263V26c-2.688,0-4.987-0.956-6.891-2.865C6.204,21.22,5.25,18.918,5.25,16.235  c0-2.673,0.955-4.964,2.865-6.873C10.027,7.456,12.319,6.5,15,6.5c2.688,0,4.986,0.95,6.892,2.856  C23.796,11.257,24.75,13.552,24.75,16.235z M16.885,16.157c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061  c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,19.521,16.885,18.401,16.885,16.157z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M24.75,14.985c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115  c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621  c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574  c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62  c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26  c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467  c1.503,1.512,3.32,2.263,5.453,2.263v2.035c-2.688,0-4.987-0.956-6.891-2.865C6.204,19.97,5.25,17.668,5.25,14.985  c0-2.673,0.955-4.964,2.865-6.873C10.027,6.206,12.319,5.25,15,5.25c2.688,0,4.986,0.95,6.892,2.856  C23.796,10.007,24.75,12.302,24.75,14.985z M16.885,14.907c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061  c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,18.271,16.885,17.151,16.885,14.907z" fill="#FFFFFF"/>
+<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5  C27.98,15.333,28,15.169,28,15c0-7.179-5.82-13-13-13C7.82,2,2,7.821,2,15c0,0.169,0.02,0.333,0.025,0.5C2.29,8.555,7.988,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M24.75,16.234c0,1.563-0.314,2.916-0.943,4.06  c-0.762,1.408-1.863,2.115-3.307,2.115c-1.4,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237  c-1.415,0-2.546-0.543-3.401-1.621c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638  c0.844-1.053,1.979-1.574,3.401-1.574c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.097c0,1.378,0.479,2.068,1.438,2.068  c0.782,0,1.387-0.541,1.809-1.619c0.311-0.806,0.467-1.66,0.467-2.578c0-2.121-0.768-3.929-2.289-5.438  c-1.523-1.509-3.354-2.26-5.484-2.26c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.455  c0,2.139,0.75,3.963,2.258,5.467c1.503,1.512,3.32,2.263,5.453,2.263V26c-2.688,0-4.987-0.956-6.891-2.865  c-1.907-1.914-2.861-4.217-2.861-6.9c0-2.671,0.955-4.962,2.865-6.873C10.027,7.456,12.319,6.5,15,6.5  c2.688,0,4.986,0.95,6.893,2.856C23.796,11.257,24.75,13.552,24.75,16.234z M16.885,16.157c0-2.074-0.793-3.113-2.378-3.113  c-0.794,0-1.409,0.354-1.839,1.061c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.183,0.797,3.271,2.394,3.271  C16.092,19.521,16.885,18.4,16.885,16.157z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M24.75,14.985c0,1.563-0.314,2.916-0.943,4.059c-0.762,1.408-1.863,2.115-3.307,2.115  c-1.4,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.543-3.401-1.621  c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574  c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.097c0,1.378,0.479,2.068,1.438,2.068c0.782,0,1.387-0.541,1.809-1.619  c0.311-0.806,0.467-1.66,0.467-2.579c0-2.12-0.768-3.93-2.289-5.438c-1.523-1.509-3.354-2.26-5.484-2.26  c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.962,2.258,5.467  c1.503,1.512,3.32,2.263,5.453,2.263v2.035c-2.688,0-4.987-0.956-6.891-2.865c-1.907-1.912-2.861-4.216-2.861-6.899  c0-2.673,0.955-4.964,2.865-6.873C10.027,6.206,12.319,5.25,15,5.25c2.688,0,4.986,0.95,6.893,2.856  C23.796,10.007,24.75,12.302,24.75,14.985z M16.885,14.907c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061  c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.183,0.797,3.271,2.394,3.271C16.092,18.271,16.885,17.15,16.885,14.907z" fill="#FFFFFF"/>
 <rect fill="none" height="30" width="30"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.9409" y2="28.3052">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="593.9609" x2="593.9609" y1="813.9805" y2="840.3448">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_home.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,22 +3,22 @@
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <rect fill="none" height="30" width="30"/>
-<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1s14,6.28,14,14S22.72,29,15,29L15,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.9409" y2="28.3052">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<path d="M15,29C7.28,29,1,22.721,1,15C1,7.28,7.28,1,15,1c7.721,0,14,6.28,14,14  C29,22.721,22.721,29,15,29L15,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="593.9609" x2="593.9609" y1="813.9805" y2="840.3448">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.179-5.82-13-13-13  S2,7.821,2,15c0,0.169,0.02,0.333,0.025,0.5C2.29,8.555,7.988,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M24.75,16.235c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115  c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621  c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574  c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62  c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26  c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467  c1.503,1.512,3.32,2.263,5.453,2.263V26c-2.688,0-4.987-0.956-6.891-2.865C6.204,21.22,5.25,18.918,5.25,16.235  c0-2.673,0.955-4.964,2.865-6.873C10.027,7.456,12.319,6.5,15,6.5c2.688,0,4.986,0.95,6.892,2.856  C23.796,11.257,24.75,13.552,24.75,16.235z M16.885,16.157c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061  c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,19.521,16.885,18.401,16.885,16.157z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M24.75,14.985c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115  c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621  c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574  c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62  c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26  c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467  c1.503,1.512,3.32,2.263,5.453,2.263v2.035c-2.688,0-4.987-0.956-6.891-2.865C6.204,19.97,5.25,17.668,5.25,14.985  c0-2.673,0.955-4.964,2.865-6.873C10.027,6.206,12.319,5.25,15,5.25c2.688,0,4.986,0.95,6.892,2.856  C23.796,10.007,24.75,12.302,24.75,14.985z M16.885,14.907c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061  c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,18.271,16.885,17.151,16.885,14.907z" fill="#FFFFFF"/>
+<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5  C27.98,15.333,28,15.169,28,15c0-7.179-5.82-13-13-13C7.82,2,2,7.821,2,15c0,0.169,0.02,0.333,0.025,0.5C2.29,8.555,7.988,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M24.75,16.234c0,1.563-0.314,2.916-0.943,4.06  c-0.762,1.408-1.863,2.115-3.307,2.115c-1.4,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237  c-1.415,0-2.546-0.543-3.401-1.621c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638  c0.844-1.053,1.979-1.574,3.401-1.574c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.097c0,1.378,0.479,2.068,1.438,2.068  c0.782,0,1.387-0.541,1.809-1.619c0.311-0.806,0.467-1.66,0.467-2.578c0-2.121-0.768-3.929-2.289-5.438  c-1.523-1.509-3.354-2.26-5.484-2.26c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.455  c0,2.139,0.75,3.963,2.258,5.467c1.503,1.512,3.32,2.263,5.453,2.263V26c-2.688,0-4.987-0.956-6.891-2.865  c-1.907-1.914-2.861-4.217-2.861-6.9c0-2.671,0.955-4.962,2.865-6.873C10.027,7.456,12.319,6.5,15,6.5  c2.688,0,4.986,0.95,6.893,2.856C23.796,11.257,24.75,13.552,24.75,16.234z M16.885,16.157c0-2.074-0.793-3.113-2.378-3.113  c-0.794,0-1.409,0.354-1.839,1.061c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.183,0.797,3.271,2.394,3.271  C16.092,19.521,16.885,18.4,16.885,16.157z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M24.75,14.985c0,1.563-0.314,2.916-0.943,4.059c-0.762,1.408-1.863,2.115-3.307,2.115  c-1.4,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.543-3.401-1.621  c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574  c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.097c0,1.378,0.479,2.068,1.438,2.068c0.782,0,1.387-0.541,1.809-1.619  c0.311-0.806,0.467-1.66,0.467-2.579c0-2.12-0.768-3.93-2.289-5.438c-1.523-1.509-3.354-2.26-5.484-2.26  c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.962,2.258,5.467  c1.503,1.512,3.32,2.263,5.453,2.263v2.035c-2.688,0-4.987-0.956-6.891-2.865c-1.907-1.912-2.861-4.216-2.861-6.899  c0-2.673,0.955-4.964,2.865-6.873C10.027,6.206,12.319,5.25,15,5.25c2.688,0,4.986,0.95,6.893,2.856  C23.796,10.007,24.75,12.302,24.75,14.985z M16.885,14.907c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061  c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.183,0.797,3.271,2.394,3.271C16.092,18.271,16.885,17.15,16.885,14.907z" fill="#FFFFFF"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 <g>
 <path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="22" x2="22" y1="14.9683" y2="29.1646">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="1" style="stop-color:#EF6902"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="1" style="stop-color:#A86F49"/>
 </linearGradient>
 <circle cx="22" cy="22" fill="url(#SVGID_1__)" r="7"/>
 <polygon fill-opacity="0.2" points="26.34,24 21.999,19.4 17.66,24 17,23.3 21.999,18 27,23.3 26.34,24 " stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_work.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_work.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_work.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,15 +3,15 @@
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <rect fill="none" height="30" width="30"/>
-<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1s14,6.28,14,14S22.72,29,15,29L15,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.9409" y2="28.3052">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<path d="M15,29C7.28,29,1,22.721,1,15C1,7.28,7.28,1,15,1c7.721,0,14,6.28,14,14  C29,22.721,22.721,29,15,29L15,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="593.9609" x2="593.9609" y1="813.9805" y2="840.3448">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.179-5.82-13-13-13  S2,7.821,2,15c0,0.169,0.02,0.333,0.025,0.5C2.29,8.555,7.988,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M24.75,16.235c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115  c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621  c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574  c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62  c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26  c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467  c1.503,1.512,3.32,2.263,5.453,2.263V26c-2.688,0-4.987-0.956-6.891-2.865C6.204,21.22,5.25,18.918,5.25,16.235  c0-2.673,0.955-4.964,2.865-6.873C10.027,7.456,12.319,6.5,15,6.5c2.688,0,4.986,0.95,6.892,2.856  C23.796,11.257,24.75,13.552,24.75,16.235z M16.885,16.157c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061  c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,19.521,16.885,18.401,16.885,16.157z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M24.75,14.985c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115  c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621  c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574  c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62  c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26  c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467  c1.503,1.512,3.32,2.263,5.453,2.263v2.035c-2.688,0-4.987-0.956-6.891-2.865C6.204,19.97,5.25,17.668,5.25,14.985  c0-2.673,0.955-4.964,2.865-6.873C10.027,6.206,12.319,5.25,15,5.25c2.688,0,4.986,0.95,6.892,2.856  C23.796,10.007,24.75,12.302,24.75,14.985z M16.885,14.907c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061  c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,18.271,16.885,17.151,16.885,14.907z" fill="#FFFFFF"/>
+<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5  C27.98,15.333,28,15.169,28,15c0-7.179-5.82-13-13-13C7.82,2,2,7.821,2,15c0,0.169,0.02,0.333,0.025,0.5C2.29,8.555,7.988,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M24.75,16.234c0,1.563-0.314,2.916-0.943,4.06  c-0.762,1.408-1.863,2.115-3.307,2.115c-1.4,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237  c-1.415,0-2.546-0.543-3.401-1.621c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638  c0.844-1.053,1.979-1.574,3.401-1.574c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.097c0,1.378,0.479,2.068,1.438,2.068  c0.782,0,1.387-0.541,1.809-1.619c0.311-0.806,0.467-1.66,0.467-2.578c0-2.121-0.768-3.929-2.289-5.438  c-1.523-1.509-3.354-2.26-5.484-2.26c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.455  c0,2.139,0.75,3.963,2.258,5.467c1.503,1.512,3.32,2.263,5.453,2.263V26c-2.688,0-4.987-0.956-6.891-2.865  c-1.907-1.914-2.861-4.217-2.861-6.9c0-2.671,0.955-4.962,2.865-6.873C10.027,7.456,12.319,6.5,15,6.5  c2.688,0,4.986,0.95,6.893,2.856C23.796,11.257,24.75,13.552,24.75,16.234z M16.885,16.157c0-2.074-0.793-3.113-2.378-3.113  c-0.794,0-1.409,0.354-1.839,1.061c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.183,0.797,3.271,2.394,3.271  C16.092,19.521,16.885,18.4,16.885,16.157z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M24.75,14.985c0,1.563-0.314,2.916-0.943,4.059c-0.762,1.408-1.863,2.115-3.307,2.115  c-1.4,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.543-3.401-1.621  c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574  c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.097c0,1.378,0.479,2.068,1.438,2.068c0.782,0,1.387-0.541,1.809-1.619  c0.311-0.806,0.467-1.66,0.467-2.579c0-2.12-0.768-3.93-2.289-5.438c-1.523-1.509-3.354-2.26-5.484-2.26  c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.962,2.258,5.467  c1.503,1.512,3.32,2.263,5.453,2.263v2.035c-2.688,0-4.987-0.956-6.891-2.865c-1.907-1.912-2.861-4.216-2.861-6.899  c0-2.673,0.955-4.964,2.865-6.873C10.027,6.206,12.319,5.25,15,5.25c2.688,0,4.986,0.95,6.893,2.856  C23.796,10.007,24.75,12.302,24.75,14.985z M16.885,14.907c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061  c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.183,0.797,3.271,2.394,3.271C16.092,18.271,16.885,17.15,16.885,14.907z" fill="#FFFFFF"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 <g>
@@ -19,8 +19,8 @@
 <g>
 <path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -549.9609 -796.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="571.9609" x2="571.9609" y1="811.0391" y2="825.0391">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#A2A6A5"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <circle cx="22" cy="22" fill="url(#SVGID_1__)" r="7"/>
 <path d="M22,16c3.697,0,6.717,2.869,6.975,6.5   C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C15.283,18.869,18.303,16,22,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_expand.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_expand.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_expand.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,16 +2,16 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
-<rect fill-opacity="0.6" height="30" stroke-opacity="0.6" width="30"/>
+<rect fill-opacity="0.6" height="30" width="30"/>
 <rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
-<polygon fill-opacity="0.2" points="24,13.88,17.99,13.88,17.99,8,13.99,8,13.99,13.88,8,13.88,8,17.88,13.99,17.88,13.99,24,17.99,24,17.99,17.88,24,17.88" stroke-opacity="0.2"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="28" x="1" y="1"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="28" x="1" y="28"/>
-<polygon fill="#FFFFFF" points="23,12.88,16.99,12.88,16.99,7,12.99,7,12.99,12.88,7,12.88,7,16.88,12.99,16.88,12.99,23,16.99,23,16.99,16.88,23,16.88"/>
+<polygon fill-opacity="0.2" points="24,13.88 17.99,13.88 17.99,8 13.99,8 13.99,13.88 8,13.88 8,17.88 13.99,17.88 13.99,24   17.99,24 17.99,17.88 24,17.88 "/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" width="28" x="1" y="1"/>
+<rect fill-opacity="0.2" height="1" width="28" x="1" y="28"/>
+<polygon fill="#FFFFFF" points="23,12.88 16.99,12.88 16.99,7 12.99,7 12.99,12.88 7,12.88 7,16.88 12.99,16.88 12.99,23 16.99,23   16.99,16.88 23,16.88 "/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.175" y2="29.18">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#048CC6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="593.9609" x2="593.9609" y1="813.2148" y2="841.2148">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fail.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fail.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fail.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -10,8 +10,8 @@
 </linearGradient>
 <circle cx="14.999" cy="15" fill="url(#SVGID_1_)" r="10"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="2" y2="27.9507">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="1" style="stop-color:#800000"/>
+<stop offset="0" style="stop-color:#B36B4D"/>
+<stop offset="1" style="stop-color:#5A2633"/>
 </linearGradient>
 <path d="M15,2C7.82,2,2,7.82,2,15s5.82,13,13,13s13-5.82,13-13S22.18,2,15,2z M15.001,6  c1.788,0,3.45,0.527,4.851,1.427L7.428,19.852C6.528,18.451,6,16.788,6,15C6,10.028,10.03,6,15.001,6z M15.001,24  c-1.929,0-3.711-0.611-5.176-1.645l12.53-12.531C23.389,11.289,24,13.071,24,15C24,19.971,19.971,24,15.001,24z" fill="url(#SVGID_2_)"/>
 <path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13  S2,7.82,2,15c0,0.169,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_family.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_family.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_family.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,36 +3,38 @@
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <rect fill="none" height="30" width="30"/>
-<path d="M29.813,21.146c-0.169-0.236-0.379-0.376-1.244-0.929c-2.185-1.396-3.446-2.377-3.757-2.901  c0.68-0.589,1.246-1.319,1.624-2.104c0.813-1.688,0.663-5.425,0.645-5.798C27.081,7.225,24.279,5,22.265,5h-0.54  c-2.014,0-4.814,2.225-4.814,4.379c-0.015,0.417-0.122,4.122,0.633,5.807c0.357,0.799,0.924,1.544,1.627,2.145  c-0.295,0.47-1.26,1.247-2.865,2.314c-2.509-1.551-3.941-2.637-4.252-3.217c0.787-0.644,1.444-1.451,1.882-2.323  c0.923-1.842,0.751-5.937,0.729-6.349C14.664,5.396,11.545,3,9.303,3H8.686c-2.242,0-5.36,2.396-5.359,4.719  c-0.018,0.457-0.14,4.52,0.717,6.36c0.413,0.888,1.072,1.712,1.888,2.368c-0.353,0.61-1.813,1.707-4.353,3.268  c-0.967,0.593-1.201,0.742-1.38,0.982L0,20.963V27h30v-5.594L29.813,21.146z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="8.9995" x2="8.9995" y1="4.041" y2="26.2553">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<path d="M29.813,21.146c-0.168-0.236-0.379-0.377-1.244-0.93  c-2.185-1.396-3.445-2.377-3.756-2.9c0.68-0.59,1.246-1.319,1.623-2.104c0.813-1.688,0.664-5.425,0.646-5.798  C27.081,7.225,24.279,5,22.266,5h-0.541c-2.014,0-4.813,2.225-4.813,4.379c-0.015,0.417-0.122,4.122,0.633,5.807  c0.356,0.798,0.924,1.544,1.627,2.145c-0.295,0.47-1.26,1.247-2.864,2.313c-2.51-1.551-3.942-2.637-4.252-3.217  c0.787-0.644,1.444-1.451,1.882-2.323c0.923-1.842,0.751-5.937,0.729-6.349C14.664,5.396,11.545,3,9.303,3H8.686  c-2.242,0-5.36,2.396-5.359,4.719c-0.018,0.457-0.14,4.52,0.717,6.36c0.413,0.888,1.072,1.712,1.888,2.368  c-0.353,0.609-1.813,1.707-4.353,3.268c-0.967,0.594-1.201,0.742-1.38,0.982L0,20.963V27h30v-5.594L29.813,21.146z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -289.4805 -383.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="298.4795" x2="298.4795" y1="-387.0615" y2="-409.2758">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
-<path d="M10.998,16.347c-0.008-0.125,0-0.252,0.004-0.379c0.852-0.585,1.589-1.415,2.039-2.311  c0.831-1.661,0.623-5.901,0.623-5.901C13.664,6.026,11.023,4,9.303,4H8.686c-1.72,0-4.36,2.026-4.36,3.756  c0,0-0.155,4.226,0.624,5.901c0.425,0.912,1.178,1.752,2.049,2.335c0.003,0.117,0.011,0.237,0.004,0.354  C6.896,18.044,1.274,20.927,1,21.295V26h16v-4.701C16.725,20.93,11.104,18.044,10.998,16.347z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.9995" x2="8.9995" y1="4.041" y2="26.1808">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="0.7212" style="stop-color:#19A3D6"/>
-<stop offset="1" style="stop-color:#57CDFF"/>
+<path d="M10.998,16.348c-0.008-0.125,0-0.252,0.004-0.38c0.852-0.585,1.589-1.415,2.039-2.311  c0.831-1.661,0.623-5.901,0.623-5.901C13.664,6.026,11.023,4,9.303,4H8.686c-1.72,0-4.36,2.026-4.36,3.756  c0,0-0.155,4.226,0.624,5.901c0.425,0.912,1.178,1.752,2.049,2.335c0.003,0.117,0.011,0.236,0.004,0.354  C6.896,18.044,1.274,20.928,1,21.295V26h16v-4.701C16.725,20.93,11.104,18.044,10.998,16.348z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -289.4805 -383.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="298.4795" x2="298.4795" y1="-387.0615" y2="-409.2013">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="0.7212" style="stop-color:#3B518A"/>
+<stop offset="0.7836" style="stop-color:#486698"/>
+<stop offset="0.9249" style="stop-color:#6295B3"/>
+<stop offset="1" style="stop-color:#6BA8BE"/>
 </linearGradient>
-<path d="M10.998,16.347c-0.008-0.125,0-0.252,0.004-0.379c0.852-0.585,1.589-1.415,2.039-2.311  c0.831-1.661,0.623-5.901,0.623-5.901C13.664,6.026,11.023,4,9.303,4H8.686c-1.72,0-4.36,2.026-4.36,3.756  c0,0-0.155,4.226,0.624,5.901c0.425,0.912,1.178,1.752,2.049,2.335c0.003,0.117,0.011,0.237,0.004,0.354  C6.896,18.044,1.274,20.927,1,21.295V26h16v-4.701C16.725,20.93,11.104,18.044,10.998,16.347z M16.111,25.107H1.889v-3.358  c0.188-0.12,0.441-0.274,0.676-0.42c2.75-1.688,5.225-3.335,5.324-4.925c0.007-0.12,0.005-0.234,0-0.35l-0.01-0.465L7.49,15.248  c-0.756-0.505-1.389-1.225-1.736-1.971c-0.563-1.21-0.58-4.371-0.54-5.487c0.001-1.157,2.109-2.897,3.472-2.897h0.617  c1.363,0,3.473,1.74,3.473,2.863c0.076,1.594-0.001,4.444-0.529,5.498c-0.377,0.753-1.014,1.474-1.746,1.976l-0.374,0.258  l-0.013,0.455c-0.007,0.205-0.01,0.335-0.002,0.462c0.1,1.59,2.574,3.238,5.324,4.927c0.234,0.146,0.488,0.3,0.676,0.421V25.107z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="22" x2="22" y1="6.3789" y2="25.932">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<path d="M10.998,16.348c-0.008-0.125,0-0.252,0.004-0.38c0.852-0.585,1.589-1.415,2.039-2.311  c0.831-1.661,0.623-5.901,0.623-5.901C13.664,6.026,11.023,4,9.303,4H8.686c-1.72,0-4.36,2.026-4.36,3.756  c0,0-0.155,4.226,0.624,5.901c0.425,0.912,1.178,1.752,2.049,2.335c0.003,0.117,0.011,0.236,0.004,0.354  C6.896,18.044,1.274,20.928,1,21.295V26h16v-4.701C16.725,20.93,11.104,18.044,10.998,16.348z M16.111,25.107H1.889v-3.358  c0.188-0.12,0.441-0.274,0.676-0.42c2.75-1.688,5.225-3.335,5.324-4.925c0.007-0.12,0.005-0.234,0-0.35l-0.01-0.466L7.49,15.248  c-0.756-0.505-1.389-1.225-1.736-1.971c-0.563-1.21-0.58-4.371-0.54-5.487c0.001-1.157,2.109-2.897,3.472-2.897h0.617  c1.363,0,3.473,1.74,3.473,2.863c0.076,1.594-0.001,4.444-0.529,5.498c-0.377,0.753-1.014,1.474-1.746,1.976l-0.374,0.258  l-0.013,0.456c-0.007,0.205-0.01,0.334-0.002,0.461c0.1,1.591,2.574,3.238,5.324,4.928c0.234,0.146,0.488,0.3,0.675,0.421V25.107  L16.111,25.107z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -289.4805 -383.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="311.4805" x2="311.4805" y1="-389.3994" y2="-408.9525">
+<stop offset="0" style="stop-color:#A8835F"/>
+<stop offset="0.2606" style="stop-color:#A86F5F"/>
+<stop offset="1" style="stop-color:#9A5047"/>
 </linearGradient>
-<path d="M23.748,17.225c-0.007-0.115,0-0.23,0.004-0.346c0.744-0.531,1.391-1.286,1.783-2.102  c0.729-1.508,0.546-5.363,0.546-5.363C26.081,7.842,23.771,6,22.265,6h-0.54c-1.504,0-3.814,1.842-3.814,3.414  c0,0-0.137,3.842,0.545,5.363c0.371,0.83,1.031,1.594,1.793,2.124c0.003,0.107,0.01,0.217,0.004,0.323  c-0.094,1.543-5.012,4.162-5.252,4.498V26h14v-4.273C28.76,21.39,23.842,18.768,23.748,17.225z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="22" x2="22" y1="6.0371" y2="29.6193">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D86D56"/>
+<path d="M23.748,17.225c-0.007-0.115,0-0.229,0.004-0.346c0.744-0.531,1.391-1.286,1.783-2.102  c0.729-1.508,0.546-5.363,0.546-5.363c0-1.572-2.31-3.414-3.815-3.414h-0.541c-1.504,0-3.813,1.842-3.813,3.414  c0,0-0.138,3.842,0.545,5.363c0.371,0.831,1.03,1.594,1.793,2.124c0.003,0.107,0.01,0.218,0.004,0.324  c-0.094,1.543-5.012,4.162-5.252,4.498V26h14v-4.273C28.76,21.391,23.842,18.768,23.748,17.225z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -289.4805 -383.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="311.4805" x2="311.4805" y1="-389.0576" y2="-412.6398">
+<stop offset="0" style="stop-color:#A8835F"/>
+<stop offset="0.2606" style="stop-color:#A86F5F"/>
+<stop offset="1" style="stop-color:#B18A7D"/>
 </linearGradient>
-<path d="M23.748,17.225c-0.007-0.115,0-0.23,0.004-0.346c0.744-0.531,1.391-1.286,1.783-2.102  c0.729-1.508,0.546-5.363,0.546-5.363C26.081,7.842,23.771,6,22.265,6h-0.54c-1.504,0-3.814,1.842-3.814,3.414  c0,0-0.137,3.842,0.545,5.363c0.371,0.83,1.031,1.594,1.793,2.124c0.003,0.107,0.01,0.217,0.004,0.323  c-0.094,1.543-5.012,4.162-5.252,4.498V26h14v-4.273C28.76,21.39,23.842,18.768,23.748,17.225z M28.125,25.092h-12.25v-2.905  c0.158-0.104,0.361-0.233,0.551-0.354c2.984-1.904,4.617-3.194,4.699-4.551c0.006-0.115,0.004-0.223,0-0.332l-0.016-0.466  l-0.375-0.337c-0.647-0.451-1.189-1.091-1.484-1.753c-0.434-0.963-0.516-3.545-0.466-4.946c0.001-0.993,1.814-2.539,2.94-2.539h0.54  c1.127,0,2.941,1.546,2.941,2.506c0.066,1.443,0.001,4.016-0.453,4.955c-0.323,0.671-0.868,1.312-1.497,1.76l-0.365,0.262  l-0.014,0.46c-0.006,0.187-0.01,0.309-0.002,0.43c0.082,1.357,1.715,2.647,4.698,4.554c0.189,0.121,0.393,0.25,0.552,0.355V25.092z" fill="url(#SVGID_4_)"/>
-<path d="M7.972,27L8,25.972c0.074-2.631,1.977-3.813,3.234-4.596l0.156-0.097l1.674-0.842  c-0.006-0.009-0.012-0.018-0.018-0.026c-0.166-0.232-0.371-0.522-0.547-0.863c-0.744-1.44-0.995-2.394-0.995-3.775  c0-2.632,2.001-4.772,4.462-4.772h0.102c2.445,0.019,4.43,2.152,4.43,4.772c0,1.381-0.252,2.334-0.995,3.775  c-0.177,0.341-0.382,0.629-0.546,0.861c-0.015,0.02-0.029,0.041-0.045,0.063c0,0,1.6,0.973,1.746,1.06  c1.303,0.776,3.271,1.95,3.342,4.44L24.028,27H7.972z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="16" x2="16" y1="25.8955" y2="4.0108">
+<path d="M23.748,17.225c-0.007-0.115,0-0.229,0.004-0.346c0.744-0.531,1.391-1.286,1.783-2.102  c0.729-1.508,0.546-5.363,0.546-5.363c0-1.572-2.31-3.414-3.815-3.414h-0.541c-1.504,0-3.813,1.842-3.813,3.414  c0,0-0.138,3.842,0.545,5.363c0.371,0.831,1.03,1.594,1.793,2.124c0.003,0.107,0.01,0.218,0.004,0.324  c-0.094,1.543-5.012,4.162-5.252,4.498V26h14v-4.273C28.76,21.391,23.842,18.768,23.748,17.225z M28.125,25.092h-12.25v-2.904  c0.158-0.104,0.361-0.233,0.551-0.354c2.984-1.903,4.617-3.194,4.699-4.552c0.006-0.114,0.004-0.223,0-0.331l-0.016-0.466  l-0.375-0.338c-0.647-0.451-1.189-1.09-1.484-1.752c-0.434-0.963-0.516-3.545-0.466-4.946c0.001-0.993,1.813-2.539,2.94-2.539h0.539  c1.127,0,2.941,1.546,2.941,2.506c0.066,1.443,0.001,4.016-0.453,4.955c-0.322,0.671-0.868,1.312-1.497,1.76l-0.364,0.263  l-0.015,0.459c-0.006,0.188-0.01,0.31-0.002,0.43c0.082,1.357,1.715,2.648,4.698,4.555c0.189,0.121,0.393,0.25,0.552,0.355  L28.125,25.092L28.125,25.092z" fill="url(#SVGID_4_)"/>
+<path d="M7.972,27L8,25.973c0.074-2.632,1.977-3.813,3.234-4.597l0.156-0.097  l1.674-0.842c-0.006-0.01-0.012-0.019-0.018-0.026c-0.166-0.231-0.371-0.522-0.547-0.863c-0.744-1.44-0.995-2.394-0.995-3.774  c0-2.632,2.001-4.772,4.462-4.772h0.103c2.445,0.019,4.43,2.152,4.43,4.772c0,1.381-0.252,2.334-0.995,3.774  c-0.177,0.341-0.382,0.63-0.546,0.861c-0.016,0.021-0.029,0.041-0.045,0.063c0,0,1.6,0.973,1.746,1.06  c1.303,0.776,3.271,1.95,3.342,4.44L24.027,27H7.972z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -289.4805 -383.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="305.4805" x2="305.4805" y1="-408.9155" y2="-387.0308">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#FCBA63"/>
+<stop offset="1" style="stop-color:#CEB991"/>
 </linearGradient>
-<path d="M23,26c-0.062-2.188-2.088-3.122-3.289-3.873l-1.715-1.043c-0.707-0.489,0.129-1.05,0.618-1.995  c0.724-1.402,0.884-2.181,0.884-3.316c0-2.063-1.536-3.772-3.463-3.772c-0.012,0-0.021,0.003-0.035,0.005  C15.989,12.003,15.979,12,15.967,12c-1.928,0-3.462,1.71-3.462,3.772c0,1.136,0.159,1.915,0.884,3.316  c0.488,0.947,1.324,1.506,0.617,1.995l-2.085,1.043C10.72,22.878,9.062,23.812,9,26H23z" fill="url(#SVGID_5_)"/>
+<path d="M23,26c-0.063-2.188-2.088-3.122-3.289-3.873l-1.715-1.043c-0.707-0.488,0.129-1.05,0.617-1.995  c0.725-1.401,0.885-2.181,0.885-3.315c0-2.063-1.536-3.772-3.463-3.772c-0.012,0-0.021,0.003-0.035,0.005  C15.988,12.003,15.979,12,15.967,12c-1.928,0-3.462,1.71-3.462,3.771c0,1.137,0.159,1.916,0.884,3.316  c0.488,0.947,1.324,1.506,0.617,1.995l-2.085,1.043C10.72,22.878,9.062,23.813,9,26H23z" fill="url(#SVGID_5_)"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_favorite.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_favorite.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_favorite.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -8,8 +8,8 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="2.9937" y2="27.438">
-<stop offset="0" style="stop-color:#FFE896"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+<stop offset="0" style="stop-color:#E0D9B5"/>
+<stop offset="1" style="stop-color:#B3964D"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -35,53 +35,53 @@
 <path d="M28,19c0,1.1-0.9,2-2,2h-22c-1.1,0-2-0.9-2-2v-8c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2v8z" fill="url(#SVGID_5_)"/>
 <path d="M26,9h-22c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2v-1c0-1.1-0.9-2-2-2z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.5" x2="15.5" y1="11" y2="20.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<stop offset="0" stop-color="#6B6C6D"/>
+<stop offset="1" stop-color="#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="2" width="3" x="14" y="11"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="19.5" x2="19.5" y1="11" y2="20.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<stop offset="0" stop-color="#6B6C6D"/>
+<stop offset="1" stop-color="#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="2" width="3" x="18" y="11"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="23.5" x2="23.5" y1="11" y2="20.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<stop offset="0" stop-color="#6B6C6D"/>
+<stop offset="1" stop-color="#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="2" width="3" x="22" y="11"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="15.5" x2="15.5" y1="10" y2="19.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<stop offset="0" stop-color="#6B6C6D"/>
+<stop offset="1" stop-color="#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="2" width="3" x="14" y="14"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="19.5" x2="19.5" y1="10" y2="19.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<stop offset="0" stop-color="#6B6C6D"/>
+<stop offset="1" stop-color="#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="2" width="3" x="18" y="14"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="23.5" x2="23.5" y1="10" y2="19.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<stop offset="0" stop-color="#6B6C6D"/>
+<stop offset="1" stop-color="#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_11_)" height="2" width="3" x="22" y="14"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="15.5" x2="15.5" y1="9" y2="18.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<stop offset="0" stop-color="#6B6C6D"/>
+<stop offset="1" stop-color="#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_12_)" height="2" width="3" x="14" y="17"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="19.5" x2="19.5" y1="9" y2="18.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<stop offset="0" stop-color="#6B6C6D"/>
+<stop offset="1" stop-color="#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_13_)" height="2" width="3" x="18" y="17"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="23.5" x2="23.5" y1="9" y2="18.98">
-<stop offset="0" stop-color="#696D6F"/>
-<stop offset="1" stop-color="#252629"/>
+<stop offset="0" stop-color="#6B6C6D"/>
+<stop offset="1" stop-color="#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_14_)" height="2" width="3" x="22" y="17"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="8" x2="8" y1="11.19" y2="14.06">
-<stop offset="0" stop-color="#30BCE8"/>
-<stop offset="1" stop-color="#048CC6"/>
+<stop offset="0" stop-color="#67A7B1"/>
+<stop offset="1" stop-color="#3E678C"/>
 </linearGradient>
 <rect fill="url(#SVGID_15_)" height="3" width="8" x="4" y="11"/>
 <rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="20" x="5" y="8"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_home.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -37,61 +37,61 @@
 <path d="M28,19.001c0,1.101-0.9,2-2,2H4c-1.1,0-2-0.899-2-2v-8c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2V19.001z" fill="url(#SVGID_5_)"/>
 <path d="M26,9.001H4c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h22   c1.1,0,2,0.9,2,2v-1C28,9.901,27.1,9.001,26,9.001z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="297.9795" x2="297.9795" y1="-386.0205" y2="-396.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="2" width="3" x="14" y="11.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="301.9795" x2="301.9795" y1="-386.0205" y2="-396.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="2" width="3" x="18" y="11.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="305.9795" x2="305.9795" y1="-386.0205" y2="-396.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="2" width="3" x="22" y="11.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="297.9795" x2="297.9795" y1="-385.0205" y2="-395.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="2" width="3" x="14" y="14.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="301.9795" x2="301.9795" y1="-385.0205" y2="-395.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="2" width="3" x="18" y="14.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="305.9795" x2="305.9795" y1="-385.0205" y2="-395.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_11_)" height="2" width="3" x="22" y="14.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="297.9795" x2="297.9795" y1="-384.0205" y2="-394.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_12_)" height="2" width="3" x="14" y="17.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="301.9795" x2="301.9795" y1="-384.0205" y2="-394.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_13_)" height="2" width="3" x="18" y="17.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="305.9795" x2="305.9795" y1="-384.0205" y2="-394.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_14_)" height="2" width="3" x="22" y="17.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="290.4795" x2="290.4795" y1="-386.209" y2="-389.0847">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#67A7B1"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <rect fill="url(#SVGID_15_)" height="3" width="8" x="4" y="11.001"/>
 <rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="20" x="5" y="8.001"/>
 <rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="20" x="5" y="21.001"/>
 <path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="304.4795" x2="304.4795" y1="-389.9883" y2="-404.1846">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="1" style="stop-color:#EF6902"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="1" style="stop-color:#A86F49"/>
 </linearGradient>
 <circle cx="22" cy="22" fill="url(#SVGID_16_)" r="7"/>
 <polygon fill-opacity="0.2" points="26.34,24 21.999,19.4 17.66,24 17,23.3 21.999,18 27,23.3  " stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_work.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_work.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_work.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -37,61 +37,61 @@
 <path d="M28,19.001c0,1.101-0.9,2-2,2H4c-1.1,0-2-0.899-2-2v-8c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2V19.001z" fill="url(#SVGID_5_)"/>
 <path d="M26,9.001H4c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h22   c1.1,0,2,0.9,2,2v-1C28,9.901,27.1,9.001,26,9.001z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="297.9795" x2="297.9795" y1="-386.0205" y2="-396.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="2" width="3" x="14" y="11.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="301.9795" x2="301.9795" y1="-386.0205" y2="-396.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="2" width="3" x="18" y="11.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="305.9795" x2="305.9795" y1="-386.0205" y2="-396.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="2" width="3" x="22" y="11.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="297.9795" x2="297.9795" y1="-385.0205" y2="-395.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="2" width="3" x="14" y="14.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="301.9795" x2="301.9795" y1="-385.0205" y2="-395.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="2" width="3" x="18" y="14.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="305.9795" x2="305.9795" y1="-385.0205" y2="-395.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_11_)" height="2" width="3" x="22" y="14.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="297.9795" x2="297.9795" y1="-384.0205" y2="-394.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_12_)" height="2" width="3" x="14" y="17.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="301.9795" x2="301.9795" y1="-384.0205" y2="-394.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_13_)" height="2" width="3" x="18" y="17.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="305.9795" x2="305.9795" y1="-384.0205" y2="-394.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_14_)" height="2" width="3" x="22" y="17.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="290.4795" x2="290.4795" y1="-386.209" y2="-389.0847">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#67A7B1"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <rect fill="url(#SVGID_15_)" height="3" width="8" x="4" y="11.001"/>
 <rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="20" x="5" y="8.001"/>
 <rect fill-opacity="0.4" height="1" stroke-opacity="0.4" width="20" x="5" y="21.001"/>
 <path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="304.4795" x2="304.4795" y1="-390.0195" y2="-404.0195">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#A2A6A5"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <circle cx="22" cy="22" fill="url(#SVGID_16_)" r="7"/>
 <path d="M22,16c3.697,0,6.717,2.869,6.975,6.5   C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C15.283,18.869,18.303,16,22,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_flash.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_flash.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_flash.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,24 +4,24 @@
 <g>
 <path d="M15,29C7.281,29,1,22.72,1,15S7.281,1,15,1c7.72,0,14,6.28,14,14S22.72,29,15,29L15,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <radialGradient cx="-2686.7461" cy="511.4414" gradientTransform="matrix(2.2479 0 0 -2.2479 6054.5376 1164.6696)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="5.7832">
-<stop offset="0" style="stop-color:#C7D4E6"/>
-<stop offset="0.2865" style="stop-color:#C7D4E6"/>
-<stop offset="0.6966" style="stop-color:#7288A2"/>
-<stop offset="1" style="stop-color:#2B3842"/>
+<stop offset="0" style="stop-color:#D0DDD9"/>
+<stop offset="0.2865" style="stop-color:#D0DDD9"/>
+<stop offset="0.6966" style="stop-color:#808B94"/>
+<stop offset="1" style="stop-color:#32333B"/>
 </radialGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
 <path d="M5.477,10.928c7.065-12.188,17.325-4.704,19.199,0.142c0.002,0.021,0.018,0.011,0.012-0.013  c-0.629-4.677-4.697-8.285-9.623-8.285c-4.878,0-8.917,3.539-9.604,8.15C5.455,10.953,5.471,10.961,5.477,10.928z" fill="url(#SVGID_2_)"/>
 <radialGradient cx="-2686.8755" cy="522.4854" gradientTransform="matrix(2.2479 0 0 -2.2479 6054.5376 1164.6696)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="10.0661">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.4831" style="stop-color:#FFFFFF"/>
-<stop offset="0.8989" style="stop-color:#627995"/>
-<stop offset="1" style="stop-color:#3F607E"/>
+<stop offset="0.8989" style="stop-color:#717A86"/>
+<stop offset="1" style="stop-color:#525A6B"/>
 </radialGradient>
 <path d="M15.064,3.238c-4.846,0-8.86,3.455-9.59,7.695c2.184,1.027,3.792-1.483,8.994-1.164  c4.73,0.206,8.146,2.484,10.203,1.305C24.012,6.768,19.962,3.238,15.064,3.238z" fill="url(#SVGID_3_)"/>
-<path d="M20.242,6.594c-4.72,0-6.709,3.967-7.915,7.425c-1.269,3.636-2.079,4.225-3.53,4.225H8.366  c-0.334,0-0.603,0.269-0.603,0.603v3.336c0,0.336,0.269,0.604,0.603,0.604h0.431c4.315,0,6.17-3.007,7.272-5.78  c0.641,0,3.104,0,3.104,0c0.335,0,0.604-0.269,0.604-0.604v-3.336c0-0.335-0.27-0.604-0.604-0.604c0,0-0.561,0-1.123,0  c0.779-1.129,1.514-1.323,2.192-1.323h0.431c0.333,0,0.603-0.271,0.603-0.605V7.197c0-0.331-0.27-0.604-0.603-0.604H20.242  L20.242,6.594z" fill="#1F2430"/>
+<path d="M20.242,6.594c-4.72,0-6.709,3.967-7.915,7.425c-1.269,3.636-2.079,4.225-3.53,4.225H8.366  c-0.334,0-0.603,0.269-0.603,0.603v3.336c0,0.336,0.269,0.604,0.603,0.604h0.431c4.315,0,6.17-3.007,7.272-5.78  c0.641,0,3.104,0,3.104,0c0.335,0,0.604-0.269,0.604-0.604v-3.336c0-0.335-0.27-0.604-0.604-0.604c0,0-0.561,0-1.123,0  c0.779-1.129,1.514-1.323,2.192-1.323h0.431c0.333,0,0.603-0.271,0.603-0.605V7.197c0-0.331-0.27-0.604-0.603-0.604H20.242  L20.242,6.594z" fill="#25242B"/>
 <radialGradient cx="-2686.96" cy="511.5801" gradientTransform="matrix(2.2479 0 0 -2.2479 6054.5376 1164.6696)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="3.0503">
-<stop offset="0" style="stop-color:#1F2430"/>
-<stop offset="0.1011" style="stop-color:#1F2430"/>
+<stop offset="0" style="stop-color:#25242B"/>
+<stop offset="0.1011" style="stop-color:#25242B"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </radialGradient>
 <path d="M20.242,7.195c-4.314,0-6.133,3.549-7.346,7.021l0,0c-1.252,3.592-2.171,4.63-4.1,4.63H8.366v3.338  h0.431c4.063,0,5.767-2.876,6.86-5.783c0.495,0,3.517,0,3.517,0v-3.335c0,0-1.478,0-2.188,0c0.909-1.781,1.877-2.532,3.254-2.532  h0.433V7.197h-0.431V7.195z" fill="url(#SVGID_4_)"/>
@@ -30,7 +30,7 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientTransform="matrix(1.1364 0 0 -1.1364 895.5911 -433.8352)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-774.8306" x2="-774.8306" y1="-391.5132" y2="-384.2012">
-<stop offset="0" style="stop-color:#627995"/>
+<stop offset="0" style="stop-color:#717A86"/>
 <stop offset="0.8708" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_folder.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_folder.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_folder.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,7 +3,7 @@
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <polygon fill-opacity="0.6" points="1,27 1,3 14,3 14,6 29,6 29,27 " stroke-opacity="0.6"/>
-<polygon fill="#FEAB29" points="13,7 13,4 2,4 2,26 28,26 28,7 "/>
+<polygon fill="#BEA069" points="13,7 13,4 2,4 2,26 28,26 28,7 "/>
 <rect fill="#FFFFFF" height="1" width="15" x="13" y="7"/>
 <rect fill="#FFFFFF" height="1" width="11" x="2" y="4"/>
 <rect fill="url(#SVGID_1_)" height="16" width="26" x="2" y="10"/>
@@ -11,9 +11,9 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="10.7192" y2="25.8892">
-<stop offset="0" style="stop-color:#FEE06A"/>
-<stop offset="0.9091" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+<stop offset="0" style="stop-color:#D2C896"/>
+<stop offset="0.9091" style="stop-color:#B39C4D"/>
+<stop offset="1" style="stop-color:#B3964D"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_follow_up.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_follow_up.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_follow_up.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,17 +5,17 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M26.618,6.5H21.25c-0.896,0-1.607-0.439-2.508-0.996C17.602,4.799,16.309,4,14.375,4H11V1H4v4h1v24h5  V18.5h4.375c1.366,0,2.313,0.585,3.315,1.205C18.721,20.342,19.785,21,21.25,21h5.368l-3.625-7.25L26.618,6.5z" fill-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.7227" x2="9.9584" y1="12.5005" y2="12.5005">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<stop offset="0" style="stop-color:#A8835F"/>
+<stop offset="0.2606" style="stop-color:#A86F5F"/>
+<stop offset="1" style="stop-color:#9A5047"/>
 </linearGradient>
 <path d="M21.875,13.75L25,20c0,0-2.5,0-3.75,0c-2.5,0-3.75-2.5-6.875-2.5c-0.625,0-4.375,0-4.375,0V5  c0,0,3.75,0,4.375,0C17.5,5,18.75,7.5,21.25,7.5c1.25,0,3.75,0,3.75,0L21.875,13.75z" fill="url(#SVGID_1_)"/>
 <path d="M21.625,14.25L24.5,20c0.304,0,0.5,0,0.5,0l-3.125-6.25L21.625,14.25z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M21.25,8.5c0.903,0,2.457,0,3.25,0l0.5-1c0,0-2.5,0-3.75,0c-2.5,0-3.75-2.5-6.875-2.5  C13.75,5,10,5,10,5v1c0,0,3.75,0,4.375,0C17.5,6,18.75,8.5,21.25,8.5z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="9" x2="6.0412" y1="15.9995" y2="15.9995">
-<stop offset="0" style="stop-color:#8C8E8F"/>
+<stop offset="0" style="stop-color:#8D8E8E"/>
 <stop offset="0.6545" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#AEB2B3"/>
+<stop offset="1" style="stop-color:#B0B2B1"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="24" width="3" x="6" y="4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="9.9585" x2="5.0415" y1="3" y2="3">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_forward.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_forward.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_forward.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -10,8 +10,8 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientTransform="matrix(-1 0 0 1 594 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="579" x2="579" y1="4.8848" y2="25.2603">
-<stop offset="0" style="stop-color:#FEE06A"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+<stop offset="0" style="stop-color:#D2C896"/>
+<stop offset="1" style="stop-color:#B3964D"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_gprs.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_gprs.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_gprs.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,16 +5,16 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29C7.279,29,1,22.719,1,15C1,7.279,7.279,1,15,1c7.719,0,14,6.279,14,14C29,22.719,22.719,29,15,29  L15,29z" fill-opacity="0.6"/>
 <circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.168,28,15c0-7.18-5.82-13-13-13  S2,7.82,2,15c0,0.168,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<polygon fill-opacity="0.2" points="25.839,14.5 7.454,14.5 7.454,11.5 20.253,11.5 18.975,9.57 21.476,7.914 25.839,14.5 " stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="6.454,16.5 24.839,16.5 24.839,19.5 12.04,19.5 13.318,21.428 10.817,23.086 6.454,16.5 " stroke-opacity="0.2"/>
-<polygon fill="#FFFFFF" points="24.839,13.5 6.454,13.5 6.454,10.5 19.253,10.5 17.975,8.57 20.476,6.914 24.839,13.5 "/>
-<polygon fill="#FFFFFF" points="5.454,15.5 23.839,15.5 23.839,18.5 11.04,18.5 12.318,20.428 9.817,22.086 5.454,15.5 "/>
+<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5  C27.98,15.332,28,15.168,28,15c0-7.18-5.82-13-13-13C7.82,2,2,7.82,2,15c0,0.168,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill-opacity="0.2" points="25.839,14.5 7.454,14.5 7.454,11.5 20.253,11.5 18.975,9.57   21.477,7.914 " stroke-opacity="0.2"/>
+<polygon fill-opacity="0.2" points="6.454,16.5 24.839,16.5 24.839,19.5 12.04,19.5 13.318,21.428   10.817,23.086 " stroke-opacity="0.2"/>
+<polygon fill="#FFFFFF" points="24.839,13.5 6.454,13.5 6.454,10.5 19.253,10.5 17.975,8.57 20.477,6.914 "/>
+<polygon fill="#FFFFFF" points="5.454,15.5 23.839,15.5 23.839,18.5 11.04,18.5 12.318,20.428 9.817,22.086 "/>
 <rect fill="none" height="30" width="30"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.2749" y2="32.0078">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="593.9609" x2="593.9609" y1="814.3145" y2="844.0474">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<g>
-<path d="M0,30V0h30v30H0z M23.599,26.25l-8.732-8.732L6.134,26.25H23.599z M26.25,23.599V6.134l-8.732,8.732   L26.25,23.599z M3.75,23.331l8.465-8.465L3.75,6.401V23.331z M14.866,12.215L23.33,3.75H6.402L14.866,12.215z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="0.9941" y2="29.1902">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="0.6182" style="stop-color:#A8A8A8"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<path d="M0.938,0.938v28.125h28.125V0.938H0.938z M13.541,14.866L2.813,25.595V4.138L13.541,14.866z    M4.139,2.813h21.455L14.866,13.541L4.139,2.813z M14.866,16.192l10.995,10.995H3.871L14.866,16.192z M16.192,14.866L27.188,3.871   v21.99L16.192,14.866z" fill="url(#SVGID_1_)"/>
-<g>
-<polygon fill-opacity="0.6" points="8.547,25.313 7.61,17.813 5.625,17.813 5.625,12.199 24.375,12.199 24.375,17.813 22.391,17.813     21.453,25.313   " stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="12.103" y2="23.9943">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2_)" points="6.563,13.137 6.563,16.875 8.438,16.875 9.375,24.375 20.625,24.375 21.563,16.875     23.438,16.875 23.438,13.137   "/>
-<path d="M13.125,14.063v-2.886c-0.348,0.048-0.692,0.073-1.03,0.073c-0.804,0-1.568-0.139-2.272-0.414    C5.866,9.294,5.955,6.329,5.96,6.204l0.019-0.408l0.312-0.265c0.103-0.088,1.06-0.855,2.881-0.855c0.958,0,1.99,0.212,3.066,0.632    c1.3,0.506,2.174,1.126,2.762,1.716c0.588-0.589,1.462-1.209,2.762-1.716c1.076-0.42,2.108-0.632,3.066-0.632    c1.82,0,2.777,0.767,2.881,0.855l0.313,0.265l0.019,0.408c0.005,0.125,0.094,3.091-3.862,4.632    c-0.704,0.275-1.469,0.414-2.272,0.414c-0.338,0-0.683-0.025-1.03-0.073v2.886H13.125z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M10.163,9.963c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875V10.02    c1.003,0.289,2.464,0.502,3.899-0.057c3.375-1.316,3.267-3.717,3.267-3.717s-1.627-1.379-5.002-0.064    C16.242,6.907,15.392,7.849,15,8.551c-0.392-0.702-1.242-1.644-3.102-2.369C8.523,4.866,6.896,6.246,6.896,6.246    S6.788,8.647,10.163,9.963z" fill="url(#SVGID_3_)"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="4.9224" y2="12.8702">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
-</linearGradient>
-</defs>
-</g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="12.5542" y2="17.3683">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
-</linearGradient>
-<rect fill="url(#SVGID_4_)" height="3.738" width="16.875" x="6.563" y="13.137"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="16.8408" y2="24.5597">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
-</linearGradient>
-<polygon fill="url(#SVGID_5_)" points="20.625,24.375 9.375,24.375 8.438,16.875 21.563,16.875  "/>
-<path d="M23.104,6.246c0,0-1.627-1.379-5.002-0.064C16.242,6.907,15.392,7.849,15,8.551   c-0.392-0.702-1.242-1.644-3.102-2.369C8.523,4.866,6.896,6.246,6.896,6.246s-0.109,2.401,3.267,3.717   c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875V10.02c1.003,0.289,2.464,0.502,3.899-0.057   C23.212,8.647,23.104,6.246,23.104,6.246z" fill="url(#SVGID_3_)"/>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<path d="M14.063,9.082c-1.003,0.289-2.464,0.502-3.899-0.057C8.06,8.205,7.31,6.963,7.042,6.144    c-0.094,0.06-0.146,0.102-0.146,0.102s-0.109,2.401,3.267,3.717c1.436,0.559,2.896,0.346,3.899,0.057V9.082z"/>
-<path d="M22.958,6.144c-0.268,0.819-1.018,2.061-3.121,2.881c-1.436,0.559-2.896,0.346-3.899,0.057v0.938    c1.003,0.289,2.464,0.502,3.899-0.057c3.375-1.316,3.267-3.717,3.267-3.717S23.052,6.204,22.958,6.144z"/>
-<rect height="0.938" width="1.875" x="14.063" y="12.188"/>
-</g>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="0.926" stroke-opacity="0.3" width="16.875" x="6.563" y="13.137"/>
-<polygon fill-opacity="0.2" points="21.445,17.813 21.563,16.875 8.438,16.875 8.555,17.813  " stroke-opacity="0.2"/>
-</g>
-</g>
-</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_homescreen.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_homescreen.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_homescreen.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,19 +3,19 @@
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.5088" y2="28.7349">
-<stop offset="0" style="stop-color:#A5A7AA"/>
-<stop offset="1" style="stop-color:#221F1F"/>
+<stop offset="0" style="stop-color:#A7A8A9"/>
+<stop offset="1" style="stop-color:#212020"/>
 </linearGradient>
 <path d="M15,28.307c-7.168,0-13-5.831-13-13c0-7.167,5.832-13,13-13c7.17,0,13,5.833,13,13  C28,22.476,22.17,28.307,15,28.307L15,28.307z" fill="url(#SVGID_1_)" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.0005" x2="15.0005" y1="2.8374" y2="28.3903">
-<stop offset="0" style="stop-color:#A8A9AC"/>
+<stop offset="0" style="stop-color:#A9AAAB"/>
 <stop offset="1" style="stop-color:#000000"/>
 </linearGradient>
 <path d="M15,27.973c-6.984,0-12.666-5.683-12.666-12.667C2.334,8.321,8.016,2.639,15,2.639  s12.668,5.682,12.668,12.667C27.668,22.29,21.984,27.973,15,27.973L15,27.973z" fill="url(#SVGID_2_)" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="2.6943" y2="27.3623">
-<stop offset="0" style="stop-color:#F4F5F5"/>
+<stop offset="0" style="stop-color:#F4F5F4"/>
 <stop offset="0.7818" style="stop-color:#CCCBCB"/>
-<stop offset="1" style="stop-color:#D0D0D1"/>
+<stop offset="1" style="stop-color:#D0D1D1"/>
 </linearGradient>
 <circle cx="15" cy="14.973" fill="url(#SVGID_3_)" r="12.334"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.0005" x2="15.0005" y1="3.1831" y2="26.6896">
@@ -31,33 +31,33 @@
 <polygon fill="#020202" points="14.916,7.065 6,13.421 7.061,15.624 14.916,9.843 22.773,15.624 24,13.582 "/>
 <polygon fill="#020202" points="8.496,16.097 8.496,22.863 13.158,22.863 13.158,19.516 16.762,19.516 16.762,22.863 21.375,22.863   21.375,16.097 14.936,11.376 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9995" x2="14.9995" y1="6.6069" y2="22.331">
-<stop offset="0" style="stop-color:#2143F2"/>
-<stop offset="1" style="stop-color:#0ABDD0"/>
+<stop offset="0" style="stop-color:#6077B3"/>
+<stop offset="1" style="stop-color:#458295"/>
 </linearGradient>
 <polygon fill="url(#SVGID_6_)" points="14.916,6.337 6,12.693 7.061,14.896 14.916,9.115 22.773,14.896 24,12.854 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9878" x2="14.9878" y1="6.6958" y2="13.1186">
-<stop offset="0" style="stop-color:#3067FC"/>
-<stop offset="1" style="stop-color:#0D98A9"/>
+<stop offset="0" style="stop-color:#6D97BF"/>
+<stop offset="1" style="stop-color:#3C637A"/>
 </linearGradient>
 <path d="M14.914,7.221l8.131,5.832l-0.48,0.797l-7.436-5.47l-0.213-0.156L14.703,8.38l-7.371,5.425  l-0.42-0.877L14.914,7.221 M14.916,6.778L6.455,12.81l0.74,1.541l7.721-5.682l7.752,5.704l0.854-1.419L14.916,6.778L14.916,6.778z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.9351" x2="14.9351" y1="5.8877" y2="22.3399">
-<stop offset="0" style="stop-color:#2143F2"/>
-<stop offset="1" style="stop-color:#0ABDD0"/>
+<stop offset="0" style="stop-color:#6077B3"/>
+<stop offset="1" style="stop-color:#458295"/>
 </linearGradient>
 <polygon fill="url(#SVGID_8_)" points="8.496,15.37 8.496,22.135 13.158,22.135 13.158,18.788 16.762,18.788 16.762,22.135   21.375,22.135 21.375,15.37 14.936,10.648 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.9351" x2="14.9351" y1="11.1875" y2="21.9653">
-<stop offset="0" style="stop-color:#2167FC"/>
-<stop offset="1" style="stop-color:#0D98A9"/>
+<stop offset="0" style="stop-color:#638DBA"/>
+<stop offset="1" style="stop-color:#3C637A"/>
 </linearGradient>
 <path d="M14.936,11.54l5.721,4.194v5.682h-3.178v-2.987v-0.359h-0.359h-4.318h-0.359v0.359v2.987H9.215  v-5.682L14.936,11.54 M14.936,11.094l-6.08,4.458v6.224h3.945v-3.347h4.318v3.347h3.896v-6.224L14.936,11.094L14.936,11.094z" fill="url(#SVGID_9_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="14.9995" x2="14.9995" y1="6.5171" y2="14.0168">
-<stop offset="0" style="stop-color:#109AAF"/>
-<stop offset="1" style="stop-color:#0C8C9C"/>
+<stop offset="0" style="stop-color:#40687F"/>
+<stop offset="1" style="stop-color:#375871"/>
 </linearGradient>
 <path d="M14.916,6.778l8.605,6.176l-0.854,1.419l-7.539-5.547l-0.213-0.157l-0.213,0.157l-7.508,5.525  l-0.74-1.541L14.916,6.778 M14.916,6.337L6,12.693l1.061,2.203l7.855-5.782l7.857,5.782L24,12.854L14.916,6.337L14.916,6.337z" fill="url(#SVGID_10_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.9351" x2="14.9351" y1="10.7378" y2="22.3243">
-<stop offset="0" style="stop-color:#109AAF"/>
-<stop offset="1" style="stop-color:#0C8C9C"/>
+<stop offset="0" style="stop-color:#40687F"/>
+<stop offset="1" style="stop-color:#375871"/>
 </linearGradient>
 <path d="M14.936,11.094l6.08,4.458v6.224h-3.896v-2.987v-0.359h-0.357h-3.604h-0.357v0.359v2.987H8.855  v-6.224L14.936,11.094 M14.936,10.648L8.496,15.37v6.765h4.662v-3.347h3.604v3.347h4.613V15.37L14.936,10.648L14.936,10.648z" fill="url(#SVGID_11_)"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_offline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_offline.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_offline.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,52 +4,52 @@
 <g>
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29C7.279,29,1,22.719,1,15C1,7.279,7.279,1,15,1c7.719,0,14,6.279,14,14C29,22.719,22.719,29,15,29  L15,29z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.2749" y2="32.0078">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="593.9609" x2="593.9609" y1="814.3145" y2="844.0474">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.168,28,15c0-7.18-5.82-13-13-13  S2,7.82,2,15c0,0.168,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<polygon fill-opacity="0.2" points="25.839,14.5 7.454,14.5 7.454,11.5 20.253,11.5 18.975,9.57 21.476,7.914 25.839,14.5 " stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="6.454,16.5 24.839,16.5 24.839,19.5 12.04,19.5 13.318,21.428 10.817,23.086 6.454,16.5 " stroke-opacity="0.2"/>
-<polygon fill="#FFFFFF" points="24.839,13.5 6.454,13.5 6.454,10.5 19.253,10.5 17.975,8.57 20.476,6.914 24.839,13.5 "/>
-<polygon fill="#FFFFFF" points="5.454,15.5 23.839,15.5 23.839,18.5 11.04,18.5 12.318,20.428 9.817,22.086 5.454,15.5 "/>
+<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5  C27.98,15.332,28,15.168,28,15c0-7.18-5.82-13-13-13C7.82,2,2,7.82,2,15c0,0.168,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill-opacity="0.2" points="25.839,14.5 7.454,14.5 7.454,11.5 20.253,11.5 18.975,9.57   21.477,7.914 " stroke-opacity="0.2"/>
+<polygon fill-opacity="0.2" points="6.454,16.5 24.839,16.5 24.839,19.5 12.04,19.5 13.318,21.428   10.817,23.086 " stroke-opacity="0.2"/>
+<polygon fill="#FFFFFF" points="24.839,13.5 6.454,13.5 6.454,10.5 19.253,10.5 17.975,8.57 20.477,6.914 "/>
+<polygon fill="#FFFFFF" points="5.454,15.5 23.839,15.5 23.839,18.5 11.04,18.5 12.318,20.428 9.817,22.086 "/>
 <rect fill="none" height="30" width="30"/>
 </g>
 <g>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.8975)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="274.9814" x2="274.9814" y1="-359.3721" y2="-352.3351">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.66" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+<stop offset="0.66" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#BABCBB"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="12.601,28.542 2.4,28.542 2.4,22.27 7.5,18.343 12.601,22.27 "/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.8975)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="274.9795" x2="274.9795" y1="-354.4097" y2="-359.3443">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.66" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+<stop offset="0.66" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#BABCBB"/>
 </linearGradient>
 <path d="M7.5,18.857l4.693,3.613v5.665H2.809v-5.666L7.5,18.857 M7.5,18.343L2.4,22.27v6.273h10.2V22.27  L7.5,18.343L7.5,18.343z" fill="url(#SVGID_2_)"/>
 <polygon fill-opacity="0.2" points="12.601,23.826 12.601,22.27 7.5,18.343 2.4,22.27 2.4,23.952   7.5,19.872 " stroke-opacity="0.2"/>
 <polygon fill="#727272" points="12.601,23.826 12.601,22.27 7.5,18.343 2.4,22.27 2.4,23.952 7.5,18.853 "/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.8975)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="274.9805" x2="274.9805" y1="-354.707" y2="-359.5847">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="4.59" width="3.061" x="5.971" y="23.952"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.8975)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="274.9814" x2="274.9814" y1="-359.4072" y2="-354.8671">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <path d="M8.622,24.36v3.774H6.378V24.36H8.622 M9.031,23.952H5.971v4.59h3.061V23.952L9.031,23.952z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.8975)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="274.9795" x2="274.9795" y1="-346.8545" y2="-354.5899">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.26" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<stop offset="0" style="stop-color:#A8835F"/>
+<stop offset="0.26" style="stop-color:#A86F5F"/>
+<stop offset="1" style="stop-color:#9A5047"/>
 </linearGradient>
 <path d="M7.5,18.343l5.101,5.1l1.02-1.02c0,0-5.502-5.488-5.759-5.76c-0.255-0.271-0.422-0.285-0.738,0.016  C6.81,16.979,1.38,22.422,1.38,22.422l1.021,1.02L7.5,18.343z" fill="url(#SVGID_5_)"/>
 <radialGradient cx="-3057.9365" cy="-384.3403" gradientTransform="matrix(0.125 0 0 -0.125 389.692 -31.3322)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="65.2801">
-<stop offset="0" style="stop-color:#F7D481"/>
-<stop offset="1" style="stop-color:#F5340A"/>
+<stop offset="0" style="stop-color:#D4C9A4"/>
+<stop offset="1" style="stop-color:#AF6151"/>
 </radialGradient>
 <path d="M7.125,17.087c0.316-0.301,0.481-0.285,0.738-0.016c0.225,0.24,4.56,4.564,5.553,5.556l0.204-0.205  c0,0-5.502-5.488-5.759-5.76c-0.255-0.271-0.422-0.285-0.738,0.016C6.81,16.979,1.38,22.422,1.38,22.422l0.205,0.204  C2.569,21.638,6.846,17.353,7.125,17.087z" fill="url(#SVGID_6_)"/>
 <rect fill-opacity="0.2" height="0.511" stroke-opacity="0.2" width="3.061" x="5.971" y="23.952"/>
@@ -61,9 +61,9 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="339.8" x2="339.8" y1="-397.3" y2="-425.3">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.2606" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.2606" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_widget.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_widget.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_widget.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,39 +6,39 @@
 <path d="M17.167,28.028c-0.878,0-1.592-0.714-1.592-1.592v-8.961c0-0.878,0.714-1.593,1.592-1.593h8.963  c0.878,0,1.592,0.714,1.592,1.593v8.961c0,0.877-0.714,1.592-1.592,1.592H17.167z" fill-opacity="0.6"/>
 <path d="M17.167,15.49c-0.878,0-1.592-0.714-1.592-1.592V4.937c0-0.877,0.714-1.592,1.592-1.592h8.963  c0.878,0,1.592,0.714,1.592,1.592v8.961c0,0.877-0.714,1.592-1.592,1.592H17.167z" fill-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="9.1099" x2="9.1099" y1="14.7993" y2="29.1976">
-<stop offset="0" style="stop-color:#E8EEEF"/>
-<stop offset="0.0424" style="stop-color:#E8EEEF"/>
-<stop offset="0.2606" style="stop-color:#BBBFC1"/>
-<stop offset="0.5394" style="stop-color:#929A9E"/>
-<stop offset="1" style="stop-color:#969EA1"/>
+<stop offset="0" style="stop-color:#EAEDEB"/>
+<stop offset="0.0424" style="stop-color:#EAEDEB"/>
+<stop offset="0.2606" style="stop-color:#BDBFBF"/>
+<stop offset="0.5394" style="stop-color:#969A9A"/>
+<stop offset="1" style="stop-color:#999E9E"/>
 </linearGradient>
 <path d="M4.63,27.471c-0.571,0-1.036-0.464-1.036-1.034v-8.962c0-0.571,0.465-1.035,1.036-1.035h8.962  c0.57,0,1.034,0.464,1.034,1.035v8.962c0,0.57-0.464,1.034-1.034,1.034H4.63z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="21.6484" x2="21.6484" y1="14.2666" y2="29.5001">
-<stop offset="0" style="stop-color:#9FDBED"/>
-<stop offset="0.7333" style="stop-color:#3261AA"/>
-<stop offset="1" style="stop-color:#2B84C4"/>
+<stop offset="0" style="stop-color:#B6D6CA"/>
+<stop offset="0.7333" style="stop-color:#566486"/>
+<stop offset="1" style="stop-color:#597996"/>
 </linearGradient>
 <path d="M17.167,27.47c-0.569,0-1.034-0.464-1.034-1.034v-8.961c0-0.571,0.465-1.035,1.034-1.035h8.963  c0.569,0,1.033,0.463,1.033,1.035v8.961c0,0.57-0.464,1.034-1.033,1.034H17.167z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="21.6484" x2="21.6484" y1="1.8657" y2="17.1518">
-<stop offset="0" style="stop-color:#E8EEEF"/>
-<stop offset="0.0424" style="stop-color:#E8EEEF"/>
-<stop offset="0.2606" style="stop-color:#BBBFC1"/>
-<stop offset="0.5394" style="stop-color:#929A9E"/>
-<stop offset="1" style="stop-color:#969EA1"/>
+<stop offset="0" style="stop-color:#EAEDEB"/>
+<stop offset="0.0424" style="stop-color:#EAEDEB"/>
+<stop offset="0.2606" style="stop-color:#BDBFBF"/>
+<stop offset="0.5394" style="stop-color:#969A9A"/>
+<stop offset="1" style="stop-color:#999E9E"/>
 </linearGradient>
 <path d="M17.167,14.932c-0.569,0-1.034-0.462-1.034-1.034V4.937c0-0.571,0.465-1.035,1.034-1.035h8.963  c0.569,0,1.033,0.463,1.033,1.035v8.961c0,0.571-0.464,1.034-1.033,1.034H17.167z" fill="url(#SVGID_3_)"/>
 <polygon fill-opacity="0.6" points="4.988,10.178 1.52,6.882 6.245,6.136 8.309,1.82 10.479,6.082 15.222,6.71 11.838,10.092   12.706,14.796 8.445,12.624 4.237,14.902 "/>
 <radialGradient cx="8.146" cy="58.4453" gradientTransform="matrix(1 0 0 -1 0.1597 62.4922)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="10.161">
-<stop offset="0" style="stop-color:#FBDF6F"/>
-<stop offset="0.14" style="stop-color:#FBDF6F"/>
-<stop offset="0.55" style="stop-color:#FFC512"/>
-<stop offset="0.73" style="stop-color:#F2A61E"/>
-<stop offset="1" style="stop-color:#FBD23C"/>
+<stop offset="0" style="stop-color:#D1C899"/>
+<stop offset="0.14" style="stop-color:#D1C899"/>
+<stop offset="0.55" style="stop-color:#B8A259"/>
+<stop offset="0.73" style="stop-color:#B2955E"/>
+<stop offset="1" style="stop-color:#C2B375"/>
 </radialGradient>
 <polygon fill="url(#SVGID_4_)" points="5.559,9.985 2.67,7.24 6.605,6.619 8.324,3.023 10.131,6.574 14.081,7.098 11.263,9.915   11.985,13.831 8.436,12.022 4.934,13.92 "/>
 <radialGradient cx="8.2612" cy="57.21" gradientTransform="matrix(1 0 0 -1 0.1597 62.4922)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="14.1249">
-<stop offset="0" style="stop-color:#FFF3CD"/>
-<stop offset="1" style="stop-color:#FFC512"/>
+<stop offset="0" style="stop-color:#F0EDDC"/>
+<stop offset="1" style="stop-color:#B8A259"/>
 </radialGradient>
 <polygon fill="url(#SVGID_5_)" points="6.766,6.938 8.324,3.663 9.971,6.894 13.797,7.38 14.081,7.098 10.131,6.574 8.324,3.023   6.605,6.619 2.67,7.24 2.96,7.516 "/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_html.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_html.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_html.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -10,8 +10,8 @@
 <polygon fill="url(#SVGID_1_)" points="26,2 26,28 10,28 4,22 4,2 "/>
 <polygon fill="#FFFFFF" points="4,22 10,22 10,28 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="-2.375" y2="7.0009">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#83CABF"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="5.393" width="22" x="4" y="2"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="22" x="4" y="2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hwr.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hwr.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hwr.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,21 +6,21 @@
 <path d="M4,29c-1.65,0-3-1.35-3-3V4c0-1.65,1.35-3,3-3h22c1.65,0,3,1.35,3,3v22c0,1.65-1.35,3-3,3H4z"/>
 </g>
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#A8EEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.9165" y2="27.917">
+<stop offset="0" style="stop-color:#65AEBD"/>
+<stop offset="1" style="stop-color:#526085"/>
 </linearGradient>
 <path d="M28,26c0,1.1-0.9,2-2,2H4c-1.1,0-2-0.9-2-2V4c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2V26z" fill="url(#SVGID_1_)"/>
 </g>
 <g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="3" y2="27.0005">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="593.9609" x2="593.9609" y1="815.0391" y2="839.0391">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 <path d="M4,27c-0.55,0-1-0.45-1-1V4c0-0.55,0.45-1,1-1h22c0.55,0,1,0.45,1,1v22c0,0.55-0.45,1-1,1H4z" fill="url(#SVGID_2_)"/>
 </g>
-<path d="M23.504,18.337c0-0.547-0.444-0.99-0.992-0.99h-2.104c-1.015-2.689-2.176-5.543-3.198-7.475  c0.488-0.4,0.801-1.008,0.801-1.69C18.01,6.978,17.033,6,15.827,6c-1.205,0-2.183,0.978-2.183,2.182c0,0.639,0.275,1.21,0.71,1.607  c-0.689,1.458-2.026,4.366-3.282,7.558h-0.947c-0.361-0.707-1.094-1.192-1.943-1.192C6.977,16.154,6,17.133,6,18.337  c0,1.205,0.977,2.183,2.183,2.183c0.849,0,1.582-0.483,1.943-1.192h0.195c-0.687,1.881-1.297,3.775-1.689,5.457  c-0.124,0.533,0.206,1.064,0.741,1.188c0.532,0.125,1.064-0.205,1.189-0.739c0.416-1.791,1.107-3.867,1.875-5.906h6.591  c1.181,3.216,2.072,5.934,2.09,5.99C21.255,25.734,21.642,26,22.06,26c0.103,0,0.206-0.015,0.308-0.049  c0.52-0.171,0.805-0.729,0.633-1.25c-0.068-0.214-0.826-2.52-1.862-5.374h1.374C23.06,19.327,23.504,18.885,23.504,18.337z   M13.211,17.347c0.947-2.35,1.911-4.504,2.569-5.923c0.802,1.619,1.689,3.783,2.507,5.923H13.211z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M23.752,17.337c0-0.547-0.444-0.99-0.992-0.99h-2.104c-1.015-2.689-2.176-5.543-3.198-7.475  c0.488-0.4,0.801-1.008,0.801-1.69C18.258,5.978,17.281,5,16.075,5c-1.205,0-2.183,0.978-2.183,2.182c0,0.639,0.275,1.21,0.71,1.607  c-0.689,1.458-2.026,4.366-3.282,7.558h-0.947c-0.361-0.707-1.094-1.192-1.943-1.192c-1.206,0-2.183,0.979-2.183,2.183  c0,1.205,0.977,2.183,2.183,2.183c0.849,0,1.582-0.483,1.943-1.192h0.195c-0.687,1.881-1.297,3.775-1.689,5.457  c-0.124,0.533,0.206,1.064,0.741,1.188c0.532,0.125,1.064-0.205,1.189-0.739c0.416-1.791,1.107-3.867,1.875-5.906h6.591  c1.181,3.216,2.072,5.934,2.09,5.99C21.503,24.734,21.89,25,22.308,25c0.103,0,0.206-0.015,0.308-0.049  c0.52-0.171,0.805-0.729,0.633-1.25c-0.068-0.214-0.826-2.52-1.862-5.374h1.374C23.308,18.327,23.752,17.885,23.752,17.337z   M13.459,16.347c0.947-2.35,1.911-4.504,2.569-5.923c0.802,1.619,1.689,3.783,2.507,5.923H13.459z" fill="#F5F5F5"/>
+<path d="M23.504,18.337c0-0.547-0.443-0.989-0.992-0.989h-2.104  c-1.016-2.688-2.176-5.542-3.198-7.476c0.487-0.4,0.802-1.008,0.802-1.69C18.01,6.978,17.033,6,15.827,6  c-1.205,0-2.183,0.978-2.183,2.182c0,0.639,0.275,1.21,0.71,1.607c-0.689,1.458-2.026,4.366-3.282,7.559h-0.947  c-0.361-0.707-1.094-1.193-1.943-1.193C6.977,16.154,6,17.133,6,18.337c0,1.205,0.977,2.183,2.183,2.183  c0.849,0,1.582-0.481,1.943-1.19h0.195c-0.687,1.881-1.297,3.774-1.689,5.457c-0.124,0.532,0.206,1.063,0.741,1.188  c0.532,0.125,1.064-0.205,1.189-0.738c0.416-1.791,1.107-3.867,1.875-5.906h6.59c1.182,3.216,2.072,5.934,2.091,5.99  c0.137,0.414,0.524,0.68,0.942,0.68c0.104,0,0.205-0.016,0.309-0.049c0.521-0.172,0.805-0.729,0.633-1.25  c-0.066-0.215-0.826-2.52-1.861-5.374h1.375C23.061,19.327,23.504,18.885,23.504,18.337z M13.211,17.348  c0.947-2.351,1.911-4.505,2.568-5.924c0.803,1.619,1.688,3.783,2.508,5.924H13.211z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M23.752,17.337c0-0.547-0.443-0.989-0.992-0.989h-2.104c-1.016-2.688-2.176-5.542-3.198-7.476  c0.487-0.4,0.801-1.008,0.801-1.69C18.258,5.978,17.281,5,16.075,5c-1.205,0-2.183,0.978-2.183,2.182c0,0.639,0.275,1.21,0.71,1.607  c-0.689,1.458-2.026,4.366-3.282,7.559h-0.947c-0.361-0.707-1.094-1.193-1.943-1.193c-1.206,0-2.183,0.979-2.183,2.183  c0,1.205,0.977,2.184,2.183,2.184c0.849,0,1.582-0.482,1.943-1.191h0.195c-0.687,1.881-1.297,3.773-1.689,5.457  c-0.124,0.531,0.206,1.063,0.741,1.188c0.532,0.125,1.064-0.205,1.189-0.74c0.416-1.791,1.107-3.865,1.875-5.904h6.591  c1.181,3.216,2.072,5.936,2.09,5.988C21.503,24.734,21.891,25,22.309,25c0.104,0,0.205-0.016,0.309-0.049  c0.521-0.172,0.805-0.729,0.633-1.25c-0.066-0.215-0.826-2.52-1.861-5.374h1.375C23.309,18.327,23.752,17.885,23.752,17.337z   M13.459,16.348c0.947-2.351,1.911-4.505,2.568-5.924c0.803,1.619,1.688,3.783,2.508,5.924H13.459z" fill="#F5F5F5"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_image.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_image.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_image.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -10,44 +10,44 @@
 <rect fill="url(#SVGID_1_)" height="22" width="28" x="1" y="4"/>
 <rect fill="#FFFFFF" height="20" width="26" x="2" y="5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="4.792" x2="22.61" y1="4.792" y2="22.61">
-<stop offset="0" stop-color="#7EBA3E"/>
-<stop offset="1" stop-color="#33773B"/>
+<stop offset="0" stop-color="#7A9563"/>
+<stop offset="1" stop-color="#476358"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="18" width="24" x="3" y="6"/>
 <rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="28" x="1" y="25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="7.994" x2="32.65" y1="10.39" y2="24.21">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<stop offset="0" stop-color="#8FB34D"/>
+<stop offset="1" stop-color="#2B644B"/>
 </linearGradient>
 <path d="M27,18.73c-0.327-0.234-0.694-0.459-1.109-0.658-2.262-1.08-9.354-2.498-14.11-4.163-4.755-1.665-3.118-3.442-3.118-3.442-0.106-0.389-0.37-0.777-0.792-0.111-1.122,1.768,1.143,3.228,3.646,4.163,3.118,1.166,10.33,2.419,13.16,4.385,0.956,0.665,1.717,1.31,2.324,1.905v-2.066z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.47" x2="23.28" y1="14.5" y2="27.5">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<stop offset="0" stop-color="#8FB34D"/>
+<stop offset="1" stop-color="#2B644B"/>
 </linearGradient>
 <path d="M9.721,19.19c0.528,0.444,2.42,0.806,4.28-1.056,1.109-1.109,1.109-2.774,1.109-2.774s-2.008-0.611-3.857,0.721c-1.846,1.33-2.057,2.66-1.529,3.11z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.799" x2="22.61" y1="15.21" y2="28.21">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<stop offset="0" stop-color="#8FB34D"/>
+<stop offset="1" stop-color="#2B644B"/>
 </linearGradient>
 <path d="M5.061,13.93c0.216,0.342,1.197,0.887,2.528,0.207,0.794-0.407,1.071-1.322,1.071-1.322s-1.002-0.704-2.24-0.312c-1.238,0.39-1.575,1.08-1.359,1.42z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11.88" x2="25.69" y1="11.94" y2="24.95">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<stop offset="0" stop-color="#8FB34D"/>
+<stop offset="1" stop-color="#2B644B"/>
 </linearGradient>
 <path d="M13.9,11.03c-0.37-0.389-1.385-0.848-2.748,0.333-0.814,0.705-0.824,1.946-0.824,1.946s1.352,0.163,2.435-0.447c1.25-0.71,1.47-1.49,1.14-1.83z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.24" x2="28.06" y1="9.425" y2="22.43">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<stop offset="0" stop-color="#8FB34D"/>
+<stop offset="1" stop-color="#2B644B"/>
 </linearGradient>
 <path d="M21.43,13.08c-0.32-0.434-1.374-0.805-2.537,0.389-0.754,0.773-1.008,2.501-1.008,2.501s1.352,0.163,2.436-0.448c1.25-0.7,1.56-1.83,1.11-2.44z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="12.08" x2="25.89" y1="11.73" y2="24.73">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<stop offset="0" stop-color="#8FB34D"/>
+<stop offset="1" stop-color="#2B644B"/>
 </linearGradient>
 <path d="M17.93,22.48c0.671,0.473,3.591,1.17,5.955-0.809,1.411-1.182,0.898-3.266,0.898-3.266s-3.038-1.205-5.391,0.213c-2.35,1.43-2.13,3.4-1.46,3.87z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="16.78" x2="30.59" y1="6.738" y2="19.73">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<stop offset="0" stop-color="#8FB34D"/>
+<stop offset="1" stop-color="#2B644B"/>
 </linearGradient>
 <path d="M27,13.39c-0.542,0.568-1.025,1.292-1.342,2.203-0.617,1.781,0.855,3.279,0.855,3.279s0.18-0.04,0.48-0.13v-5.352z" fill="url(#SVGID_9_)"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_internet.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_internet.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_internet.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,32 +5,32 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1s14,6.28,14,14S22.72,29,15,29L15,29z" fill-opacity="0.6"/>
 <radialGradient cx="-453.8818" cy="-299.3193" gradientTransform="matrix(0.3502 0 0 0.3502 173.9495 115.3211)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="48.9059">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
 <path d="M27.536,14.288c-0.288-5.078-3.577-9.45-8.38-11.141l-0.585,0.096l-3.397-0.65l-4.235,2.525l-0.159,1.064  H8.322l0.971,1.651L6.662,9.979l-0.613,2.649l2.173,3.851l2.218-0.453l0.81,0.696l0.633,0.063l0.418,1.634l-0.552,1.432L13.763,25  h2.053l2.035-1.644v-0.671l0.537-0.833l0.444-0.227c-0.113,0.172-0.29,0.566-0.29,0.566c-0.019,0.134,0.289,2.755,1.192,2.55  c0.686-0.155,3.135-4.705,3.182-5.138c0.093-0.855-0.373-1.209-0.659-1.343l-0.318-0.15l-1.462,1.466  c-0.157,0.012-0.298,0.038-0.426,0.076v-1.217l1.588-1.551l0.808-2.604l1.231-1.002l-0.27-0.491l0.929-0.894l-0.519-0.946  l0.395,0.048l2.313,5.178L27,15.796c-0.015-0.254-0.042-0.503-0.071-0.753L27.536,14.288z M15.156,8.464l-0.193-0.516h1.161  l0.565,1.271h-0.841V8.464H15.156z M18.987,11.024l0.927,1.353l0.063,0.162l-0.95-0.574L18.8,11.146L18.987,11.024z M20.381,13.388  l0.28,0.28l-0.362,0.081l-0.082-0.1L20.381,13.388z M13.127,4.286l0.59,0.913l-0.67,0.205l-0.262-0.149L13.127,4.286z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M15,2C7.821,2,2,7.821,2,15c0,7.182,5.821,13,13,13c7.182,0,13-5.818,13-13  C28,7.821,22.182,2,15,2z M15,27C8.383,27,3,21.617,3,15S8.383,3,15,3s12,5.383,12,12S21.617,27,15,27z" fill="url(#SVGID_2_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="15.75" cy="5.5" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="15.4173">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M22.044,18.714l-1.353,1.355c0,0-0.818,0-0.856,0.324c-0.018,0.14-0.063,0.744-0.201,1.056  c-0.272,0.188-0.597,0.813-0.597,0.813s-0.169,1.206,0.734,1.001C20.669,23.06,23.434,19.367,22.044,18.714z" fill="url(#SVGID_3_)"/>
 <radialGradient cx="15.75" cy="5.5005" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="17.8335">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M18.99,3.619c-0.222,0.084-0.374,0.142-0.374,0.142l-3.344-0.64l-1.64,1.026l0.863,1.335  l-1.509,0.464l-0.813-0.464l0.286-0.811l-1.06,0.734L11.21,6.683H9.196L9.941,7.95L7.11,10.259l-0.533,2.304l1.051,2.035L8.259,15  l2.218-0.453l0.81,0.696l0.736,0.072l0.801,3.134l-0.533,1.386l1.178,2.604l0.332,1.081h2.053l1.16-0.628l0.875-1.016v-1.229  l1.663-0.849v-1.821l0.658-1.251l1.467-1.32l0.351-1.53l-1.919,0.428l-0.505-0.615l0.359-0.574l-1.363-0.824l-0.581-2.089  l1.007-0.656l0.927,1.353L20.3,11.79l0.696,0.696l0.813,0.425l0.903-0.146l1.003-0.965l-0.706-1.288l-0.889,0.232l-0.804-0.957  l0.764-0.533l2.397,0.29v0.853l2.086,4.298l0.474-0.379C26.756,9.359,23.48,5.199,18.99,3.619z M17.901,9.429l-1.095,0.29h-1.458  V8.964h-1.394l-1.103,0.291L11.17,8.79l-0.465-0.87l2.321-0.522h2.322L15,6.469h1.161l0.646,1.451l1.095,0.384V9.429z M20.397,7.514  l-1.974-0.349V6.469l0.987-0.232l0.29-0.348l0.696,0.58V7.514z" fill="url(#SVGID_4_)"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="2.0625" y2="28.1316">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_intranet.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_intranet.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_intranet.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,33 +6,33 @@
 <path d="M13,29v-2.173c-0.742-0.125-1.47-0.321-2.18-0.587l-1.088,1.885l-3.465-2l1.088-1.885  c-0.581-0.481-1.115-1.015-1.596-1.596l-1.885,1.088l-2-3.465L3.76,19.18C3.495,18.47,3.298,17.741,3.172,17H1v-4h2.172  c0.126-0.741,0.322-1.47,0.587-2.18L1.876,9.732l2-3.465L5.76,7.355C6.241,6.774,6.775,6.241,7.356,5.76L6.268,3.875l3.465-2  L10.82,3.76C11.53,3.494,12.258,3.298,13,3.173V1h4v2.173c0.742,0.125,1.471,0.321,2.18,0.587l1.088-1.885l3.465,2L22.645,5.76  c0.58,0.481,1.114,1.015,1.596,1.596l1.885-1.088l1.999,3.465L26.24,10.82c0.266,0.71,0.461,1.438,0.588,2.18H29v4h-2.172  c-0.127,0.741-0.322,1.47-0.588,2.18l1.884,1.088l-1.999,3.465l-1.885-1.088c-0.481,0.581-1.016,1.114-1.596,1.596l1.088,1.885  l-3.465,2L19.18,26.24c-0.709,0.266-1.438,0.462-2.18,0.587V29H13z" fill-opacity="0.6"/>
 <path d="M28,16v-2h-2.051c-0.115-1.279-0.455-2.491-0.971-3.606l1.779-1.027l-1-1.732L23.98,8.66  c-0.725-1.023-1.617-1.916-2.641-2.641l1.026-1.778l-1.732-1l-1.027,1.779C18.491,4.505,17.279,4.166,16,4.051V2h-2v2.051  c-1.279,0.115-2.491,0.454-3.606,0.97L9.366,3.241l-1.732,1L8.661,6.02C7.637,6.744,6.744,7.637,6.02,8.66L4.242,7.634l-1,1.732  l1.779,1.027C4.505,11.509,4.166,12.721,4.05,14H2v2h2.05c0.116,1.279,0.455,2.491,0.971,3.606l-1.779,1.027l1,1.732L6.02,21.34  c0.724,1.023,1.617,1.916,2.641,2.641l-1.027,1.778l1.732,1l1.027-1.779c1.115,0.516,2.327,0.854,3.606,0.97V28h2v-2.051  c1.279-0.115,2.491-0.454,3.606-0.97l1.027,1.779l1.732-1L21.34,23.98c1.023-0.725,1.916-1.617,2.641-2.641l1.777,1.026l1-1.732  l-1.779-1.027c0.516-1.115,0.855-2.327,0.971-3.606H28z" fill="#FFFFFF"/>
 <radialGradient cx="-453.8818" cy="-296.3535" gradientTransform="matrix(0.3502 0 0 0.3502 173.9495 115.3211)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="37.62">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1_)" r="10"/>
 <path d="M24.643,14.452c-0.221-3.906-2.75-7.27-6.445-8.568l-0.451,0.072l-2.612-0.501l-3.258,1.942l-0.123,0.82  h-1.89l0.747,1.27l-2.023,1.65l-0.472,2.039l1.672,2.961l1.706-0.349l0.623,0.535l0.486,0.048l0.321,1.259l-0.424,1.101l1.55,3.96  h1.579l1.566-1.263v-0.516l0.412-0.643l0.342-0.174c-0.087,0.133-0.223,0.436-0.223,0.436c-0.014,0.104,0.223,2.119,0.917,1.963  c0.527-0.12,2.411-3.621,2.448-3.954c0.07-0.656-0.287-0.929-0.508-1.032l-0.244-0.115l-1.125,1.127  c-0.121,0.01-0.229,0.029-0.328,0.059v-0.937l1.222-1.192l0.622-2.002l0.947-0.771l-0.209-0.378l0.715-0.687l-0.398-0.729  l0.305,0.036l1.778,3.983l0.364-0.292c-0.011-0.195-0.032-0.386-0.055-0.577L24.643,14.452z M15.12,9.973l-0.148-0.397h0.893  l0.435,0.977h-0.647V9.973H15.12z M18.067,11.941l0.713,1.042l0.049,0.124l-0.731-0.442l-0.176-0.629L18.067,11.941z M19.139,13.76  l0.216,0.216l-0.278,0.063l-0.063-0.078L19.139,13.76z M13.559,6.759l0.454,0.702l-0.515,0.158l-0.202-0.114L13.559,6.759z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M15,5C9.478,5,5,9.478,5,15c0,5.523,4.478,10,10,10c5.525,0,10-4.477,10-10  C25,9.478,20.525,5,15,5z M15,24.231c-5.09,0-9.231-4.141-9.231-9.231S9.91,5.769,15,5.769c5.09,0,9.23,4.141,9.23,9.231  S20.09,24.231,15,24.231z" fill="url(#SVGID_2_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="15.5771" cy="7.6904" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="11.8606">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M20.418,17.856L19.377,18.9c0,0-0.629,0-0.658,0.248c-0.014,0.107-0.049,0.573-0.154,0.813  c-0.209,0.145-0.459,0.625-0.459,0.625s-0.129,0.928,0.564,0.77C19.361,21.199,21.486,18.359,20.418,17.856z" fill="url(#SVGID_3_)"/>
 <radialGradient cx="15.5776" cy="7.6934" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="13.7178">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M18.068,6.245c-0.17,0.065-0.287,0.108-0.287,0.108l-2.572-0.49l-1.262,0.789l0.664,1.027  l-1.16,0.355L12.827,7.68l0.22-0.624l-0.815,0.565l-0.147,0.98h-1.549l0.574,0.975l-2.178,1.776l-0.41,1.772l0.808,1.566L9.814,15  l1.707-0.348l0.622,0.535l0.566,0.055l0.616,2.41l-0.41,1.066l0.905,2.004l0.256,0.832h1.58l0.893-0.484l0.672-0.781v-0.945  l1.279-0.652V17.29l0.506-0.962l1.129-1.016l0.27-1.177l-1.477,0.329l-0.387-0.475l0.275-0.44l-1.049-0.635l-0.445-1.606  l0.773-0.504l0.713,1.039l0.268,0.688l0.535,0.535l0.625,0.327l0.695-0.112l0.771-0.742l-0.543-0.991l-0.684,0.179l-0.617-0.735  l0.588-0.41l1.844,0.224v0.655l1.604,3.306l0.365-0.291C24.043,10.66,21.523,7.461,18.068,6.245z M17.232,10.715l-0.844,0.223  h-1.121v-0.581h-1.071l-0.849,0.225l-1.294-0.358l-0.356-0.668l1.785-0.402h1.786L15,8.438h0.893l0.496,1.117l0.844,0.294V10.715z   M19.152,9.242l-1.518-0.27V8.438l0.758-0.18l0.223-0.266l0.537,0.445V9.242z" fill="url(#SVGID_4_)"/>
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="5.0479" y2="25.1011">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_itut.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_itut.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_itut.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -15,81 +15,81 @@
 </linearGradient>
 <path d="M3.5,23.5c-0.551,0-1-0.449-1-1v-15c0-0.551,0.449-1,1-1h23c0.549,0,1,0.449,1,1v15  c0,0.551-0.451,1-1,1H3.5z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="12.2773" x2="12.2773" y1="7.5" y2="22.3881">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="3" width="4.5" x="10.027" y="7.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="12.3594" x2="12.3594" y1="7.501" y2="22.3891">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="3" width="4.5" x="10.109" y="11.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="12.3594" x2="12.3594" y1="7.4976" y2="22.3906">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="3" width="4.5" x="10.109" y="15.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="12.3594" x2="12.3594" y1="7.5005" y2="22.3886">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="3" width="4.5" x="10.109" y="19.5"/>
 <rect fill="url(#SVGID_7_)" height="3" width="4.5" x="4.707" y="7.5"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-195.563" x2="-195.563" y1="401.4795" y2="386.5914">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="3" width="4.5" x="4.707" y="11.5"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-195.563" x2="-195.563" y1="401.4814" y2="386.5909">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="3" width="4.5" x="4.707" y="15.5"/>
 <rect fill="url(#SVGID_7_)" height="3" width="4.5" x="4.707" y="19.5"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-184.7993" x2="-184.7993" y1="401.4805" y2="386.5924">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_11_)" height="3" width="4.5" x="15.471" y="7.5"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="-184.8813" x2="-184.8813" y1="401.4795" y2="386.5914">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_12_)" height="3" width="4.5" x="15.389" y="11.5"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-184.8813" x2="-184.8813" y1="401.4814" y2="386.5909">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_13_)" height="3" width="4.5" x="15.389" y="15.5"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-184.8813" x2="-184.8813" y1="401.4805" y2="386.5924">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_14_)" height="3" width="4.5" x="15.389" y="19.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="23.0352" x2="23.0908" y1="7.5483" y2="22.5211">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_15_)" fill-opacity="0.5" height="3" stroke-opacity="0.5" width="4.5" x="20.791" y="7.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="23.0205" x2="23.0761" y1="7.5513" y2="22.524">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_16_)" fill-opacity="0.5" height="3" stroke-opacity="0.5" width="4.5" x="20.791" y="11.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="23.0059" x2="23.0615" y1="7.5532" y2="22.5259">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_17_)" fill-opacity="0.5" height="3" stroke-opacity="0.5" width="4.5" x="20.791" y="15.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="22.9912" x2="23.0468" y1="7.5562" y2="22.5289">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_18_)" fill-opacity="0.5" height="3" stroke-opacity="0.5" width="4.5" x="20.791" y="19.5"/>
 <defs>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-195.563" x2="-195.563" y1="401.4805" y2="386.5924">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_java.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_java.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_java.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,22 +3,22 @@
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <rect fill="none" height="30" width="30"/>
-<path d="M15.781,24v-3.441l0.494-0.29C17.316,19.659,18,19.209,18,18.548C18,17.137,16.358,16,15,16  c-1.359,0-3,1.137-3,2.548c0,0.666,0.684,1.114,1.728,1.722l0.497,0.289V24H11c-1.654,0-3-1.346-3-3H7.937  c-0.597,0.972-1.407,2-2.832,2C2.686,23,1,20.629,1,18.5S2.686,14,5.104,14c1.438,0,2.249,1.052,2.83,2H8v-4c0-1.654,1.346-3,3-3h1  V8.937c-0.971-0.597-2-1.406-2-2.832C10,3.686,12.371,2,14.5,2S19,3.686,19,6.104c0,1.438-1.051,2.249-2,2.83V9h7  c1.654,0,3,1.346,3,3v9c0,1.654-1.346,3-3,3H15.781z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="13.9995" x2="13.9995" y1="2.8911" y2="23.5236">
+<path d="M15.781,24v-3.441l0.494-0.289C17.316,19.659,18,19.209,18,18.548  C18,17.137,16.357,16,15,16c-1.359,0-3,1.137-3,2.548c0,0.666,0.684,1.114,1.728,1.722l0.497,0.289V24H11c-1.654,0-3-1.346-3-3  H7.937c-0.597,0.973-1.407,2-2.832,2C2.686,23,1,20.629,1,18.5S2.686,14,5.104,14c1.438,0,2.249,1.052,2.83,2H8v-4  c0-1.654,1.346-3,3-3h1V8.937c-0.971-0.597-2-1.406-2-2.832C10,3.686,12.371,2,14.5,2S19,3.686,19,6.104c0,1.438-1.051,2.249-2,2.83  V9h7c1.654,0,3,1.346,3,3v9c0,1.654-1.346,3-3,3H15.781z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="592.9609" x2="592.9609" y1="814.9307" y2="835.5632">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="1" style="stop-color:#A5A5A5"/>
 </linearGradient>
-<path d="M24,10h-8V8.365c0.943-0.553,2-1.146,2-2.261C18,4.392,16.217,3,14.5,3C12.782,3,11,4.392,11,6.104  c0,1.115,1.053,1.711,2,2.263V10h-2c-1.1,0-2,0.9-2,2v5H7.365c-0.553-0.943-1.146-2-2.261-2C3.392,15,2,16.783,2,18.5  C2,20.218,3.392,22,5.104,22c1.115,0,1.711-1.053,2.263-2H9v1c0,1.1,0.9,2,2,2h2.225v-1.866C12.141,20.503,11,19.822,11,18.548  C11,16.591,13.037,15,15,15c1.961,0,4,1.591,4,3.548c0,1.273-1.141,1.952-2.219,2.584V23H24c1.1,0,2-0.9,2-2v-9  C26,10.9,25.1,10,24,10z" fill="url(#SVGID_1_)"/>
-<path d="M16.781,21.132v1C17.859,21.5,19,20.821,19,19.548c0-0.175-0.034-0.342-0.065-0.51  C18.684,20.005,17.711,20.587,16.781,21.132z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M24,10h-8V8.365c0.943-0.553,2-1.146,2-2.261C18,4.392,16.217,3,14.5,3C12.782,3,11,4.392,11,6.104  c0,1.115,1.053,1.711,2,2.263V10h-2c-1.1,0-2,0.9-2,2v5H7.365c-0.553-0.943-1.146-2-2.261-2C3.392,15,2,16.783,2,18.5  C2,20.218,3.392,22,5.104,22c1.115,0,1.711-1.053,2.263-2H9v1c0,1.1,0.9,2,2,2h2.225v-1.866C12.141,20.503,11,19.822,11,18.548  C11,16.591,13.037,15,15,15c1.961,0,4,1.591,4,3.548c0,1.272-1.141,1.952-2.219,2.584V23H24c1.1,0,2-0.9,2-2v-9  C26,10.9,25.1,10,24,10z" fill="url(#SVGID_1_)"/>
+<path d="M16.781,21.132v1C17.859,21.5,19,20.82,19,19.548  c0-0.175-0.034-0.342-0.064-0.51C18.684,20.005,17.711,20.587,16.781,21.132z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M11,11h2v-1h-2c-1.1,0-2,0.9-2,2v1C9,11.9,9.9,11,11,11z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M14.5,4c1.529,0,3.104,1.106,3.43,2.559C17.972,6.416,18,6.268,18,6.104  C18,4.392,16.217,3,14.5,3C12.782,3,11,4.392,11,6.104c0,0.163,0.028,0.313,0.07,0.455C11.396,5.107,12.969,4,14.5,4z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M14.5,4c1.529,0,3.104,1.106,3.43,2.559  C17.973,6.416,18,6.268,18,6.104C18,4.392,16.217,3,14.5,3C12.782,3,11,4.392,11,6.104c0,0.163,0.028,0.313,0.07,0.455  C11.396,5.107,12.969,4,14.5,4z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M24,10h-8v1h8c1.1,0,2,0.9,2,2v-1C26,10.9,25.1,10,24,10z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M5.104,16c1.114,0,1.708,1.057,2.261,2H9v-1H7.365c-0.553-0.943-1.146-2-2.261-2  C3.392,15,2,16.783,2,18.5c0,0.167,0.023,0.334,0.049,0.5C2.284,17.454,3.559,16,5.104,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M11.065,19.038C11.034,19.206,11,19.373,11,19.548c0,1.274,1.141,1.955,2.225,2.586v-1  C12.289,20.59,11.316,20.006,11.065,19.038z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M5.104,16c1.114,0,1.708,1.057,2.261,2H9v-1H7.365  c-0.553-0.943-1.146-2-2.261-2C3.392,15,2,16.783,2,18.5c0,0.167,0.023,0.334,0.049,0.5C2.284,17.454,3.559,16,5.104,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M11.065,19.038C11.034,19.206,11,19.373,11,19.548  c0,1.274,1.141,1.955,2.225,2.586v-1C12.289,20.59,11.316,20.006,11.065,19.038z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill-opacity="0.6" height="12" stroke-opacity="0.6" width="12" x="17" y="16"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="23" x2="23" y1="17" y2="27">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="601.9609" x2="601.9609" y1="829.0391" y2="839.0391">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="10" width="10" x="18" y="17"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="10" x="18" y="17"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_keyboard.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_keyboard.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_keyboard.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -15,89 +15,89 @@
 <path d="M3.5,23c-0.55,0-1-0.449-1-1V7c0-0.55,0.45-1,1-1h23c0.55,0,1,0.45,1,1v15c0,0.551-0.45,1-1,1H3.5z" fill="url(#SVGID_2_)"/>
 <rect fill="url(#SVGID_3_)" height="3" width="3" x="3.5" y="7"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-193.52" x2="-193.52" y1="401.9805" y2="387.0429">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="3" width="3" x="7.5" y="7"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-189.52" x2="-189.52" y1="401.9805" y2="387.0429">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="3" width="3" x="11.5" y="7"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-185.52" x2="-185.52" y1="401.9805" y2="387.0429">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="3" width="3" x="15.5" y="7"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-181.52" x2="-181.52" y1="401.9805" y2="387.0429">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="3" width="3" x="19.5" y="7"/>
 <rect fill="url(#SVGID_8_)" height="3" width="3" x="23.5" y="7"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-197.52" x2="-197.52" y1="401.9795" y2="387.0419">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="3" width="3" x="3.5" y="11"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-193.52" x2="-193.52" y1="401.9795" y2="387.0419">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="3" width="3" x="7.5" y="11"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-189.52" x2="-189.52" y1="401.9795" y2="387.0419">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_11_)" height="3" width="3" x="11.5" y="11"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="-185.52" x2="-185.52" y1="401.9795" y2="387.0419">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_12_)" height="3" width="3" x="15.5" y="11"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-181.52" x2="-181.52" y1="401.9795" y2="387.0419">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_13_)" height="3" width="3" x="19.5" y="11"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-195.52" x2="-195.52" y1="401.9814" y2="387.0414">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_14_)" height="3" width="7" x="3.5" y="15"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="-189.52" x2="-189.52" y1="401.9814" y2="387.0414">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_15_)" height="3" width="3" x="11.5" y="15"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="-185.52" x2="-185.52" y1="401.9814" y2="387.0414">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_16_)" height="3" width="3" x="15.5" y="15"/>
 <rect fill="url(#SVGID_3_)" height="3" width="3" x="3.5" y="19"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="-187.52" x2="-187.52" y1="401.9805" y2="387.0429">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_18_)" fill-opacity="0.5" height="3" stroke-opacity="0.5" width="15" x="7.5" y="19"/>
 <rect fill="url(#SVGID_8_)" height="3" width="3" x="23.5" y="19"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="-179.52" x2="-179.52" y1="401.9805" y2="387.0418">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <polygon fill="url(#SVGID_20_)" points="23.5,11 23.5,15 19.5,15 19.5,18 23.5,18 26.5,18 26.5,15 26.5,11 "/>
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-197.52" x2="-197.52" y1="401.9805" y2="387.0429">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 </defs>
 <defs>
 <linearGradient gradientTransform="matrix(1 0 0 -1 202.52 408.9805)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-177.52" x2="-177.52" y1="401.9805" y2="387.0429">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -12,61 +12,61 @@
 <path d="M25,8H5c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2v-1C27,8.9,26.1,8,25,8z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M8,24c2.206,0,4-1.794,4-4V8H4v12C4,22.206,5.794,24,8,24z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8" x2="8" y1="5.1729" y2="23.0078">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#A2A6A5"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <path d="M11,20c0,1.65-1.35,3-3,3l0,0c-1.65,0-3-1.35-3-3V8c0-1.65,1.35-3,3-3l0,0c1.65,0,3,1.35,3,3V20z" fill="url(#SVGID_2_)"/>
 <path d="M8,5C6.35,5,5,6.35,5,8v1c0-1.65,1.35-3,3-3s3,1.35,3,3V8C11,6.35,9.65,5,8,5z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M10,11v11.217c0.609-0.55,1-1.337,1-2.217V9L10,11z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M6,22.217V11L5,9v11C5,20.88,5.391,21.667,6,22.217z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.4995" x2="14.4995" y1="14" y2="23.9798">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="2" width="3" x="13" y="14"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="18.5" x2="18.5" y1="14" y2="23.9798">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="2" width="3" x="17" y="14"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="22.5" x2="22.5" y1="14" y2="23.9798">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="2" width="3" x="21" y="14"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.4995" x2="14.4995" y1="13.0005" y2="22.9802">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="2" width="3" x="13" y="17"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="18.5" x2="18.5" y1="13.0005" y2="22.9802">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="2" width="3" x="17" y="17"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="22.5" x2="22.5" y1="13.0005" y2="22.9802">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="2" width="3" x="21" y="17"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.4995" x2="14.4995" y1="12.0005" y2="21.9802">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="2" width="3" x="13" y="20"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="18.5" x2="18.5" y1="12.0005" y2="21.9802">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="2" width="3" x="17" y="20"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="22.5" x2="22.5" y1="12.0005" y2="21.9802">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_11_)" height="2" width="3" x="21" y="20"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="18.5" x2="18.5" y1="10.1875" y2="13.0632">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#67A7B1"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <rect fill="url(#SVGID_12_)" height="3" width="11" x="13" y="10"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_home.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -13,67 +13,67 @@
 <path d="M25,8.002H5c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h20   c1.1,0,2,0.9,2,2v-1C27,8.902,26.1,8.002,25,8.002z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M8,24.002c2.205,0,4-1.794,4-4v-12H4v12C4,22.208,5.795,24.002,8,24.002z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="290.4795" x2="290.4795" y1="-380.1953" y2="-398.0303">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#A2A6A5"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <path d="M11,20.002c0,1.65-1.35,3-3,3l0,0c-1.65,0-3-1.35-3-3v-12c0-1.65,1.35-3,3-3l0,0c1.65,0,3,1.35,3,3   V20.002z" fill="url(#SVGID_2_)"/>
 <path d="M8,5.002c-1.65,0-3,1.35-3,3v1c0-1.65,1.35-3,3-3s3,1.35,3,3v-1   C11,6.352,9.65,5.002,8,5.002z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M10,11.002v11.217c0.609-0.55,1-1.337,1-2.217v-11L10,11.002z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M6,22.219V11.002l-1-2v11C5,20.882,5.391,21.669,6,22.219z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="296.9795" x2="296.9795" y1="-389.0215" y2="-399.0012">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="2" width="3" x="13" y="14.002"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="300.9795" x2="300.9795" y1="-389.0215" y2="-399.0012">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="2" width="3" x="17" y="14.002"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="304.9795" x2="304.9795" y1="-389.0215" y2="-399.0012">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="2" width="3" x="21" y="14.002"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="296.9795" x2="296.9795" y1="-388.0215" y2="-398.0013">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="2" width="3" x="13" y="17.002"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="300.9795" x2="300.9795" y1="-388.0215" y2="-398.0013">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="2" width="3" x="17" y="17.002"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="304.9795" x2="304.9795" y1="-388.0215" y2="-398.0013">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="2" width="3" x="21" y="17.002"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="296.9795" x2="296.9795" y1="-387.0215" y2="-397.0013">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="2" width="3" x="13" y="20.002"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="300.9795" x2="300.9795" y1="-387.0215" y2="-397.0013">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="2" width="3" x="17" y="20.002"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="304.9795" x2="304.9795" y1="-387.0215" y2="-397.0013">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_11_)" height="2" width="3" x="21" y="20.002"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="300.9795" x2="300.9795" y1="-385.21" y2="-388.0856">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#67A7B1"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <rect fill="url(#SVGID_12_)" height="3" width="11" x="13" y="10.002"/>
 <path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="304.4795" x2="304.4795" y1="-389.9883" y2="-404.1846">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="1" style="stop-color:#EF6902"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="1" style="stop-color:#A86F49"/>
 </linearGradient>
 <circle cx="22" cy="22" fill="url(#SVGID_13_)" r="7"/>
 <polygon fill-opacity="0.2" points="26.34,24 21.999,19.4 17.66,24 17,23.3 21.999,18 27,23.3  " stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_work.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_work.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_work.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -13,67 +13,67 @@
 <path d="M25,8.001H5c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h20   c1.1,0,2,0.9,2,2v-1C27,8.901,26.1,8.001,25,8.001z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M8,24.001c2.205,0,4-1.794,4-4v-12H4v12C4,22.207,5.795,24.001,8,24.001z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="290.4795" x2="290.4795" y1="-380.1943" y2="-398.0293">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#A2A6A5"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <path d="M11,20.001c0,1.649-1.35,3-3,3l0,0c-1.65,0-3-1.351-3-3v-12c0-1.65,1.35-3,3-3l0,0   c1.65,0,3,1.35,3,3V20.001z" fill="url(#SVGID_2_)"/>
 <path d="M8,5.001c-1.65,0-3,1.35-3,3v1c0-1.65,1.35-3,3-3s3,1.35,3,3v-1   C11,6.351,9.65,5.001,8,5.001z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M10,11.001v11.217c0.609-0.55,1-1.337,1-2.217v-11L10,11.001z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M6,22.218V11.001l-1-2v11C5,20.881,5.391,21.668,6,22.218z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="296.9795" x2="296.9795" y1="-389.0205" y2="-399.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="2" width="3" x="13" y="14.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="300.9795" x2="300.9795" y1="-389.0205" y2="-399.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="2" width="3" x="17" y="14.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="304.9795" x2="304.9795" y1="-389.0205" y2="-399.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="2" width="3" x="21" y="14.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="296.9795" x2="296.9795" y1="-388.0205" y2="-398.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="2" width="3" x="13" y="17.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="300.9795" x2="300.9795" y1="-388.0205" y2="-398.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="2" width="3" x="17" y="17.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="304.9795" x2="304.9795" y1="-388.0205" y2="-398.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_8_)" height="2" width="3" x="21" y="17.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="296.9795" x2="296.9795" y1="-387.0205" y2="-397.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_9_)" height="2" width="3" x="13" y="20.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="300.9795" x2="300.9795" y1="-387.0205" y2="-397.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_10_)" height="2" width="3" x="17" y="20.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="304.9795" x2="304.9795" y1="-387.0205" y2="-397.0002">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#6B6C6D"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <rect fill="url(#SVGID_11_)" height="2" width="3" x="21" y="20.001"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="300.9795" x2="300.9795" y1="-385.209" y2="-388.0847">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#67A7B1"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <rect fill="url(#SVGID_12_)" height="3" width="11" x="13" y="10.001"/>
 <path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="304.4795" x2="304.4795" y1="-390.0195" y2="-404.0195">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#A2A6A5"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <circle cx="22" cy="22" fill="url(#SVGID_13_)" r="7"/>
 <path d="M22,16c3.697,0,6.717,2.869,6.975,6.5   C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C15.283,18.869,18.303,16,22,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_link.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_link.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_link.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,22 +3,22 @@
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <rect fill="none" height="30" width="30"/>
-<path d="M15,29C7.279,29,1,22.719,1,15C1,7.279,7.279,1,15,1c7.719,0,14,6.279,14,14C29,22.719,22.719,29,15,29L15,29  z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M15,29C7.279,29,1,22.719,1,15C1,7.279,7.279,1,15,1c7.719,0,14,6.279,14,14  C29,22.719,22.719,29,15,29L15,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13  S2,7.82,2,15c0,0.169,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M13,16c0,0.553-0.447,1-1,1H6c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h6C12.553,15,13,15.447,13,16  L13,16z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M27,16c0,0.553-0.447,1-1,1h-6c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h6C26.553,15,27,15.447,27,16  L27,16z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M13,13h6c0.737,0,1.375,0.405,1.722,1h2.136c-0.447-1.721-1.999-3-3.857-3h-6c-1.858,0-3.41,1.279-3.857,3  h2.136C11.625,13.405,12.263,13,13,13z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M20.722,18c-0.347,0.595-0.984,1-1.722,1h-6c-0.737,0-1.375-0.405-1.722-1H9.143c0.447,1.721,1.999,3,3.857,3  h6c1.858,0,3.41-1.279,3.857-3H20.722z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5  C27.98,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13C7.82,2,2,7.82,2,15c0,0.169,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M13,16c0,0.553-0.447,1-1,1H6c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h6  C12.553,15,13,15.447,13,16L13,16z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M27,16c0,0.553-0.447,1-1,1h-6c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h6  C26.553,15,27,15.447,27,16L27,16z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M13,13h6c0.736,0,1.375,0.405,1.723,1h2.135c-0.445-1.721-1.998-3-3.855-3h-6  c-1.858,0-3.41,1.279-3.857,3h2.136C11.625,13.405,12.263,13,13,13z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M20.723,18c-0.348,0.596-0.984,1-1.723,1h-6c-0.737,0-1.375-0.404-1.722-1H9.143  c0.447,1.721,1.999,3,3.857,3h6c1.857,0,3.41-1.279,3.857-3H20.723z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <path d="M12,15c0,0.553-0.447,1-1,1H5c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h6C11.553,14,12,14.447,12,15  L12,15z" fill="#FFFFFF"/>
 <path d="M26,15c0,0.553-0.447,1-1,1h-6c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h6C25.553,14,26,14.447,26,15  L26,15z" fill="#FFFFFF"/>
-<path d="M12,12h6c0.737,0,1.375,0.405,1.722,1h2.136c-0.447-1.721-1.999-3-3.857-3h-6c-1.858,0-3.41,1.279-3.857,3  h2.136C10.625,12.405,11.263,12,12,12z" fill="#FFFFFF"/>
-<path d="M19.722,17c-0.347,0.595-0.984,1-1.722,1h-6c-0.737,0-1.375-0.405-1.722-1H8.143  c0.447,1.721,1.999,3,3.857,3h6c1.858,0,3.41-1.279,3.857-3H19.722z" fill="#FFFFFF"/>
+<path d="M12,12h6c0.736,0,1.375,0.405,1.723,1h2.135c-0.445-1.721-1.998-3-3.855-3h-6c-1.858,0-3.41,1.279-3.857,3  h2.136C10.625,12.405,11.263,12,12,12z" fill="#FFFFFF"/>
+<path d="M19.723,17c-0.348,0.596-0.984,1-1.723,1h-6c-0.737,0-1.375-0.404-1.722-1H8.143  c0.447,1.721,1.999,3,3.857,3h6c1.857,0,3.41-1.279,3.857-3H19.723z" fill="#FFFFFF"/>
 <rect fill="none" height="30" width="30"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.2749" y2="32.0078">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="593.9609" x2="593.9609" y1="814.3145" y2="844.0474">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_location.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_location.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_location.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -10,9 +10,9 @@
 <path d="M18.615,27.279c0,0.69-1.455,1.251-3.246,1.251c-1.79,0-3.244-0.561-3.244-1.251  c0-0.694,1.454-1.253,3.244-1.253C17.16,26.026,18.615,26.586,18.615,27.279z" fill="#333333" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M24.592,1.348c-1.578,1.113-4.293,2.684-5.461,2.684c-0.002,0-0.002,0-0.004,0  c-0.266-0.032-0.66-0.29-1.078-0.564c-0.836-0.547-1.984-1.297-3.656-1.309c-1.232,0-3.102,1.206-4.354,2.131L9.262,2.275L3.5,4.49  l1.32,3.416l0.777-0.299l6.963,18.037L15.896,28l0.865-3.971l-1.742-4.511l0.313-0.802c0.641-1.651,2.09-4.584,3.254-5.409  c0.305-0.216,1.156-0.646,1.84-0.988c0.693-0.351,1.293-0.65,1.646-0.876c2.91-1.866,3.971-8.396,4.08-9.135L26.5,0L24.592,1.348z" fill-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(0.9331 -0.3596 -0.3596 -0.9331 -71.0508 -951.4899)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-269.8569" x2="-272.3403" y1="-932.4741" y2="-932.4741">
-<stop offset="0" style="stop-color:#8C8E8F"/>
+<stop offset="0" style="stop-color:#8D8E8E"/>
 <stop offset="0.65" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#AEB2B3"/>
+<stop offset="1" style="stop-color:#B0B2B1"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="6.169,6.32 8.51,5.417 15.725,24.106 15.24,26.318 13.383,25.006 "/>
 <linearGradient gradientTransform="matrix(0.9331 -0.3596 -0.3596 -0.9331 -71.0508 -951.4899)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-269.0659" x2="-273.1762" y1="-920.6802" y2="-920.6802">
@@ -22,7 +22,7 @@
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="4.79,5.063 8.689,3.563 9.291,5.121 5.393,6.619 "/>
 <rect fill-opacity="0.2" height="0.834" stroke-opacity="0.2" transform="matrix(-0.933 0.3598 -0.3598 -0.933 16.7306 9.4024)" width="2.508" x="6.236" y="5.841"/>
-<path d="M9.59,5.896c0,0,3.352-2.754,4.811-2.742c2.279,0.017,3.373,1.721,4.609,1.864  c1.805,0.214,6.158-2.858,6.158-2.858s-1.021,6.767-3.635,8.445c-0.688,0.437-2.859,1.419-3.523,1.891  c-1.844,1.307-3.609,5.862-3.609,5.862L9.59,5.896z" fill="#33A02C"/>
+<path d="M9.59,5.896c0,0,3.352-2.754,4.811-2.742c2.279,0.017,3.373,1.721,4.609,1.864  c1.805,0.214,6.158-2.858,6.158-2.858s-1.021,6.767-3.635,8.445c-0.688,0.437-2.859,1.419-3.523,1.891  c-1.844,1.307-3.609,5.862-3.609,5.862L9.59,5.896z" fill="#4F7D5A"/>
 <path d="M14.746,4.046c2.279,0.021,3.373,1.723,4.607,1.868  c1.396,0.162,4.318-1.639,5.566-2.461c0.164-0.773,0.244-1.293,0.244-1.293s-4.354,3.072-6.158,2.858  c-1.234-0.144-2.328-1.849-4.607-1.864C12.939,3.143,9.59,5.896,9.59,5.896l0.346,0.896C9.936,6.792,13.285,4.038,14.746,4.046z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_lock.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_lock.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_lock.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -28,13 +28,13 @@
 </linearGradient>
 <path d="M10,16v-6c0-2.757,2.243-5,5-5c2.757,0,5,2.243,5,5v6h2v-6c0-3.859-3.141-7-7-7c-3.859,0-7,3.141-7,7  v6H10z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="3.0005" x2="27" y1="21" y2="21">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.24" style="stop-color:#FFE692"/>
-<stop offset="0.75" style="stop-color:#ED8C0D"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+<stop offset="0" style="stop-color:#C2A770"/>
+<stop offset="0.24" style="stop-color:#DED7B3"/>
+<stop offset="0.75" style="stop-color:#AA8250"/>
+<stop offset="1" style="stop-color:#BCA162"/>
 </linearGradient>
 <path d="M27,26c0,1.1-0.9,2-2,2H5c-1.1,0-2-0.9-2-2V16c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V26z" fill="url(#SVGID_4_)"/>
-<path d="M25,27H5c-1.1,0-2-0.9-2-2v1c0,1.1,0.9,2,2,2h20c1.1,0,2-0.9,2-2v-1C27,26.1,26.1,27,25,27z" fill="#873900" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M25,27H5c-1.1,0-2-0.9-2-2v1c0,1.1,0.9,2,2,2h20c1.1,0,2-0.9,2-2v-1C27,26.1,26.1,27,25,27z" fill="#5E2D29" fill-opacity="0.2" stroke-opacity="0.2"/>
 <path d="M25,14H5c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2v-1C27,14.9,26.1,14,25,14z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill-opacity="0.2" height="2" stroke-opacity="0.2" width="24" x="3" y="23"/>
 <rect fill-opacity="0.2" height="2" stroke-opacity="0.2" width="24" x="3" y="19"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_meeting.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_meeting.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_meeting.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,27 +5,27 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M27.771,5.936L21.92,6.904l0.234,1.459c-0.145-0.002-0.285-0.004-0.4-0.004C19.391,6.07,17.258,5,15.063,5  c-1.342,0-2.463,0.404-3.451,0.76l-0.273,0.102c-0.482,0.221-1.266,1.016-2.053,1.916c-0.309,0.018-0.621,0.023-0.914,0.07  l-0.453,0.07L8.08,6.904L2.229,5.936L0,19.752l5.852,0.969l0.041-0.254c0.158,0.254,0.363,0.477,0.613,0.641  c0.34,0.23,2.76,1.828,4.266,2.824l1.139,0.752C12.211,24.885,12.633,25,13.066,25c0.344,0,0.676-0.07,0.971-0.203  c0.117-0.051,0.613-0.332,1.18-0.684c0.383,0.053,0.768,0.09,1.158,0.09h0.018l2.125-0.078c1.697-0.061,3.5-1.969,4.752-3.627  c0.016,0,0.027,0.006,0.043,0.006l0,0c0.359,0,0.648-0.066,0.703-0.08l0.082-0.02l0.051,0.316L30,19.752L27.771,5.936z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.6558" x2="22.9905" y1="15.9707" y2="15.9707">
-<stop offset="0" style="stop-color:#FFCA26"/>
-<stop offset="1" style="stop-color:#FEAB0E"/>
+<stop offset="0" style="stop-color:#BEAA67"/>
+<stop offset="1" style="stop-color:#B69656"/>
 </linearGradient>
 <path d="M8.514,8.838C7.975,8.916,7.43,9.006,7.096,9.053L6.391,9.025l-1.074,7.865l0.521,0.492  c1.512,1.336,5.945,5.82,10.537,5.82l2.107-0.076l0,0c1.711-0.063,3.928-3.133,4.145-3.422C24.459,17.523,16.092,7.641,8.514,8.838z  " fill="url(#SVGID_1_)"/>
 <path d="M10.77,14.654c-0.434-0.279-0.932-0.428-1.441-0.428c-0.215,0-0.432,0.025-0.648,0.076  c-0.98,0.232-1.709,0.977-2.293,1.574L6.178,16.09c-0.285,0.285-0.459,0.662-0.559,1.086l0.219,0.207  c1.512,1.336,5.945,5.82,10.537,5.82l0.201-0.008c0.195-0.148,0.375-0.291,0.496-0.412c0.67-0.676,0.934-1.541,0.75-2.449  C17.775,19.791,17.33,18.445,10.77,14.654z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -6 35)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="17.6895" x2="17.6895" y1="20.0127" y2="-2.761">
-<stop offset="0" style="stop-color:#FFF2A9"/>
-<stop offset="0.1337" style="stop-color:#FFE89A"/>
-<stop offset="0.3918" style="stop-color:#FFCF72"/>
-<stop offset="0.7449" style="stop-color:#FFA732"/>
-<stop offset="1" style="stop-color:#FF8800"/>
+<stop offset="0" style="stop-color:#E5E2C3"/>
+<stop offset="0.1337" style="stop-color:#E1DAB8"/>
+<stop offset="0.3918" style="stop-color:#D5C69C"/>
+<stop offset="0.7449" style="stop-color:#C2A270"/>
+<stop offset="1" style="stop-color:#B3834D"/>
 </linearGradient>
 <path d="M10.238,15.496c-0.398-0.256-0.859-0.33-1.332-0.219c-0.801,0.189-1.455,0.945-2.029,1.52  c-0.576,0.58-0.346,2.322-0.322,2.627c0.025,0.348,0.213,0.662,0.502,0.852c0.465,0.314,4.816,3.188,5.398,3.574  c0.188,0.125,0.693,0.252,1.197,0.025c0.18-0.076,2.178-1.258,2.721-1.801c0.471-0.475,0.602-1.021,0.465-1.602  C16.791,19.287,10.238,15.496,10.238,15.496z" fill="url(#SVGID_2_)"/>
 <path d="M6.877,17.797c0.574-0.574,1.229-1.33,2.029-1.52c0.473-0.111,0.934-0.037,1.332,0.219  c0,0,6.221,3.602,6.568,4.879c0.094-0.287,0.105-0.59,0.031-0.902c-0.047-1.186-6.6-4.977-6.6-4.977  c-0.398-0.256-0.859-0.33-1.332-0.219c-0.801,0.189-1.455,0.945-2.029,1.52c-0.418,0.42-0.41,1.445-0.367,2.098  C6.547,18.453,6.645,18.031,6.877,17.797z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M8.514,8.838C8.467,8.844,8.42,8.852,8.373,8.857C8.061,9.242,7.766,9.615,7.514,9.939  c-0.711,1.094-0.439,1.959-0.217,2.379c0.432,0.807,1.412,1.309,2.557,1.309c0.73,0,1.459-0.197,2.104-0.574  c1.033-0.6,1.846-1.178,2.461-1.754c1.135,0.576,3.246,1.908,4.084,2.779c1.008,1.049,2.641,4.008,2.949,5.154  c0.121,0.443,0.4,0.773,0.779,0.99c0.207-0.26,0.35-0.455,0.396-0.518C24.459,17.523,16.092,7.641,8.514,8.838z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -6 35)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="22.4619" x2="22.4619" y1="29.3672" y2="-5.6876">
-<stop offset="0" style="stop-color:#FFF2A9"/>
-<stop offset="0.1337" style="stop-color:#FFE89A"/>
-<stop offset="0.3918" style="stop-color:#FFCF72"/>
-<stop offset="0.7449" style="stop-color:#FFA732"/>
-<stop offset="1" style="stop-color:#FF8800"/>
+<stop offset="0" style="stop-color:#E5E2C3"/>
+<stop offset="0.1337" style="stop-color:#E1DAB8"/>
+<stop offset="0.3918" style="stop-color:#D5C69C"/>
+<stop offset="0.7449" style="stop-color:#C2A270"/>
+<stop offset="1" style="stop-color:#B3834D"/>
 </linearGradient>
 <path d="M23.408,9.369c-0.021,0-1.93-0.008-2.07-0.023c-4.553-4.561-7.27-3.404-9.592-2.574  c-0.789,0.361-3.404,3.717-3.404,3.717c-1.143,1.76,1.277,2.773,3.121,1.699c1.561-0.908,2.311-1.6,2.725-2.08  c0.953,0.326,3.936,2.141,5.025,3.275c1.09,1.133,2.83,4.232,3.191,5.582c0.213,0.773,1.377,0.488,1.377,0.488l1.096-0.486  L23.408,9.369z" fill="url(#SVGID_3_)"/>
 <path d="M8.342,11.488c0,0,2.615-3.355,3.404-3.717c2.322-0.83,5.039-1.986,9.592,2.574  c0.141,0.016,2.049,0.023,2.07,0.023l1.326,8.662l0.143-0.064l-1.469-9.598c-0.021,0-1.93-0.008-2.07-0.023  c-4.553-4.561-7.27-3.404-9.592-2.574c-0.789,0.361-3.404,3.717-3.404,3.717c-0.34,0.523-0.359,0.979-0.178,1.334  C8.209,11.715,8.268,11.604,8.342,11.488z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_message.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_message.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_message.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,24 +5,24 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill-opacity="0.6" height="20" width="28" x="1" y="5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="6.0415" y2="24.042">
-<stop offset="0" style="stop-color:#FEAB0E"/>
-<stop offset="0.3091" style="stop-color:#FEAB0E"/>
-<stop offset="0.7879" style="stop-color:#FFDA33"/>
-<stop offset="1" style="stop-color:#FFE377"/>
+<stop offset="0" style="stop-color:#B69656"/>
+<stop offset="0.3091" style="stop-color:#B69656"/>
+<stop offset="0.7879" style="stop-color:#C2B470"/>
+<stop offset="1" style="stop-color:#D6CEA0"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="18" width="26" x="2" y="6"/>
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="15,12.633 2.241,24 3.409,24 15,14.526 26.591,24 27.759,24 " stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="6" y2="24.0005">
-<stop offset="0" style="stop-color:#C9700B"/>
-<stop offset="0.0072" style="stop-color:#C9700B"/>
-<stop offset="0.2727" style="stop-color:#C9700B"/>
-<stop offset="0.7212" style="stop-color:#E8AC22"/>
-<stop offset="1" style="stop-color:#E8AC22"/>
+<stop offset="0" style="stop-color:#906344"/>
+<stop offset="0.0072" style="stop-color:#906344"/>
+<stop offset="0.2727" style="stop-color:#906344"/>
+<stop offset="0.7212" style="stop-color:#AD955D"/>
+<stop offset="1" style="stop-color:#AD955D"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" fill-opacity="0.5" points="28,6 15.137,6.947 2,6 2,6.161 10.863,15.487 2,23.941 2,24 2.241,24   11.328,15.902 15,19.365 18.672,15.902 27.759,24 28,24 28,23.941 19.162,15.487 28,6.161 " stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="6.0957" y2="17.2921">
-<stop offset="0" style="stop-color:#FFF278"/>
-<stop offset="1" style="stop-color:#FFFCDA"/>
+<stop offset="0" style="stop-color:#D6D3A1"/>
+<stop offset="1" style="stop-color:#F4F3E5"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="2.127,6 15,17.47 27.873,6 "/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_missed_call.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_missed_call.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_missed_call.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -10,8 +10,8 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="1" style="stop-color:#800000"/>
+<stop offset="0" style="stop-color:#B36B4D"/>
+<stop offset="1" style="stop-color:#5A2633"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mms.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mms.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mms.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -10,44 +10,44 @@
 <rect fill="url(#SVGID_1_)" height="22" width="28" x="1" y="4"/>
 <rect fill="#FFFFFF" height="20" width="26" x="2" y="5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="4.792" x2="22.61" y1="4.792" y2="22.61">
-<stop offset="0" stop-color="#7EBA3E"/>
-<stop offset="1" stop-color="#33773B"/>
+<stop offset="0" stop-color="#7A9563"/>
+<stop offset="1" stop-color="#476358"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="18" width="24" x="3" y="6"/>
 <rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="28" x="1" y="25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="7.994" x2="32.65" y1="10.39" y2="24.21">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<stop offset="0" stop-color="#8FB34D"/>
+<stop offset="1" stop-color="#2B644B"/>
 </linearGradient>
 <path d="M27,18.73c-0.327-0.234-0.694-0.459-1.109-0.658-2.262-1.08-9.354-2.498-14.11-4.163-4.755-1.665-3.118-3.442-3.118-3.442-0.106-0.389-0.37-0.777-0.792-0.111-1.122,1.768,1.143,3.228,3.646,4.163,3.118,1.166,10.33,2.419,13.16,4.385,0.956,0.665,1.717,1.31,2.324,1.905v-2.066z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.47" x2="23.28" y1="14.5" y2="27.5">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<stop offset="0" stop-color="#8FB34D"/>
+<stop offset="1" stop-color="#2B644B"/>
 </linearGradient>
 <path d="M9.721,19.19c0.528,0.444,2.42,0.806,4.28-1.056,1.109-1.109,1.109-2.774,1.109-2.774s-2.008-0.611-3.857,0.721c-1.846,1.33-2.057,2.66-1.529,3.11z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.799" x2="22.61" y1="15.21" y2="28.21">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<stop offset="0" stop-color="#8FB34D"/>
+<stop offset="1" stop-color="#2B644B"/>
 </linearGradient>
 <path d="M5.061,13.93c0.216,0.342,1.197,0.887,2.528,0.207,0.794-0.407,1.071-1.322,1.071-1.322s-1.002-0.704-2.24-0.312c-1.238,0.39-1.575,1.08-1.359,1.42z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11.88" x2="25.69" y1="11.94" y2="24.95">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<stop offset="0" stop-color="#8FB34D"/>
+<stop offset="1" stop-color="#2B644B"/>
 </linearGradient>
 <path d="M13.9,11.03c-0.37-0.389-1.385-0.848-2.748,0.333-0.814,0.705-0.824,1.946-0.824,1.946s1.352,0.163,2.435-0.447c1.25-0.71,1.47-1.49,1.14-1.83z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.24" x2="28.06" y1="9.425" y2="22.43">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<stop offset="0" stop-color="#8FB34D"/>
+<stop offset="1" stop-color="#2B644B"/>
 </linearGradient>
 <path d="M21.43,13.08c-0.32-0.434-1.374-0.805-2.537,0.389-0.754,0.773-1.008,2.501-1.008,2.501s1.352,0.163,2.436-0.448c1.25-0.7,1.56-1.83,1.11-2.44z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="12.08" x2="25.89" y1="11.73" y2="24.73">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<stop offset="0" stop-color="#8FB34D"/>
+<stop offset="1" stop-color="#2B644B"/>
 </linearGradient>
 <path d="M17.93,22.48c0.671,0.473,3.591,1.17,5.955-0.809,1.411-1.182,0.898-3.266,0.898-3.266s-3.038-1.205-5.391,0.213c-2.35,1.43-2.13,3.4-1.46,3.87z" fill="url(#SVGID_8_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="16.78" x2="30.59" y1="6.738" y2="19.73">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+<stop offset="0" stop-color="#8FB34D"/>
+<stop offset="1" stop-color="#2B644B"/>
 </linearGradient>
 <path d="M27,13.39c-0.542,0.568-1.025,1.292-1.342,2.203-0.617,1.781,0.855,3.279,0.855,3.279s0.18-0.04,0.48-0.13v-5.352z" fill="url(#SVGID_9_)"/>
 <rect fill="none" height="30" width="30"/>
@@ -62,9 +62,9 @@
 <rect fill="none" height="15" width="15" x="15" y="15"/>
 <defs>
 <linearGradient gradientTransform="matrix(0.8824 0 0 0.8824 -252.2905 -982.9092)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="311.4" x2="311.4" y1="1131" y2="1148">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.2606" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.2606" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 </defs>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,39 +6,39 @@
 <path d="M7.963,29.301C6.328,29.301,5,27.971,5,26.338V3.994C5,2.36,6.328,1.032,7.963,1.032h14.074  C23.672,1.032,25,2.36,25,3.994v22.344c0,1.633-1.328,2.963-2.963,2.963H7.963z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="-4.1611" y2="28.2423">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+<stop offset="1" style="stop-color:#9C9D9D"/>
 </linearGradient>
 <path d="M24,26.338c0,1.084-0.879,1.963-1.963,1.963H7.963C6.879,28.301,6,27.422,6,26.338V3.994  C6,2.91,6.879,2.032,7.963,2.032h14.074C23.121,2.032,24,2.91,24,3.994V26.338z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="21.0811" y2="27.3765">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="4" width="4" x="13" y="23.301"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="23.1904" y2="26.3381">
 <stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+<stop offset="1" style="stop-color:#9C9D9D"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="2" width="2" x="14" y="24.301"/>
 <path d="M22.037,2.032H7.963C6.879,2.032,6,2.91,6,3.994v1C6,3.91,6.879,3.032,7.963,3.032h14.074  C23.121,3.032,24,3.91,24,4.994v-1C24,2.91,23.121,2.032,22.037,2.032z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.0005" x2="15.0005" y1="22.2461" y2="4.1392">
-<stop offset="0" style="stop-color:#DADADB"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+<stop offset="0" style="stop-color:#DADBDB"/>
+<stop offset="1" style="stop-color:#9C9D9D"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="18.301" width="16" x="7" y="4.032"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="5.0322" y2="21.3059">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="16.301" width="14" x="8" y="5.032"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="9" x2="9" y1="24.3008" y2="26.2852">
-<stop offset="0" style="stop-color:#1CAB00"/>
-<stop offset="1" style="stop-color:#1F6300"/>
+<stop offset="0" style="stop-color:#33784C"/>
+<stop offset="1" style="stop-color:#1E4539"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="2" width="4" x="7" y="24.301"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="21" x2="21" y1="24.3008" y2="26.3008">
-<stop offset="0" style="stop-color:#E63B00"/>
-<stop offset="1" style="stop-color:#8C0000"/>
+<stop offset="0" style="stop-color:#A15745"/>
+<stop offset="1" style="stop-color:#622A37"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="2" width="4" x="19" y="24.301"/>
 <polygon fill="#FFFFFF" fill-opacity="0.2" points="22,11.162 22,5.032 8,5.032 8,12.301 " stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_home.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,46 +6,46 @@
 <path d="M7.963,30C6.328,30,5,28.671,5,27.038V2.962C5,1.328,6.328,0,7.963,0h14.074   C23.672,0,25,1.328,25,2.962v24.076C25,28.671,23.672,30,22.037,30H7.963z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="297.4795" x2="297.4795" y1="-369.4189" y2="-403.9581">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+<stop offset="1" style="stop-color:#9C9D9D"/>
 </linearGradient>
 <path d="M24,27.038C24,28.121,23.121,29,22.037,29H7.963C6.879,29,6,28.121,6,27.038V2.962   C6,1.878,6.879,1,7.963,1h14.074C23.121,1,24,1.878,24,2.962V27.038z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="297.4795" x2="297.4795" y1="-396.8003" y2="-403.0957">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="4" width="4" x="13" y="24"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="297.4795" x2="297.4795" y1="-398.9097" y2="-402.0574">
 <stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+<stop offset="1" style="stop-color:#9C9D9D"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="2" width="2" x="14" y="25"/>
 <path d="M22.037,1H7.963C6.879,1,6,1.878,6,2.962v1   C6,2.878,6.879,2,7.963,2h14.074C23.121,2,24,2.878,24,3.962v-1C24,1.878,23.121,1,22.037,1z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="297.4805" x2="297.4805" y1="-397.9575" y2="-378.1375">
-<stop offset="0" style="stop-color:#DADADB"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+<stop offset="0" style="stop-color:#DADBDB"/>
+<stop offset="1" style="stop-color:#9C9D9D"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="20.032" width="16" x="7" y="3"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="297.4795" x2="297.4795" y1="-379.0195" y2="-397.0217">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="18.032" width="14" x="8" y="4"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="291.4795" x2="291.4795" y1="-400.0195" y2="-402.0039">
-<stop offset="0" style="stop-color:#1CAB00"/>
-<stop offset="1" style="stop-color:#1F6300"/>
+<stop offset="0" style="stop-color:#33784C"/>
+<stop offset="1" style="stop-color:#1E4539"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="2" width="4" x="7" y="25"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="303.4795" x2="303.4795" y1="-400.0195" y2="-402.0195">
-<stop offset="0" style="stop-color:#E63B00"/>
-<stop offset="1" style="stop-color:#8C0000"/>
+<stop offset="0" style="stop-color:#A15745"/>
+<stop offset="1" style="stop-color:#622A37"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="2" width="4" x="19" y="25"/>
 <polygon fill="#FFFFFF" fill-opacity="0.2" points="22,10.13 22,4 8,4 8,11.269  " stroke-opacity="0.2"/>
 <path d="M22,29.998c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8   S26.411,29.998,22,29.998L22,29.998z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="304.4795" x2="304.4795" y1="-389.9863" y2="-404.1826">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="1" style="stop-color:#EF6902"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="1" style="stop-color:#A86F49"/>
 </linearGradient>
 <circle cx="22" cy="21.998" fill="url(#SVGID_8_)" r="7"/>
 <polygon fill-opacity="0.2" points="26.34,23.998 21.999,19.398 17.66,23.998 17,23.298 21.999,17.998    27,23.298  " stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_work.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_work.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_work.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,46 +6,46 @@
 <path d="M7.963,30C6.328,30,5,28.671,5,27.038V2.962C5,1.328,6.328,0,7.963,0h14.074   C23.672,0,25,1.328,25,2.962v24.076C25,28.671,23.672,30,22.037,30H7.963z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="297.4795" x2="297.4795" y1="-369.4189" y2="-403.9581">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+<stop offset="1" style="stop-color:#9C9D9D"/>
 </linearGradient>
 <path d="M24,27.038C24,28.121,23.121,29,22.037,29H7.963C6.879,29,6,28.121,6,27.038V2.962   C6,1.878,6.879,1,7.963,1h14.074C23.121,1,24,1.878,24,2.962V27.038z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="297.4795" x2="297.4795" y1="-396.8003" y2="-403.0956">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="4" width="4" x="13" y="24"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="297.4795" x2="297.4795" y1="-398.9097" y2="-402.0574">
 <stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+<stop offset="1" style="stop-color:#9C9D9D"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="2" width="2" x="14" y="25"/>
 <path d="M22.037,1H7.963C6.879,1,6,1.878,6,2.962v1   C6,2.878,6.879,2,7.963,2h14.074C23.121,2,24,2.878,24,3.962v-1C24,1.878,23.121,1,22.037,1z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="297.4805" x2="297.4805" y1="-397.9575" y2="-378.1375">
-<stop offset="0" style="stop-color:#DADADB"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+<stop offset="0" style="stop-color:#DADBDB"/>
+<stop offset="1" style="stop-color:#9C9D9D"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="20.032" width="16" x="7" y="3"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="297.4795" x2="297.4795" y1="-379.0195" y2="-397.0217">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="18.032" width="14" x="8" y="4"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="291.4795" x2="291.4795" y1="-400.0195" y2="-402.0039">
-<stop offset="0" style="stop-color:#1CAB00"/>
-<stop offset="1" style="stop-color:#1F6300"/>
+<stop offset="0" style="stop-color:#33784C"/>
+<stop offset="1" style="stop-color:#1E4539"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="2" width="4" x="7" y="25"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="303.4795" x2="303.4795" y1="-400.0195" y2="-402.0195">
-<stop offset="0" style="stop-color:#E63B00"/>
-<stop offset="1" style="stop-color:#8C0000"/>
+<stop offset="0" style="stop-color:#A15745"/>
+<stop offset="1" style="stop-color:#622A37"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="2" width="4" x="19" y="25"/>
 <polygon fill="#FFFFFF" fill-opacity="0.2" points="22,10.13 22,4 8,4 8,11.269  " stroke-opacity="0.2"/>
 <path d="M22,29.999c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8   S26.411,29.999,22,29.999L22,29.999z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -375.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="304.4795" x2="304.4795" y1="-390.0186" y2="-404.0186">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#A2A6A5"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <circle cx="22" cy="21.999" fill="url(#SVGID_8_)" r="7"/>
 <path d="M22,15.999c3.697,0,6.717,2.869,6.975,6.5   c0.012-0.166,0.025-0.331,0.025-0.5c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5   C15.283,18.868,18.303,15.999,22,15.999z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_doc.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_doc.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_doc.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,9 @@
 <g>
 <rect fill="none" height="30" width="30"/>
 <rect height="27" width="21.6" x="4.201" y="1.5"/>
-<rect fill="#336699" height="24.3" width="18.9" x="5.55" y="2.851"/>
+<rect fill="#52607A" height="24.3" width="18.9" x="5.55" y="2.851"/>
 <path d="M6.9,4.2v21.6h16.2v-21.6s-14.14,0-16.2,0z" fill="#FFFFFF"/>
 <rect fill="#F6F6F5" height="18.9" width="13.5" x="8.25" y="5.55"/>
-<path d="M18.14,10.69v1.209l1.11-0.083-2.952,4.246,0.271-3.326v-0.838h0.793v-1.21h-9.11v1.209h0.791v0.805l-0.83,8.861h1.041l4.059-5.508-0.339,5.508h1.034l6.841-9.666h0.87v-1.2h-3.567zm-6.58,5.27l0.258-4.063h2.623l-2.88,4.06z" fill="#0A50A1"/>
+<path d="M18.14,10.69v1.209l1.11-0.083-2.952,4.246,0.271-3.326v-0.838h0.793v-1.21h-9.11v1.209h0.791v0.805l-0.83,8.861h1.041l4.059-5.508-0.339,5.508h1.034l6.841-9.666h0.87v-1.2h-3.567zm-6.58,5.27l0.258-4.063h2.623l-2.88,4.06z" fill="#374574"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_pdf.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_pdf.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_pdf.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,9 +4,9 @@
 <g>
 <rect fill="none" height="30" width="30"/>
 <rect height="27" width="21.6" x="4.201" y="1.5"/>
-<rect fill="#FF0000" height="24.3" width="18.9" x="5.551" y="2.85"/>
+<rect fill="#B34D4D" height="24.3" width="18.9" x="5.551" y="2.85"/>
 <path d="M6.901,4.199v21.6h16.2v-21.6s-14.14-0.001-16.2-0.001z" fill="#FFFFFF"/>
 <rect fill="#F6F6F5" height="18.9" width="13.5" x="8.25" y="5.55"/>
-<path d="M16.97,17.67c-0.629-1.442-1.301-3.105-1.503-3.802,0,0,1.54-6.305-0.319-6.305-2.705,0-0.414,6.441-0.414,6.441s-0.91,3.215-1.242,3.909c-1.168,0-5.157,2.126-3.504,3.781,0.854,0.855,2.521-0.056,4.005-3.224,0.261-0.259,2.221-0.506,2.502-0.225,0.988,1.67,2.624,4.454,3.679,3.404,1.37-1.4-1.84-3.99-3.21-3.99zm-6.49,3.55c-0.454-0.454-0.309-1.569,2.651-2.479-1.04,2.07-2.19,2.93-2.65,2.48zm4.54-12.93c1.065,0,0.202,3.646,0.022,4.391,0,0-1.21-4.388-0.02-4.388zm4.72,12.87c-0.487,0.487-1.961-2.063-2.296-2.614,1.52,0.47,2.79,2.13,2.3,2.61z" fill="#FF0000"/>
+<path d="M16.97,17.67c-0.629-1.442-1.301-3.105-1.503-3.802,0,0,1.54-6.305-0.319-6.305-2.705,0-0.414,6.441-0.414,6.441s-0.91,3.215-1.242,3.909c-1.168,0-5.157,2.126-3.504,3.781,0.854,0.855,2.521-0.056,4.005-3.224,0.261-0.259,2.221-0.506,2.502-0.225,0.988,1.67,2.624,4.454,3.679,3.404,1.37-1.4-1.84-3.99-3.21-3.99zm-6.49,3.55c-0.454-0.454-0.309-1.569,2.651-2.479-1.04,2.07-2.19,2.93-2.65,2.48zm4.54-12.93c1.065,0,0.202,3.646,0.022,4.391,0,0-1.21-4.388-0.02-4.388zm4.72,12.87c-0.487,0.487-1.961-2.063-2.296-2.614,1.52,0.47,2.79,2.13,2.3,2.61z" fill="#B34D4D"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_ppt.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_ppt.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_ppt.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,12 +4,12 @@
 <g>
 <rect fill="none" height="30" width="30"/>
 <rect height="27" width="21.6" x="4.2" y="1.5"/>
-<rect fill="#F96D11" height="24.3" width="18.9" x="5.55" y="2.85"/>
+<rect fill="#B37D57" height="24.3" width="18.9" x="5.55" y="2.85"/>
 <rect fill="#FFFFFF" height="21.6" width="16.2" x="6.899" y="4.2"/>
 <rect fill="#F6F6F5" height="18.9" width="13.5" x="8.25" y="5.55"/>
-<rect fill="#F96D11" height="1.35" width="5.399" x="9.601" y="6.901"/>
-<rect fill="#F96D11" height="1.35" width="5.399" x="9.601" y="9.601"/>
-<circle cx="14.32" cy="18.38" fill="#FAA513" r="4.725"/>
-<path d="M20.4,18.37c-0.006-3.349-2.729-6.067-6.075-6.067v6.067h6.08z" fill="#F96D11"/>
+<rect fill="#B37D57" height="1.35" width="5.399" x="9.601" y="6.901"/>
+<rect fill="#B37D57" height="1.35" width="5.399" x="9.601" y="9.601"/>
+<circle cx="14.32" cy="18.38" fill="#B59458" r="4.725"/>
+<path d="M20.4,18.37c-0.006-3.349-2.729-6.067-6.075-6.067v6.067h6.08z" fill="#B37D57"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_xls.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_xls.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_xls.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,12 +4,12 @@
 <g>
 <rect fill="none" height="30" width="30"/>
 <rect height="27" width="21.6" x="4.199" y="1.5"/>
-<rect fill="#33A02C" height="24.3" width="18.9" x="5.549" y="2.85"/>
+<rect fill="#4F7D5A" height="24.3" width="18.9" x="5.549" y="2.85"/>
 <rect fill="#FFFFFF" height="21.6" width="16.2" x="6.899" y="4.2"/>
 <rect fill="#F6F6F5" height="18.9" width="13.5" x="8.25" y="5.55"/>
 <polygon points="21.72,10.9,13.15,21.75,8.659,21.75,16.82,10.9"/>
-<path d="M17.5,12.25c-0.581,0.77-4.178,5.553-6.132,8.153h1.13c0.581-0.735,4.366-5.531,6.438-8.153h-1.44z" fill="#33A02C"/>
+<path d="M17.5,12.25c-0.581,0.77-4.178,5.553-6.132,8.153h1.13c0.581-0.735,4.366-5.531,6.438-8.153h-1.44z" fill="#4F7D5A"/>
 <polygon points="8.25,10.06,16,21.75,21.31,21.75,13.15,10.06"/>
-<path d="M10.76,11.41c1.756,2.649,5.378,8.108,5.962,8.989h1.992c-1.865-2.672-5.686-8.145-6.276-8.989h-1.67z" fill="#33A02C"/>
+<path d="M10.76,11.41c1.756,2.649,5.378,8.108,5.962,8.989h1.992c-1.865-2.672-5.686-8.145-6.276-8.989h-1.67z" fill="#4F7D5A"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_network.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_network.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-110.2285" x2="-106.7285" y1="218.0313" y2="218.0313">
+<stop offset="0" style="stop-color:#6A6C6E"/>
+<stop offset="0.0788" style="stop-color:#ABB0AF"/>
+<stop offset="0.3152" style="stop-color:#FFFFFF"/>
+<stop offset="0.7333" style="stop-color:#9A9C9C"/>
+<stop offset="1" style="stop-color:#C8CAC9"/>
+</linearGradient>
+<path d="M13.236,5.375v21.007c0,0.383,0.313,0.693,0.699,0.693h2.101c0.387,0,0.7-0.31,0.7-0.693V5.375  H13.236z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-108.4648" x2="-108.4648" y1="231.4424" y2="217.714">
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="1" style="stop-color:#222021"/>
+</linearGradient>
+<path d="M28.947,3.791c-0.158-0.515-0.634-0.866-1.173-0.866H15.161h-0.175H2.227  c-0.539,0-1.015,0.352-1.172,0.866C0.896,4.306,1.093,4.863,1.54,5.165l11.697,11.293v-4.581L6.228,5.375h8.759h0.175h8.611  l-7.036,6.612v4.537l11.724-11.36C28.907,4.863,29.104,4.306,28.947,3.791z" fill="url(#SVGID_2_)"/>
+<path d="M1.054,4.192c0.157-0.515,0.633-0.917,1.172-0.917h12.76h0.175  h12.612c0.539,0,1.015,0.402,1.173,0.917c0.017,0.053,0.026,0.107,0.035,0.161c0.032-0.184,0.021-0.375-0.035-0.562  c-0.158-0.515-0.634-0.866-1.173-0.866H15.161h-0.175H2.227c-0.539,0-1.015,0.352-1.172,0.866C0.997,3.978,0.988,4.169,1.019,4.353  C1.027,4.299,1.038,4.245,1.054,4.192z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<polygon fill="#FFFFFF" fill-opacity="0.6" points="17.092,12.358 24.347,5.371 23.79,5.371 17.092,11.714   " stroke-opacity="0.6"/>
+<polygon fill="#FFFFFF" fill-opacity="0.6" points="5.659,5.376 12.892,12.249 12.892,11.608 6.226,5.376   " stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-108.4644" x2="-108.4644" y1="231.0156" y2="218.1964">
+<stop offset="0" style="stop-color:#EDEFEE"/>
+<stop offset="0.5" style="stop-color:#BCBEBE"/>
+<stop offset="0.5" style="stop-color:#A5A6A7"/>
+<stop offset="1" style="stop-color:#C9CBCA"/>
+</linearGradient>
+<path d="M17.086,12.369l7.771-7.344H5.125l7.761,7.236v3.547L1.74,4.877c-0.325-0.22-0.465-0.614-0.351-0.984  c0.113-0.37,0.45-0.619,0.838-0.619h25.547c0.388,0,0.725,0.249,0.838,0.619c0.113,0.37-0.027,0.764-0.347,0.981L17.086,15.928  V12.369z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-100.5967" x2="-100.5967" y1="230.2588" y2="218.9288">
+<stop offset="0" style="stop-color:#69696A"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M28.574,3.801c-0.064,0.147-0.168,0.279-0.31,0.374L17.086,15.228v0.7L28.265,4.875  c0.32-0.217,0.46-0.611,0.347-0.981C28.602,3.861,28.588,3.831,28.574,3.801z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-116.3472" x2="-116.3472" y1="230.2598" y2="218.9229">
+<stop offset="0" style="stop-color:#69696A"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M1.426,3.8C1.413,3.831,1.398,3.861,1.389,3.894C1.275,4.264,1.415,4.657,1.74,4.877l11.146,10.93  v-0.7L1.74,4.177C1.596,4.08,1.491,3.948,1.426,3.8z" fill="url(#SVGID_5_)"/>
+<path d="M1.389,4.243c0.113-0.37,0.45-0.618,0.838-0.618h25.547c0.388,0,0.725,0.249,0.838,0.618  c0.009,0.029,0.013,0.059,0.018,0.087c0.031-0.142,0.027-0.291-0.018-0.437c-0.114-0.37-0.45-0.619-0.838-0.619H2.227  c-0.387,0-0.725,0.249-0.838,0.619C1.344,4.039,1.34,4.188,1.37,4.33C1.375,4.302,1.379,4.272,1.389,4.243z" fill="#FFFFFF"/>
+<path d="M16.036,26.725h-2.101c-0.386,0-0.699-0.311-0.699-0.694v0.351  c0,0.383,0.313,0.693,0.699,0.693h2.101c0.387,0,0.7-0.311,0.7-0.693v-0.351C16.737,26.415,16.423,26.725,16.036,26.725z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M16.036,26.368h-2.101c-0.386,0-0.699-0.311-0.699-0.693v0.35  c0,0.383,0.313,0.693,0.699,0.693h2.101c0.387,0,0.7-0.311,0.7-0.693v-0.35C16.737,26.058,16.423,26.368,16.036,26.368z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<rect fill-opacity="0.3" height="0.35" stroke-opacity="0.3" width="3.5" x="13.236" y="5.375"/>
+<rect fill-opacity="0.2" height="0.35" stroke-opacity="0.2" width="3.5" x="13.236" y="5.725"/>
+<rect fill-opacity="0.1" height="1.4" stroke-opacity="0.1" width="3.5" x="13.236" y="5.375"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_network_off.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_network_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-110.2285" x2="-106.7285" y1="218.0313" y2="218.0313">
+<stop offset="0" style="stop-color:#6A6C6E"/>
+<stop offset="0.0788" style="stop-color:#ABB0AF"/>
+<stop offset="0.3152" style="stop-color:#FFFFFF"/>
+<stop offset="0.7333" style="stop-color:#9A9C9C"/>
+<stop offset="1" style="stop-color:#C8CAC9"/>
+</linearGradient>
+<path d="M13.236,5.375v21.007c0,0.383,0.313,0.693,0.699,0.693h2.101c0.387,0,0.7-0.31,0.7-0.693V5.375  H13.236z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-108.4648" x2="-108.4648" y1="231.4424" y2="217.714">
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="1" style="stop-color:#222021"/>
+</linearGradient>
+<path d="M28.947,3.791c-0.158-0.515-0.634-0.866-1.173-0.866H15.161h-0.175H2.227  c-0.539,0-1.015,0.352-1.172,0.866C0.896,4.306,1.093,4.863,1.54,5.165l11.697,11.293v-4.581L6.228,5.375h8.759h0.175h8.611  l-7.036,6.612v4.537l11.724-11.36C28.907,4.863,29.104,4.306,28.947,3.791z" fill="url(#SVGID_2_)"/>
+<path d="M1.054,4.192c0.157-0.515,0.633-0.917,1.172-0.917h12.76h0.175  h12.612c0.539,0,1.015,0.402,1.173,0.917c0.017,0.053,0.026,0.107,0.035,0.161c0.032-0.184,0.021-0.375-0.035-0.562  c-0.158-0.515-0.634-0.866-1.173-0.866H15.161h-0.175H2.227c-0.539,0-1.015,0.352-1.172,0.866C0.997,3.978,0.988,4.169,1.019,4.353  C1.027,4.299,1.038,4.245,1.054,4.192z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<polygon fill="#FFFFFF" fill-opacity="0.6" points="17.092,12.358 24.347,5.371 23.79,5.371 17.092,11.714   " stroke-opacity="0.6"/>
+<polygon fill="#FFFFFF" fill-opacity="0.6" points="5.659,5.376 12.892,12.249 12.892,11.608 6.226,5.376   " stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-108.4644" x2="-108.4644" y1="231.0156" y2="218.1964">
+<stop offset="0" style="stop-color:#EDEFEE"/>
+<stop offset="0.5" style="stop-color:#BCBEBE"/>
+<stop offset="0.5" style="stop-color:#A5A6A7"/>
+<stop offset="1" style="stop-color:#C9CBCA"/>
+</linearGradient>
+<path d="M17.086,12.369l7.771-7.344H5.125l7.761,7.236v3.547L1.74,4.877c-0.325-0.22-0.465-0.614-0.351-0.984  c0.113-0.37,0.45-0.619,0.838-0.619h25.547c0.388,0,0.725,0.249,0.838,0.619c0.113,0.37-0.027,0.764-0.347,0.981L17.086,15.928  V12.369z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-100.5967" x2="-100.5967" y1="230.2588" y2="218.9288">
+<stop offset="0" style="stop-color:#69696A"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M28.574,3.801c-0.064,0.147-0.168,0.279-0.31,0.374L17.086,15.228v0.7L28.265,4.875  c0.32-0.217,0.46-0.611,0.347-0.981C28.602,3.861,28.588,3.831,28.574,3.801z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-116.3472" x2="-116.3472" y1="230.2598" y2="218.9229">
+<stop offset="0" style="stop-color:#69696A"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M1.426,3.8C1.413,3.831,1.398,3.861,1.389,3.894C1.275,4.264,1.415,4.657,1.74,4.877l11.146,10.93  v-0.7L1.74,4.177C1.596,4.08,1.491,3.948,1.426,3.8z" fill="url(#SVGID_5_)"/>
+<path d="M1.389,4.243c0.113-0.37,0.45-0.618,0.838-0.618h25.547c0.388,0,0.725,0.249,0.838,0.618  c0.009,0.029,0.013,0.059,0.018,0.087c0.031-0.142,0.027-0.291-0.018-0.437c-0.114-0.37-0.45-0.619-0.838-0.619H2.227  c-0.387,0-0.725,0.249-0.838,0.619C1.344,4.039,1.34,4.188,1.37,4.33C1.375,4.302,1.379,4.272,1.389,4.243z" fill="#FFFFFF"/>
+<path d="M16.036,26.725h-2.101c-0.386,0-0.699-0.311-0.699-0.694v0.351  c0,0.383,0.313,0.693,0.699,0.693h2.101c0.387,0,0.7-0.311,0.7-0.693v-0.351C16.737,26.415,16.423,26.725,16.036,26.725z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M16.036,26.368h-2.101c-0.386,0-0.699-0.311-0.699-0.693v0.35  c0,0.383,0.313,0.693,0.699,0.693h2.101c0.387,0,0.7-0.311,0.7-0.693v-0.35C16.737,26.058,16.423,26.368,16.036,26.368z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<rect fill-opacity="0.3" height="0.35" stroke-opacity="0.3" width="3.5" x="13.236" y="5.375"/>
+<rect fill-opacity="0.2" height="0.35" stroke-opacity="0.2" width="3.5" x="13.236" y="5.725"/>
+<rect fill-opacity="0.1" height="1.4" stroke-opacity="0.1" width="3.5" x="13.236" y="5.375"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+<g>
+<rect fill-opacity="0.6" height="34.27" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(0.7073 -0.707 0.707 0.7073 -6.2126 14.9968)" width="3.169" x="13.42" y="-2.134"/>
+<polygon fill="url(#SVGID_1__)" points="26,26.99,3.015,4.005,4.006,3.014,26.99,26"/>
+<rect fill="none" height="30" width="30"/>
+<defs>
+<linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="339.8" x2="339.8" y1="-397.3" y2="-425.3">
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.2606" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_chat.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_chat.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_chat.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,12 +3,12 @@
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <rect fill="none" height="30" width="30"/>
-<path d="M6.924,27.143c-0.451,0-1.213-0.318-1.213-1.512v-3.766C2.71,19.804,1,16.859,1,13.726  C1,7.732,7.28,2.857,15,2.857s14,4.875,14,10.868s-6.28,10.869-14,10.869c-1.54,0-3.052-0.192-4.501-0.574L8.09,26.555  C7.725,26.939,7.321,27.143,6.924,27.143L6.924,27.143z" fill-opacity="0.6"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 -367 -507)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="382" x2="382" y1="511.0117" y2="533.0017">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<path d="M6.924,27.143c-0.451,0-1.213-0.316-1.213-1.512v-3.766C2.71,19.805,1,16.859,1,13.726  C1,7.732,7.28,2.857,15,2.857c7.721,0,14,4.875,14,10.868c0,5.993-6.279,10.869-14,10.869c-1.54,0-3.052-0.191-4.501-0.574  L8.09,26.555C7.725,26.939,7.321,27.143,6.924,27.143L6.924,27.143z" fill-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -945.9609 -1319.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="960.9609" x2="960.9609" y1="1323.0518" y2="1345.0404">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
-<path d="M6.924,26.143c-0.131,0-0.213-0.2-0.213-0.512v-4.305l-0.077-0.049C3.688,19.395,2,16.643,2,13.726  c0-5.44,5.831-9.868,13-9.868c7.168,0,13,4.428,13,9.868c0,5.442-5.832,9.869-13,9.869c-1.618,0-3.201-0.226-4.706-0.669  l-0.105-0.031l-2.824,2.971C7.2,26.039,7.035,26.143,6.924,26.143L6.924,26.143z" fill="url(#SVGID_1_)"/>
+<path d="M6.924,26.143c-0.131,0-0.213-0.199-0.213-0.512v-4.305l-0.077-0.049C3.688,19.395,2,16.643,2,13.726  c0-5.44,5.831-9.868,13-9.868c7.168,0,13,4.428,13,9.868c0,5.442-5.832,9.87-13,9.87c-1.618,0-3.201-0.227-4.706-0.67l-0.105-0.031  l-2.824,2.973C7.2,26.039,7.035,26.143,6.924,26.143L6.924,26.143z" fill="url(#SVGID_1_)"/>
 <path d="M15,4.785c6.961,0,12.646,4.18,12.969,9.405  C27.979,14.035,28,13.883,28,13.726c0-5.44-5.832-9.868-13-9.868c-7.169,0-13,4.428-13,9.868c0,0.149,0.023,0.296,0.033,0.446  C2.368,8.956,8.047,4.785,15,4.785z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <rect fill="#FFFFFF" height="1.084" width="13" x="8.5" y="8.688"/>
 <rect fill-opacity="0.2" height="0.541" stroke-opacity="0.2" width="13" x="8.5" y="9.771"/>
@@ -22,16 +22,16 @@
 <rect fill="none" height="15" width="15" x="15"/>
 <rect fill-opacity="0.6" height="4.412" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(-0.2587 0.9659 -0.9659 -0.2587 29.2728 -12.3701)" width="7.941" x="15.41" y="2.841"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-70.19" x2="-73.15" y1="114.9" y2="107.7">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.26" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.26" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="20.17,8.913,16.76,8,18.59,1.181,22,2.094"/>
 <rect fill-opacity="0.6" height="4.411" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 48.0833 -1.2961)" width="9.707" x="19.46" y="7.104"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-63.01" x2="-70.68" y1="110.1" y2="104.1">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.26" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.26" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="22.44,13.68,19.94,11.18,26.18,4.942,28.68,7.438"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_email_event.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_email_event.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_email_event.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,31 +3,31 @@
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <rect fill="none" height="30" width="30"/>
-<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1s14,6.28,14,14S22.72,29,15,29L15,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.9409" y2="28.3052">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<path d="M15,29C7.28,29,1,22.721,1,15C1,7.28,7.28,1,15,1c7.721,0,14,6.28,14,14  C29,22.721,22.721,29,15,29L15,29z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="593.9609" x2="593.9609" y1="813.9805" y2="840.3448">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.179-5.82-13-13-13  S2,7.821,2,15c0,0.169,0.02,0.333,0.025,0.5C2.29,8.555,7.988,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M24.75,16.235c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115  c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621  c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574  c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62  c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26  c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467  c1.503,1.512,3.32,2.263,5.453,2.263V26c-2.688,0-4.987-0.956-6.891-2.865C6.204,21.22,5.25,18.918,5.25,16.235  c0-2.673,0.955-4.964,2.865-6.873C10.027,7.456,12.319,6.5,15,6.5c2.688,0,4.986,0.95,6.892,2.856  C23.796,11.257,24.75,13.552,24.75,16.235z M16.885,16.157c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061  c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,19.521,16.885,18.401,16.885,16.157z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M24.75,14.985c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115  c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621  c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574  c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62  c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26  c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467  c1.503,1.512,3.32,2.263,5.453,2.263v2.035c-2.688,0-4.987-0.956-6.891-2.865C6.204,19.97,5.25,17.668,5.25,14.985  c0-2.673,0.955-4.964,2.865-6.873C10.027,6.206,12.319,5.25,15,5.25c2.688,0,4.986,0.95,6.892,2.856  C23.796,10.007,24.75,12.302,24.75,14.985z M16.885,14.907c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061  c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,18.271,16.885,17.151,16.885,14.907z" fill="#FFFFFF"/>
+<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5  C27.98,15.333,28,15.169,28,15c0-7.179-5.82-13-13-13C7.82,2,2,7.821,2,15c0,0.169,0.02,0.333,0.025,0.5C2.29,8.555,7.988,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M24.75,16.234c0,1.563-0.314,2.916-0.943,4.06  c-0.762,1.408-1.863,2.115-3.307,2.115c-1.4,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237  c-1.415,0-2.546-0.543-3.401-1.621c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638  c0.844-1.053,1.979-1.574,3.401-1.574c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.097c0,1.378,0.479,2.068,1.438,2.068  c0.782,0,1.387-0.541,1.809-1.619c0.311-0.806,0.467-1.66,0.467-2.578c0-2.121-0.768-3.929-2.289-5.438  c-1.523-1.509-3.354-2.26-5.484-2.26c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.455  c0,2.139,0.75,3.963,2.258,5.467c1.503,1.512,3.32,2.263,5.453,2.263V26c-2.688,0-4.987-0.956-6.891-2.865  c-1.907-1.914-2.861-4.217-2.861-6.9c0-2.671,0.955-4.962,2.865-6.873C10.027,7.456,12.319,6.5,15,6.5  c2.688,0,4.986,0.95,6.893,2.856C23.796,11.257,24.75,13.552,24.75,16.234z M16.885,16.157c0-2.074-0.793-3.113-2.378-3.113  c-0.794,0-1.409,0.354-1.839,1.061c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.183,0.797,3.271,2.394,3.271  C16.092,19.521,16.885,18.4,16.885,16.157z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M24.75,14.985c0,1.563-0.314,2.916-0.943,4.059c-0.762,1.408-1.863,2.115-3.307,2.115  c-1.4,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.543-3.401-1.621  c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574  c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.097c0,1.378,0.479,2.068,1.438,2.068c0.782,0,1.387-0.541,1.809-1.619  c0.311-0.806,0.467-1.66,0.467-2.579c0-2.12-0.768-3.93-2.289-5.438c-1.523-1.509-3.354-2.26-5.484-2.26  c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.962,2.258,5.467  c1.503,1.512,3.32,2.263,5.453,2.263v2.035c-2.688,0-4.987-0.956-6.891-2.865c-1.907-1.912-2.861-4.216-2.861-6.899  c0-2.673,0.955-4.964,2.865-6.873C10.027,6.206,12.319,5.25,15,5.25c2.688,0,4.986,0.95,6.893,2.856  C23.796,10.007,24.75,12.302,24.75,14.985z M16.885,14.907c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061  c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.183,0.797,3.271,2.394,3.271C16.092,18.271,16.885,17.15,16.885,14.907z" fill="#FFFFFF"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 <g>
 <rect fill="none" height="15" width="15" x="15"/>
 <rect fill-opacity="0.6" height="4.412" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(-0.2587 0.9659 -0.9659 -0.2587 29.2728 -12.3701)" width="7.941" x="15.41" y="2.841"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-70.19" x2="-73.15" y1="114.9" y2="107.7">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.26" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.26" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="20.17,8.913,16.76,8,18.59,1.181,22,2.094"/>
 <rect fill-opacity="0.6" height="4.411" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 48.0833 -1.2961)" width="9.707" x="19.46" y="7.104"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-63.01" x2="-70.68" y1="110.1" y2="104.1">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.26" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.26" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="22.44,13.68,19.94,11.18,26.18,4.942,28.68,7.438"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_event.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_event.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_event.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,16 +5,16 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill-opacity="0.6" height="9.111" transform="matrix(-0.2588 0.9659 -0.9659 -0.2588 20.7431 4.1604)" width="16.223" x="0.664" y="5.483"/>
 <linearGradient gradientTransform="matrix(0.9659 0.2588 -0.2588 0.9659 -33.6532 76.8338)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.6367" x2="22.6711" y1="-83.0146" y2="-67.3022">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<stop offset="0" style="stop-color:#A8835F"/>
+<stop offset="0.2606" style="stop-color:#A86F5F"/>
+<stop offset="1" style="stop-color:#9A5047"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="10.369,17.828 3.5,15.987 7.182,2.249 14.05,4.09 "/>
 <rect fill-opacity="0.6" height="9.11" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 45.0957 18.5742)" width="19.778" x="8.812" y="14.072"/>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.4365 187.3474)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-4.9067" x2="-7.3346" y1="-241.8184" y2="-222.4105">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<stop offset="0" style="stop-color:#A8835F"/>
+<stop offset="0.2606" style="stop-color:#A86F5F"/>
+<stop offset="1" style="stop-color:#9A5047"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="14.93,27.427 9.902,22.398 22.473,9.827 27.5,14.855 "/>
 <rect fill="none" height="30" width="30" x="0"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_tip.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_tip.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_tip.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,27 +6,27 @@
 <path d="M23.732,4.574C22.354,2.944,19.719,1,15,1c-4.721,0-7.355,1.944-8.734,3.576  C4.393,6.79,3.629,9.895,4.17,13.091c0.518,3.071,1.816,6.16,3.828,8.404v6.013L9.606,29h10.786L22,27.507v-6.005  c2.013-2.244,3.313-5.336,3.832-8.411C26.369,9.894,25.605,6.788,23.732,4.574z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <polygon fill="url(#SVGID_1_)" points="8.998,21.5 8.998,27.071 9.999,28 20,28 21,27.071 21,21.5 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="1.0713" y2="20.5717">
-<stop offset="0" style="stop-color:#FEE06A"/>
-<stop offset="0.503" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#FEAB29"/>
+<stop offset="0" style="stop-color:#D2C896"/>
+<stop offset="0.503" style="stop-color:#B39C4D"/>
+<stop offset="1" style="stop-color:#BEA069"/>
 </linearGradient>
 <path d="M15,2C7.455,2,4.219,7.377,5.156,12.925c0.936,5.544,4.402,10.848,9.826,10.924l0,0  c0.006,0,0.012,0,0.018,0c0.008,0,0.014,0,0.02,0l0,0c5.424-0.076,8.89-5.38,9.824-10.924C25.779,7.377,22.544,2,15,2z" fill="url(#SVGID_2_)"/>
 <polygon fill="url(#SVGID_1_)" points="8.998,21.5 8.998,27.071 9.999,28 20,28 21,27.071 21,21.5 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="8.998" x2="21" y1="24.2852" y2="24.2852">
-<stop offset="0" style="stop-color:#A0A8AC"/>
-<stop offset="0.1212" style="stop-color:#BDC3C4"/>
-<stop offset="0.2848" style="stop-color:#E9EFF2"/>
-<stop offset="0.6727" style="stop-color:#949DA1"/>
-<stop offset="0.8182" style="stop-color:#D9DFE1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#A4A8A8"/>
+<stop offset="0.1212" style="stop-color:#BFC2C1"/>
+<stop offset="0.2848" style="stop-color:#ECEFED"/>
+<stop offset="0.6727" style="stop-color:#989D9D"/>
+<stop offset="0.8182" style="stop-color:#DBDFDD"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="5.571" width="12.002" x="8.998" y="21.5"/>
 <path d="M8.443,20.5c1.655,1.991,3.857,3.31,6.539,3.349l0,0c0.006,0,0.012,0,0.018,0c0.008,0,0.014,0,0.02,0l0,0  c2.682-0.039,4.884-1.357,6.539-3.349H8.443z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.998" x2="21" y1="24.2852" y2="24.2852">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.4" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#686E70"/>
+<stop offset="1" style="stop-color:#6A6C6E"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="5.571" width="12.002" x="8.998" y="21.5"/>
 <rect fill-opacity="0.25" height="0.929" stroke-opacity="0.25" width="12.002" x="8.998" y="22.633"/>
@@ -44,16 +44,16 @@
 <rect fill="none" height="15" width="15" x="15"/>
 <rect fill-opacity="0.6" height="4.412" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(-0.2587 0.9659 -0.9659 -0.2587 29.2728 -12.3701)" width="7.941" x="15.41" y="2.841"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-70.19" x2="-73.15" y1="114.9" y2="107.7">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.26" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.26" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1__)" points="20.17,8.913,16.76,8,18.59,1.181,22,2.094"/>
 <rect fill-opacity="0.6" height="4.411" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 48.0833 -1.2961)" width="9.707" x="19.46" y="7.104"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-63.01" x2="-70.68" y1="110.1" y2="104.1">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.26" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.26" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2__)" points="22.44,13.68,19.94,11.18,26.18,4.942,28.68,7.438"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_nfc_offline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_nfc_offline.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_nfc_offline.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -14,8 +14,8 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 </defs>
 </g>
@@ -25,9 +25,9 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="339.8" x2="339.8" y1="-397.3" y2="-425.3">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.2606" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.2606" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_note.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_note.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_note.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,15 +4,15 @@
 <g>
 <polygon fill-opacity="0.6" points="28,28 28,2 2,2 2,21.414 8.586,28 "/>
 <polygon fill="url(#SVGID_1_)" points="27,3 27,27 9,27 3,21 3,3 "/>
-<polygon fill="#FFEC8A" points="3,21 9,21 9,27 "/>
+<polygon fill="#DCD6AD" points="3,21 9,21 9,27 "/>
 <rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="20" x="5" y="8.5"/>
 <rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="20" x="5" y="12.5"/>
 <rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="14" x="5" y="16.5"/>
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientTransform="matrix(-1 0 0 1 854 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="839" x2="839" y1="3" y2="27.0005">
-<stop offset="0" style="stop-color:#FFD338"/>
-<stop offset="1" style="stop-color:#F6A800"/>
+<stop offset="0" style="stop-color:#C3B474"/>
+<stop offset="1" style="stop-color:#AC8A4A"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_online.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_online.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_online.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,9 +5,9 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29.5C7.005,29.5,0.5,22.995,0.5,15S7.005,0.5,15,0.5S29.5,7.005,29.5,15S22.995,29.5,15,29.5  L15,29.5z" fill-opacity="0.6"/>
 <radialGradient cx="15" cy="11.4824" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="19.5752">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4" style="stop-color:#62B82E"/>
-<stop offset="1" style="stop-color:#0D4D07"/>
+<stop offset="0" style="stop-color:#B7CC97"/>
+<stop offset="0.4" style="stop-color:#638F57"/>
+<stop offset="1" style="stop-color:#1C3837"/>
 </radialGradient>
 <path d="M15,28.5C7.556,28.5,1.5,22.445,1.5,15C1.5,7.557,7.556,1.5,15,1.5c7.443,0,13.5,6.057,13.5,13.5  C28.5,22.445,22.443,28.5,15,28.5L15,28.5z" fill="url(#SVGID_1_)"/>
 <path d="M15,1.5C7.556,1.5,1.5,7.557,1.5,15c0,7.445,6.056,13.5,13.5,13.5  c7.443,0,13.5-6.055,13.5-13.5C28.5,7.557,22.443,1.5,15,1.5z M15,26.045C8.233,26.045,2.728,21.768,2.728,15  C2.728,8.233,8.233,2.728,15,2.728S27.273,8.233,27.273,15C27.273,21.768,21.767,26.045,15,26.045z" fill="url(#SVGID_2_)" fill-opacity="0.4" stroke-opacity="0.4"/>
@@ -15,8 +15,8 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.0005" x2="15.0005" y1="28.5" y2="1.5005">
-<stop offset="0" style="stop-color:#D7EDCA"/>
-<stop offset="1" style="stop-color:#62B82E"/>
+<stop offset="0" style="stop-color:#DDE3D4"/>
+<stop offset="1" style="stop-color:#638F57"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_operator.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_operator.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_operator.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -16,23 +16,23 @@
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="13" width="16" x="7" y="12"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="13" y2="23.9727">
-<stop offset="0" style="stop-color:#FEE06A"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+<stop offset="0" style="stop-color:#D2C896"/>
+<stop offset="1" style="stop-color:#B3964D"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="18,13 18,16 17,16 17,13 13,13 13,16 12,16 12,13 8,13 8,18 22,18 22,13 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="10" x2="10" y1="13.0005" y2="23.9721">
-<stop offset="0" style="stop-color:#FEE06A"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+<stop offset="0" style="stop-color:#D2C896"/>
+<stop offset="1" style="stop-color:#B3964D"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="5" width="4" x="8" y="19"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="13.0005" y2="23.9721">
-<stop offset="0" style="stop-color:#FEE06A"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+<stop offset="0" style="stop-color:#D2C896"/>
+<stop offset="1" style="stop-color:#B3964D"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="5" width="4" x="13" y="19"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="20" x2="20" y1="13.0005" y2="23.9721">
-<stop offset="0" style="stop-color:#FEE06A"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+<stop offset="0" style="stop-color:#D2C896"/>
+<stop offset="1" style="stop-color:#B3964D"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="5" width="4" x="18" y="19"/>
 <rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="14" x="8" y="13"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_outbox.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_outbox.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_outbox.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,20 +5,20 @@
 <rect fill="none" height="30" width="30"/>
 <polygon fill-opacity="0.6" points="11,19 11,12 7,12 15,1.333 23,12 19,12 19,19 " stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.7603" y2="18.0948">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="15,3 9,11 12,11 12,18 18,18 18,11 21,11 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="2.7603" y2="18.0948">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="0.7576" style="stop-color:#4CB400"/>
-<stop offset="1" style="stop-color:#89CC6A"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="0.7576" style="stop-color:#367E3C"/>
+<stop offset="1" style="stop-color:#97AF87"/>
 </linearGradient>
 <path d="M15,3l-6,8h3v7h6v-7h3L15,3z M17,10v7h-4v-7h-2l4-5.333L19,10H17z" fill="url(#SVGID_2_)"/>
 <polygon fill-opacity="0.6" points="1,28 1,19 5,19 5,22 25,22 25,19 29,19 29,28 " stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="19.8877" y2="27.0436">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#83CABF"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <polygon fill="url(#SVGID_3_)" points="26,20 26,23 4,23 4,20 2,20 2,23 2,26 2,27 28,27 28,26 28,23 28,20 "/>
 <rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="26" x="2" y="26"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pager.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pager.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pager.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -17,14 +17,14 @@
 </linearGradient>
 <path d="M4,18c-0.55,0-1-0.45-1-1V9c0-0.55,0.45-1,1-1h22c0.55,0,1,0.45,1,1v8c0,0.55-0.45,1-1,1H4z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="9.0889" y2="16.9214">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#1E6BC4"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#506992"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="8" width="22" x="4" y="9"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="24.5" x2="24.5" y1="20.0225" y2="21.9805">
-<stop offset="0" style="stop-color:#96D12A"/>
-<stop offset="0.3939" style="stop-color:#96D12A"/>
-<stop offset="1" style="stop-color:#4B8B00"/>
+<stop offset="0" style="stop-color:#859F5C"/>
+<stop offset="0.3939" style="stop-color:#859F5C"/>
+<stop offset="1" style="stop-color:#2A6138"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="2" width="3" x="23" y="20"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="19.5" x2="19.5" y1="20.0225" y2="21.9805">
@@ -33,8 +33,8 @@
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="2" width="3" x="18" y="20"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="12.5" x2="12.5" y1="20.0225" y2="21.9805">
-<stop offset="0" style="stop-color:#DE6F00"/>
-<stop offset="1" style="stop-color:#AB0000"/>
+<stop offset="0" style="stop-color:#9B6643"/>
+<stop offset="1" style="stop-color:#78333F"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="2" width="3" x="11" y="20"/>
 <polygon fill="#FFFFFF" fill-opacity="0.2" points="26,12 4,13 4,9 26,9 " stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pair.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pair.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pair.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,17 +4,17 @@
 <g>
 <rect fill="none" height="30" width="30"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="10.3721" x2="10.3721" y1="1" y2="24.4868">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="0.2143" style="stop-color:#36B5FF"/>
-<stop offset="0.5879" style="stop-color:#1B66D8"/>
-<stop offset="1" style="stop-color:#2183E0"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="0.2143" style="stop-color:#72B9C3"/>
+<stop offset="0.5879" style="stop-color:#546F9F"/>
+<stop offset="1" style="stop-color:#5A82A7"/>
 </linearGradient>
 <path d="M16.389,8.041L9.514,1v9.274L5.734,6.407L4.355,7.815l4.75,4.871l-4.75,4.869l1.377,1.406  l3.781-3.865v9.274l6.875-7.037l-4.541-4.647L16.389,8.041z M13.645,8.056l-2.195,2.243l-0.004-4.49L13.645,8.056z M13.645,17.321  l-2.199,2.241l0.004-4.49L13.645,17.321z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="19.6279" x2="19.6279" y1="5.6289" y2="29.1157">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="0.2143" style="stop-color:#36B5FF"/>
-<stop offset="0.5879" style="stop-color:#1B66D8"/>
-<stop offset="1" style="stop-color:#2183E0"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="0.2143" style="stop-color:#72B9C3"/>
+<stop offset="0.5879" style="stop-color:#546F9F"/>
+<stop offset="1" style="stop-color:#5A82A7"/>
 </linearGradient>
 <path d="M25.645,12.67l-6.873-7.041v9.274l-3.779-3.867l-1.381,1.408l4.752,4.871l-4.752,4.869l1.377,1.406  l3.783-3.865V29l6.873-7.039l-4.539-4.646L25.645,12.67z M22.9,12.683l-2.195,2.245l-0.002-4.492L22.9,12.683z M22.9,21.95  l-2.197,2.241l0.002-4.49L22.9,21.95z" fill="url(#SVGID_2_)"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pd_wcdma.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pd_wcdma.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-107.8691" x2="-104.9155" y1="219.2109" y2="219.2109">
+<stop offset="0" style="stop-color:#6A6C6E"/>
+<stop offset="0.0788" style="stop-color:#ABB0AF"/>
+<stop offset="0.3152" style="stop-color:#FFFFFF"/>
+<stop offset="0.7333" style="stop-color:#9A9C9C"/>
+<stop offset="1" style="stop-color:#C8CAC9"/>
+</linearGradient>
+<path d="M15.596,5.888v17.73c0,0.323,0.263,0.584,0.59,0.584h1.772c0.326,0,0.591-0.261,0.591-0.584V5.888  H15.596z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-106.3813" x2="-106.3813" y1="230.5293" y2="218.9428">
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="1" style="stop-color:#222021"/>
+</linearGradient>
+<path d="M28.855,4.552c-0.134-0.435-0.536-0.731-0.99-0.731H17.22h-0.147H6.303  c-0.455,0-0.856,0.297-0.99,0.731C5.178,4.985,5.345,5.457,5.721,5.71l9.874,9.531v-3.866L9.68,5.888h7.393h0.147h7.268  l-5.938,5.581v3.829l9.896-9.588C28.822,5.456,28.988,4.985,28.855,4.552z" fill="url(#SVGID_2_)"/>
+<path d="M5.313,4.889c0.133-0.435,0.534-0.773,0.99-0.773h10.77h0.147  h10.645c0.454,0,0.856,0.339,0.99,0.773c0.013,0.045,0.021,0.091,0.029,0.137c0.026-0.156,0.019-0.318-0.029-0.475  c-0.134-0.435-0.536-0.731-0.99-0.731H17.22h-0.147H6.303c-0.455,0-0.856,0.297-0.99,0.731C5.264,4.708,5.256,4.87,5.282,5.025  C5.29,4.98,5.299,4.934,5.313,4.889z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<polygon fill="#FFFFFF" fill-opacity="0.6" points="18.849,11.782 24.973,5.885 24.503,5.885 18.849,11.239   " stroke-opacity="0.6"/>
+<polygon fill="#FFFFFF" fill-opacity="0.6" points="9.199,5.889 15.305,11.69 15.305,11.149 9.677,5.889 " stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-106.3813" x2="-106.3813" y1="230.1689" y2="219.3503">
+<stop offset="0" style="stop-color:#EDEFEE"/>
+<stop offset="0.5" style="stop-color:#BCBEBE"/>
+<stop offset="0.5" style="stop-color:#A5A6A7"/>
+<stop offset="1" style="stop-color:#C9CBCA"/>
+</linearGradient>
+<path d="M18.844,11.792l6.56-6.199H8.75L15.3,11.7v2.993L5.892,5.469C5.617,5.282,5.5,4.95,5.595,4.638  c0.095-0.313,0.38-0.522,0.708-0.522h21.563c0.327,0,0.611,0.21,0.707,0.522c0.095,0.313-0.023,0.645-0.293,0.827l-9.435,9.33  V11.792z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-99.7397" x2="-99.7397" y1="229.5313" y2="219.9691">
+<stop offset="0" style="stop-color:#69696A"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M28.541,4.56c-0.054,0.125-0.143,0.234-0.261,0.315l-9.436,9.329v0.591l9.436-9.33  c0.27-0.182,0.388-0.515,0.293-0.827C28.563,4.61,28.552,4.585,28.541,4.56z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-113.0337" x2="-113.0337" y1="229.5313" y2="219.962">
+<stop offset="0" style="stop-color:#69696A"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M5.627,4.559C5.616,4.585,5.604,4.61,5.595,4.638C5.5,4.95,5.617,5.282,5.892,5.469l9.408,9.226  v-0.592L5.892,4.877C5.77,4.795,5.682,4.684,5.627,4.559z" fill="url(#SVGID_5_)"/>
+<path d="M5.595,4.933c0.095-0.313,0.38-0.522,0.708-0.522h21.563c0.327,0,0.611,0.209,0.707,0.522  c0.007,0.024,0.01,0.049,0.015,0.073c0.025-0.119,0.023-0.245-0.015-0.368c-0.096-0.313-0.38-0.522-0.707-0.522H6.303  c-0.328,0-0.613,0.21-0.708,0.522C5.557,4.76,5.554,4.886,5.579,5.005C5.584,4.982,5.588,4.958,5.595,4.933z" fill="#FFFFFF"/>
+<path d="M17.958,23.907h-1.772c-0.326,0-0.59-0.261-0.59-0.584v0.295  c0,0.323,0.263,0.584,0.59,0.584h1.772c0.326,0,0.591-0.261,0.591-0.584v-0.295C18.549,23.646,18.284,23.907,17.958,23.907z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M17.958,23.606h-1.772c-0.326,0-0.59-0.262-0.59-0.584v0.294  c0,0.324,0.263,0.587,0.59,0.587h1.772c0.326,0,0.591-0.263,0.591-0.587v-0.294C18.549,23.345,18.284,23.606,17.958,23.606z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<rect fill-opacity="0.3" height="0.296" stroke-opacity="0.3" width="2.953" x="15.596" y="5.888"/>
+<rect fill-opacity="0.2" height="0.294" stroke-opacity="0.2" width="2.953" x="15.596" y="6.184"/>
+<rect fill-opacity="0.1" height="1.182" stroke-opacity="0.1" width="2.953" x="15.596" y="5.888"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-119.4878" x2="-119.4878" y1="217.0977" y2="208.1441">
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
+</linearGradient>
+<path d="M5.667,21.386c0.566-0.438,0.892-1.049,0.892-1.769c0-0.61-0.238-1.171-0.67-1.58  c-0.47-0.448-1.152-0.683-1.964-0.683c-0.987,0-1.842,0.363-2.275,0.674l-0.265,0.187l0.593,1.582l0.451-0.32  c0.277-0.198,0.787-0.43,1.298-0.43c0.424,0,0.931,0.129,0.931,0.74c0,0.725-0.941,0.883-1.301,0.883H2.349V22.3h1.008  c0.257,0,1.559,0.055,1.569,1.125c0.004,0.131-0.02,0.459-0.271,0.716c-0.229,0.229-0.584,0.347-1.05,0.347  c-0.634,0-1.237-0.26-1.491-0.414L1.67,23.807l-0.569,1.598l0.277,0.182c0.414,0.274,1.252,0.593,2.24,0.593  c2.223,0,3.235-1.421,3.235-2.739C6.857,22.561,6.4,21.813,5.667,21.386z" fill="url(#SVGID_6_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-119.4702" x2="-119.4702" y1="216.7178" y2="208.2598">
+<stop offset="0" style="stop-color:#E2E5C2"/>
+<stop offset="0.7455" style="stop-color:#49794A"/>
+<stop offset="1" style="stop-color:#ACB991"/>
+</linearGradient>
+<path d="M3.617,25.997c-0.95,0-1.745-0.304-2.138-0.562L1.321,25.33l0.446-1.25l0.253,0.15  c0.271,0.164,0.91,0.441,1.585,0.441c0.515,0,0.912-0.134,1.178-0.4c0.316-0.323,0.33-0.734,0.326-0.853  c-0.009-0.961-0.95-1.303-1.752-1.303H2.532v-1.263h0.824c0.596,0,1.485-0.284,1.485-1.067c0-0.587-0.406-0.923-1.115-0.923  c-0.557,0-1.104,0.25-1.405,0.465L2.064,19.51l-0.46-1.226l0.152-0.106c0.41-0.296,1.225-0.64,2.168-0.64  c0.768,0,1.403,0.219,1.838,0.632c0.395,0.375,0.612,0.89,0.612,1.448c0,0.646-0.284,1.207-0.819,1.622l-0.216,0.167l0.234,0.137  c0.699,0.408,1.099,1.099,1.094,1.896C6.669,24.671,5.714,25.997,3.617,25.997L3.617,25.997z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-119.4497" x2="-119.4497" y1="216.7148" y2="208.5057">
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
+</linearGradient>
+<path d="M3.617,25.813c-0.91,0-1.666-0.288-2.037-0.532l-0.037-0.026l0.322-0.903l0.06,0.035  c0.287,0.175,0.965,0.469,1.68,0.469c0.566,0,1.007-0.153,1.309-0.454c0.367-0.377,0.383-0.852,0.379-0.988  c-0.01-1.093-1.049-1.481-1.936-1.481h-0.64v-0.897h0.64c0.67,0,1.668-0.332,1.668-1.25c0-0.692-0.485-1.105-1.298-1.105  c-0.6,0-1.188,0.269-1.511,0.498l-0.061,0.044l-0.326-0.87l0.034-0.024c0.389-0.281,1.164-0.607,2.063-0.607  c0.719,0,1.312,0.201,1.712,0.582c0.357,0.34,0.554,0.807,0.554,1.314c0,0.588-0.26,1.098-0.749,1.478l-0.43,0.333l0.47,0.273  c0.641,0.374,1.006,1.007,1.004,1.738C6.487,24.583,5.589,25.813,3.617,25.813L3.617,25.813z" fill="url(#SVGID_8_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-112.5542" x2="-112.5542" y1="218.3975" y2="208.8453">
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
+</linearGradient>
+<path d="M11.143,19.919v1.678h1.613v1.646c-0.212,0.057-0.504,0.107-0.955,0.107  c-1.669,0-2.662-1.049-2.662-2.806c0-0.862,0.259-1.575,0.753-2.058c0.486-0.483,1.191-0.736,2.04-0.736  c0.645,0,1.148,0.098,1.589,0.305l0.441,0.208l0.512-1.657l-0.326-0.16c-0.391-0.188-1.199-0.409-2.192-0.409  c-2.847,0-4.757,1.831-4.757,4.554c0,1.325,0.455,2.523,1.245,3.286c0.828,0.791,1.903,1.175,3.287,1.175  c1.305,0,2.334-0.357,2.622-0.467l0.271-0.104v-4.561H11.143z" fill="url(#SVGID_9_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-112.5537" x2="-112.5537" y1="218.0762" y2="209.3553">
+<stop offset="0" style="stop-color:#E2E5C2"/>
+<stop offset="0.7455" style="stop-color:#49794A"/>
+<stop offset="1" style="stop-color:#ACB991"/>
+</linearGradient>
+<path d="M11.729,24.868c-1.334,0-2.367-0.368-3.16-1.125c-0.755-0.729-1.188-1.878-1.188-3.152  c0-2.615,1.838-4.371,4.574-4.371c0.963,0,1.74,0.211,2.111,0.393l0.187,0.09l-0.404,1.305L13.6,17.889  c-0.467-0.219-0.998-0.322-1.668-0.322c-0.901,0-1.651,0.272-2.169,0.788c-0.526,0.518-0.807,1.274-0.807,2.189  c0,1.872,1.064,2.988,2.846,2.988c0.393,0,0.72-0.036,1.001-0.112l0.136-0.036v-1.97h-1.614v-1.312h3.116v4.251l-0.155,0.059  C13.925,24.552,12.951,24.868,11.729,24.868L11.729,24.868z" fill="url(#SVGID_10_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-112.5542" x2="-112.5542" y1="218.0146" y2="209.2411">
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
+</linearGradient>
+<path d="M11.729,24.685c-1.284,0-2.275-0.352-3.033-1.074c-0.719-0.694-1.132-1.795-1.132-3.021  c0-2.504,1.765-4.187,4.391-4.187c0.931,0,1.677,0.2,2.032,0.373l0.045,0.021l-0.295,0.951l-0.059-0.027  c-0.492-0.23-1.049-0.34-1.746-0.34c-0.95,0-1.745,0.292-2.299,0.843c-0.563,0.551-0.86,1.354-0.86,2.318  c0,1.986,1.133,3.172,3.029,3.172c0.41,0,0.752-0.039,1.049-0.119l0.272-0.073V21.23H11.51v-0.945h2.747v3.943l-0.036,0.013  C13.869,24.375,12.919,24.685,11.729,24.685L11.729,24.685z" fill="url(#SVGID_11_)"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pd_wcdma_off.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pd_wcdma_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-107.8691" x2="-104.9155" y1="219.2109" y2="219.2109">
+<stop offset="0" style="stop-color:#6A6C6E"/>
+<stop offset="0.0788" style="stop-color:#ABB0AF"/>
+<stop offset="0.3152" style="stop-color:#FFFFFF"/>
+<stop offset="0.7333" style="stop-color:#9A9C9C"/>
+<stop offset="1" style="stop-color:#C8CAC9"/>
+</linearGradient>
+<path d="M15.596,5.888v17.73c0,0.323,0.263,0.584,0.59,0.584h1.772c0.326,0,0.591-0.261,0.591-0.584V5.888  H15.596z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-106.3813" x2="-106.3813" y1="230.5293" y2="218.9428">
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="1" style="stop-color:#222021"/>
+</linearGradient>
+<path d="M28.855,4.552c-0.134-0.435-0.536-0.731-0.99-0.731H17.22h-0.147H6.303  c-0.455,0-0.856,0.297-0.99,0.731C5.178,4.985,5.345,5.457,5.721,5.71l9.874,9.531v-3.866L9.68,5.888h7.393h0.147h7.268  l-5.938,5.581v3.829l9.896-9.588C28.822,5.456,28.988,4.985,28.855,4.552z" fill="url(#SVGID_2_)"/>
+<path d="M5.313,4.889c0.133-0.435,0.534-0.773,0.99-0.773h10.77h0.147  h10.645c0.454,0,0.856,0.339,0.99,0.773c0.013,0.045,0.021,0.091,0.029,0.137c0.026-0.156,0.019-0.318-0.029-0.475  c-0.134-0.435-0.536-0.731-0.99-0.731H17.22h-0.147H6.303c-0.455,0-0.856,0.297-0.99,0.731C5.264,4.708,5.256,4.87,5.282,5.025  C5.29,4.98,5.299,4.934,5.313,4.889z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<polygon fill="#FFFFFF" fill-opacity="0.6" points="18.849,11.782 24.973,5.885 24.503,5.885 18.849,11.239   " stroke-opacity="0.6"/>
+<polygon fill="#FFFFFF" fill-opacity="0.6" points="9.199,5.889 15.305,11.69 15.305,11.149 9.677,5.889 " stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-106.3813" x2="-106.3813" y1="230.1689" y2="219.3503">
+<stop offset="0" style="stop-color:#EDEFEE"/>
+<stop offset="0.5" style="stop-color:#BCBEBE"/>
+<stop offset="0.5" style="stop-color:#A5A6A7"/>
+<stop offset="1" style="stop-color:#C9CBCA"/>
+</linearGradient>
+<path d="M18.844,11.792l6.56-6.199H8.75L15.3,11.7v2.993L5.892,5.469C5.617,5.282,5.5,4.95,5.595,4.638  c0.095-0.313,0.38-0.522,0.708-0.522h21.563c0.327,0,0.611,0.21,0.707,0.522c0.095,0.313-0.023,0.645-0.293,0.827l-9.435,9.33  V11.792z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-99.7397" x2="-99.7397" y1="229.5313" y2="219.9691">
+<stop offset="0" style="stop-color:#69696A"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M28.541,4.56c-0.054,0.125-0.143,0.234-0.261,0.315l-9.436,9.329v0.591l9.436-9.33  c0.27-0.182,0.388-0.515,0.293-0.827C28.563,4.61,28.552,4.585,28.541,4.56z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-113.0337" x2="-113.0337" y1="229.5313" y2="219.962">
+<stop offset="0" style="stop-color:#69696A"/>
+<stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M5.627,4.559C5.616,4.585,5.604,4.61,5.595,4.638C5.5,4.95,5.617,5.282,5.892,5.469l9.408,9.226  v-0.592L5.892,4.877C5.77,4.795,5.682,4.684,5.627,4.559z" fill="url(#SVGID_5_)"/>
+<path d="M5.595,4.933c0.095-0.313,0.38-0.522,0.708-0.522h21.563c0.327,0,0.611,0.209,0.707,0.522  c0.007,0.024,0.01,0.049,0.015,0.073c0.025-0.119,0.023-0.245-0.015-0.368c-0.096-0.313-0.38-0.522-0.707-0.522H6.303  c-0.328,0-0.613,0.21-0.708,0.522C5.557,4.76,5.554,4.886,5.579,5.005C5.584,4.982,5.588,4.958,5.595,4.933z" fill="#FFFFFF"/>
+<path d="M17.958,23.907h-1.772c-0.326,0-0.59-0.261-0.59-0.584v0.295  c0,0.323,0.263,0.584,0.59,0.584h1.772c0.326,0,0.591-0.261,0.591-0.584v-0.295C18.549,23.646,18.284,23.907,17.958,23.907z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M17.958,23.606h-1.772c-0.326,0-0.59-0.262-0.59-0.584v0.294  c0,0.324,0.263,0.587,0.59,0.587h1.772c0.326,0,0.591-0.263,0.591-0.587v-0.294C18.549,23.345,18.284,23.606,17.958,23.606z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<rect fill-opacity="0.3" height="0.296" stroke-opacity="0.3" width="2.953" x="15.596" y="5.888"/>
+<rect fill-opacity="0.2" height="0.294" stroke-opacity="0.2" width="2.953" x="15.596" y="6.184"/>
+<rect fill-opacity="0.1" height="1.182" stroke-opacity="0.1" width="2.953" x="15.596" y="5.888"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-119.4878" x2="-119.4878" y1="217.0977" y2="208.1441">
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
+</linearGradient>
+<path d="M5.667,21.386c0.566-0.438,0.892-1.049,0.892-1.769c0-0.61-0.238-1.171-0.67-1.58  c-0.47-0.448-1.152-0.683-1.964-0.683c-0.987,0-1.842,0.363-2.275,0.674l-0.265,0.187l0.593,1.582l0.451-0.32  c0.277-0.198,0.787-0.43,1.298-0.43c0.424,0,0.931,0.129,0.931,0.74c0,0.725-0.941,0.883-1.301,0.883H2.349V22.3h1.008  c0.257,0,1.559,0.055,1.569,1.125c0.004,0.131-0.02,0.459-0.271,0.716c-0.229,0.229-0.584,0.347-1.05,0.347  c-0.634,0-1.237-0.26-1.491-0.414L1.67,23.807l-0.569,1.598l0.277,0.182c0.414,0.274,1.252,0.593,2.24,0.593  c2.223,0,3.235-1.421,3.235-2.739C6.857,22.561,6.4,21.813,5.667,21.386z" fill="url(#SVGID_6_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-119.4702" x2="-119.4702" y1="216.7178" y2="208.2598">
+<stop offset="0" style="stop-color:#E2E5C2"/>
+<stop offset="0.7455" style="stop-color:#49794A"/>
+<stop offset="1" style="stop-color:#ACB991"/>
+</linearGradient>
+<path d="M3.617,25.997c-0.95,0-1.745-0.304-2.138-0.562L1.321,25.33l0.446-1.25l0.253,0.15  c0.271,0.164,0.91,0.441,1.585,0.441c0.515,0,0.912-0.134,1.178-0.4c0.316-0.323,0.33-0.734,0.326-0.853  c-0.009-0.961-0.95-1.303-1.752-1.303H2.532v-1.263h0.824c0.596,0,1.485-0.284,1.485-1.067c0-0.587-0.406-0.923-1.115-0.923  c-0.557,0-1.104,0.25-1.405,0.465L2.064,19.51l-0.46-1.226l0.152-0.106c0.41-0.296,1.225-0.64,2.168-0.64  c0.768,0,1.403,0.219,1.838,0.632c0.395,0.375,0.612,0.89,0.612,1.448c0,0.646-0.284,1.207-0.819,1.622l-0.216,0.167l0.234,0.137  c0.699,0.408,1.099,1.099,1.094,1.896C6.669,24.671,5.714,25.997,3.617,25.997L3.617,25.997z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-119.4497" x2="-119.4497" y1="216.7148" y2="208.5057">
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
+</linearGradient>
+<path d="M3.617,25.813c-0.91,0-1.666-0.288-2.037-0.532l-0.037-0.026l0.322-0.903l0.06,0.035  c0.287,0.175,0.965,0.469,1.68,0.469c0.566,0,1.007-0.153,1.309-0.454c0.367-0.377,0.383-0.852,0.379-0.988  c-0.01-1.093-1.049-1.481-1.936-1.481h-0.64v-0.897h0.64c0.67,0,1.668-0.332,1.668-1.25c0-0.692-0.485-1.105-1.298-1.105  c-0.6,0-1.188,0.269-1.511,0.498l-0.061,0.044l-0.326-0.87l0.034-0.024c0.389-0.281,1.164-0.607,2.063-0.607  c0.719,0,1.312,0.201,1.712,0.582c0.357,0.34,0.554,0.807,0.554,1.314c0,0.588-0.26,1.098-0.749,1.478l-0.43,0.333l0.47,0.273  c0.641,0.374,1.006,1.007,1.004,1.738C6.487,24.583,5.589,25.813,3.617,25.813L3.617,25.813z" fill="url(#SVGID_8_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-112.5542" x2="-112.5542" y1="218.3975" y2="208.8453">
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
+</linearGradient>
+<path d="M11.143,19.919v1.678h1.613v1.646c-0.212,0.057-0.504,0.107-0.955,0.107  c-1.669,0-2.662-1.049-2.662-2.806c0-0.862,0.259-1.575,0.753-2.058c0.486-0.483,1.191-0.736,2.04-0.736  c0.645,0,1.148,0.098,1.589,0.305l0.441,0.208l0.512-1.657l-0.326-0.16c-0.391-0.188-1.199-0.409-2.192-0.409  c-2.847,0-4.757,1.831-4.757,4.554c0,1.325,0.455,2.523,1.245,3.286c0.828,0.791,1.903,1.175,3.287,1.175  c1.305,0,2.334-0.357,2.622-0.467l0.271-0.104v-4.561H11.143z" fill="url(#SVGID_9_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-112.5537" x2="-112.5537" y1="218.0762" y2="209.3553">
+<stop offset="0" style="stop-color:#E2E5C2"/>
+<stop offset="0.7455" style="stop-color:#49794A"/>
+<stop offset="1" style="stop-color:#ACB991"/>
+</linearGradient>
+<path d="M11.729,24.868c-1.334,0-2.367-0.368-3.16-1.125c-0.755-0.729-1.188-1.878-1.188-3.152  c0-2.615,1.838-4.371,4.574-4.371c0.963,0,1.74,0.211,2.111,0.393l0.187,0.09l-0.404,1.305L13.6,17.889  c-0.467-0.219-0.998-0.322-1.668-0.322c-0.901,0-1.651,0.272-2.169,0.788c-0.526,0.518-0.807,1.274-0.807,2.189  c0,1.872,1.064,2.988,2.846,2.988c0.393,0,0.72-0.036,1.001-0.112l0.136-0.036v-1.97h-1.614v-1.312h3.116v4.251l-0.155,0.059  C13.925,24.552,12.951,24.868,11.729,24.868L11.729,24.868z" fill="url(#SVGID_10_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-112.5542" x2="-112.5542" y1="218.0146" y2="209.2411">
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
+</linearGradient>
+<path d="M11.729,24.685c-1.284,0-2.275-0.352-3.033-1.074c-0.719-0.694-1.132-1.795-1.132-3.021  c0-2.504,1.765-4.187,4.391-4.187c0.931,0,1.677,0.2,2.032,0.373l0.045,0.021l-0.295,0.951l-0.059-0.027  c-0.492-0.23-1.049-0.34-1.746-0.34c-0.95,0-1.745,0.292-2.299,0.843c-0.563,0.551-0.86,1.354-0.86,2.318  c0,1.986,1.133,3.172,3.029,3.172c0.41,0,0.752-0.039,1.049-0.119l0.272-0.073V21.23H11.51v-0.945h2.747v3.943l-0.036,0.013  C13.869,24.375,12.919,24.685,11.729,24.685L11.729,24.685z" fill="url(#SVGID_11_)"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+<g>
+<rect fill-opacity="0.6" height="34.27" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(0.7073 -0.707 0.707 0.7073 -6.2126 14.9968)" width="3.169" x="13.42" y="-2.134"/>
+<polygon fill="url(#SVGID_1__)" points="26,26.99,3.015,4.005,4.006,3.014,26.99,26"/>
+<rect fill="none" height="30" width="30"/>
+<defs>
+<linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="339.8" x2="339.8" y1="-397.3" y2="-425.3">
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.2606" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_person.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_person.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_person.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,36 +5,36 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M1,29v-1c0-2.974,1.324-5.258,3.83-6.606c0.602-0.324,1.942-0.849,3.771-1.554  c0.68-0.262,1.493-0.576,1.889-0.743c0.147-0.423,0.11-1.146,0.001-1.362c0,0-1.105-2.003-1.146-2.088  c-0.909-0.094-1.778-0.873-2.203-1.998c-0.457-1.209-0.286-2.413,0.373-3.094c-0.589-2.53-0.458-4.477,0.393-5.793  C8.413,3.98,9.175,3.434,10.08,3.195C11.014,2.066,12.33,1,14.762,1c2.838,0.096,5.041,1.074,6.405,2.831  c1.341,1.728,1.776,4.13,1.23,6.78c0.621,0.697,0.759,1.895,0.283,3.083c-0.411,1.032-1.173,1.747-2.007,1.916  c-0.046,0.097-1.174,2.138-1.174,2.138c-0.121,0.24-0.136,1.033,0.023,1.416c0.333,0.133,0.99,0.381,1.586,0.605  c1.942,0.73,3.475,1.314,4.054,1.619C25.804,21.728,29,23.636,29,28v1H1z" fill-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0024" x2="15.0024" y1="24.1553" y2="17.2445">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.2" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+<stop offset="0" style="stop-color:#DDC4B0"/>
+<stop offset="0.2" style="stop-color:#DDC4B0"/>
+<stop offset="0.9628" style="stop-color:#A57665"/>
+<stop offset="1" style="stop-color:#A57665"/>
 </linearGradient>
 <path d="M19.167,20.203c-0.92-0.404-0.89-2.39-0.512-2.99c0.066-0.105,0.127-0.209,0.191-0.314h-7.693  c0.064,0.105,0.124,0.209,0.19,0.314c0.379,0.601,0.408,2.586-0.511,2.99c-0.92,0.405,4.274,3.932,4.274,3.932  S20.087,20.608,19.167,20.203z" fill="url(#SVGID_1_)"/>
 <path d="M11.344,17.213c0.154,0.244,0.245,0.721,0.243,1.225c0.866,0.945,2.058,1.894,3.355,1.894  c1.663,0,2.726-0.854,3.475-1.778c-0.02-0.546,0.072-1.076,0.238-1.34c0.066-0.105,0.127-0.209,0.191-0.314h-7.693  C11.218,17.004,11.277,17.107,11.344,17.213z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="19.8359" y2="28">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#BA1212"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="1" style="stop-color:#88444B"/>
 </linearGradient>
 <path d="M24.696,22.273c-0.968-0.51-5.761-2.212-5.852-2.318l-3.662,3.086l-3.935-3.205  C11.14,20,6.4,21.684,5.304,22.273C4.049,22.949,2,24.501,2,28h26C28,24.501,25.662,22.783,24.696,22.273z" fill="url(#SVGID_2_)"/>
-<path d="M24.229,23.158c-0.513-0.271-2.506-1.021-3.825-1.518c-0.627-0.236-1.068-0.402-1.385-0.525l-0.312,0.263  c0.204,0.077,0.43,0.163,0.696,0.263c1.319,0.496,3.313,1.247,3.825,1.518c0.411,0.217,2.283,1.334,2.691,3.842h1  C26.513,24.492,24.641,23.375,24.229,23.158z" fill="#FF7B56"/>
-<path d="M6.777,23.154c0.538-0.289,2.28-0.961,3.552-1.451c0.441-0.17,0.802-0.309,1.104-0.427l-0.328-0.267  c-0.384,0.157-0.942,0.373-1.775,0.693c-1.271,0.49-3.014,1.162-3.552,1.451C4.223,23.991,3.314,25.282,3.068,27h1  C4.314,25.282,5.223,23.991,6.777,23.154z" fill="#FF7B56"/>
+<path d="M24.229,23.158c-0.513-0.271-2.506-1.021-3.825-1.518c-0.627-0.236-1.068-0.402-1.385-0.525l-0.312,0.263  c0.204,0.077,0.43,0.163,0.696,0.263c1.319,0.496,3.313,1.247,3.825,1.518c0.411,0.217,2.283,1.334,2.691,3.842h1  C26.513,24.492,24.641,23.375,24.229,23.158z" fill="#CCA089"/>
+<path d="M6.777,23.154c0.538-0.289,2.28-0.961,3.552-1.451c0.441-0.17,0.802-0.309,1.104-0.427l-0.328-0.267  c-0.384,0.157-0.942,0.373-1.775,0.693c-1.271,0.49-3.014,1.162-3.552,1.451C4.223,23.991,3.314,25.282,3.068,27h1  C4.314,25.282,5.223,23.991,6.777,23.154z" fill="#CCA089"/>
 <radialGradient cx="-107.9609" cy="23.2217" gradientTransform="matrix(0.9352 0 0 0.9448 112.9225 -13.3229)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.0323">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+<stop offset="0" style="stop-color:#F4EDE4"/>
+<stop offset="0.5091" style="stop-color:#E8D9CA"/>
+<stop offset="0.7636" style="stop-color:#DDC4B0"/>
+<stop offset="1" style="stop-color:#BF9C89"/>
 </radialGradient>
 <path d="M21.378,11.076c-0.033-0.016-0.069-0.019-0.104-0.029v-0.001c-0.006-0.001-0.012-0.003-0.02-0.004  c-0.05-0.013-0.101-0.024-0.153-0.028c-6.421-1.133-9.367-4.738-9.59-3.783c-0.176,0.76-1.977,2.402-2.919,3.223  c0.008,0.036,0.013,0.069,0.02,0.105c0,0,0.034,0.169,0.105,0.455c-0.075,0.008-0.148,0.023-0.22,0.055  c-0.6,0.256-0.788,1.254-0.42,2.227c0.368,0.975,1.152,1.557,1.751,1.302c0.038-0.017,0.069-0.044,0.103-0.065  c0.35,0.795,0.777,1.646,1.302,2.5c0.878,1.059,2.224,2.3,3.709,2.3c1.797,0,2.897-0.997,3.653-2.002  c0.019-0.042,0.039-0.082,0.06-0.116c0.561-0.888,1.015-1.778,1.383-2.607c0.587,0.207,1.341-0.346,1.714-1.283  C22.14,12.354,21.972,11.348,21.378,11.076z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.8901" x2="14.8901" y1="2.1216" y2="10.4031">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+<stop offset="0" style="stop-color:#725B53"/>
+<stop offset="0.3758" style="stop-color:#451F1E"/>
+<stop offset="1" style="stop-color:#261013"/>
 </linearGradient>
 <path d="M14.762,2c-2.226,0-3.297,1.026-4.123,2.099c-1.345,0.21-3.476,1.46-1.971,6.933  c0.942-0.82,2.668-3.041,2.844-3.801c0.225-0.964,3.221,2.719,9.763,3.815c0.077-0.306,0.112-0.487,0.112-0.487  C22.414,5.887,20.179,2.183,14.762,2z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15.0591" x2="15.0591" y1="20.1875" y2="25.6254">
-<stop offset="0" style="stop-color:#BC1C24"/>
-<stop offset="1" style="stop-color:#6B1C24"/>
+<stop offset="0" style="stop-color:#8C4C54"/>
+<stop offset="1" style="stop-color:#53343E"/>
 </linearGradient>
 <path d="M20.96,20.781c-1.13-0.426-2.075-0.779-2.115-0.826l-3.662,3.086l-3.935-3.205  c-0.047,0.071-0.971,0.43-2.09,0.861l6.046,4.939L20.96,20.781z" fill="url(#SVGID_5_)"/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phone_disabled.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phone_disabled.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phone_disabled.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,39 +6,39 @@
 <path d="M7.963,29.301C6.328,29.301,5,27.971,5,26.338V3.994C5,2.36,6.328,1.032,7.963,1.032h14.074  C23.672,1.032,25,2.36,25,3.994v22.344c0,1.633-1.328,2.963-2.963,2.963H7.963z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="-4.1611" y2="28.2423">
 <stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+<stop offset="1" style="stop-color:#9C9D9D"/>
 </linearGradient>
 <path d="M24,26.338c0,1.084-0.879,1.963-1.963,1.963H7.963C6.879,28.301,6,27.422,6,26.338V3.994  C6,2.91,6.879,2.032,7.963,2.032h14.074C23.121,2.032,24,2.91,24,3.994V26.338z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="21.0811" y2="27.3765">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+<stop offset="0" style="stop-color:#A8A9AA"/>
+<stop offset="0.703" style="stop-color:#59595A"/>
+<stop offset="1" style="stop-color:#818283"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="4" width="4" x="13" y="23.301"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="23.1904" y2="26.3381">
 <stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+<stop offset="1" style="stop-color:#9C9D9D"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="2" width="2" x="14" y="24.301"/>
 <path d="M22.037,2.032H7.963C6.879,2.032,6,2.91,6,3.994v1C6,3.91,6.879,3.032,7.963,3.032h14.074  C23.121,3.032,24,3.91,24,4.994v-1C24,2.91,23.121,2.032,22.037,2.032z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.0005" x2="15.0005" y1="22.2461" y2="4.1392">
-<stop offset="0" style="stop-color:#DADADB"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+<stop offset="0" style="stop-color:#DADBDB"/>
+<stop offset="1" style="stop-color:#9C9D9D"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="18.301" width="16" x="7" y="4.032"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="5.0322" y2="21.3059">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+<stop offset="0" style="stop-color:#70B4B6"/>
+<stop offset="1" style="stop-color:#455188"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="16.301" width="14" x="8" y="5.032"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="9" x2="9" y1="24.3008" y2="26.2852">
-<stop offset="0" style="stop-color:#1CAB00"/>
-<stop offset="1" style="stop-color:#1F6300"/>
+<stop offset="0" style="stop-color:#33784C"/>
+<stop offset="1" style="stop-color:#1E4539"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="2" width="4" x="7" y="24.301"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="21" x2="21" y1="24.3008" y2="26.3008">
-<stop offset="0" style="stop-color:#E63B00"/>
-<stop offset="1" style="stop-color:#8C0000"/>
+<stop offset="0" style="stop-color:#A15745"/>
+<stop offset="1" style="stop-color:#622A37"/>
 </linearGradient>
 <rect fill="url(#SVGID_7_)" height="2" width="4" x="19" y="24.301"/>
 <polygon fill="#FFFFFF" fill-opacity="0.2" points="22,11.162 22,5.032 8,5.032 8,12.301 " stroke-opacity="0.2"/>
@@ -49,9 +49,9 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="339.8" x2="339.8" y1="-397.3" y2="-425.3">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.2606" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.2606" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phonebook.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phonebook.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phonebook.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,8 +5,8 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M4,1v5C2.896,6,2,6.897,2,8s0.896,2,2,2v1c-1.104,0-2,0.897-2,2s0.896,2,2,2v1c-1.104,0-2,0.897-2,2  s0.896,2,2,2v1c-1.104,0-2,0.897-2,2s0.896,2,2,2v4h24V1H4z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="18" x2="18" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="26" width="18" x="9" y="2"/>
 <path d="M19.134,16.857c-0.005-0.08,0-0.161,0.002-0.242c0.532-0.371,0.993-0.9,1.274-1.472  c0.52-1.056,0.389-3.753,0.389-3.753c0-1.102-1.65-2.391-2.725-2.391h-0.386c-1.075,0-2.726,1.289-2.726,2.391  c0,0-0.098,2.688,0.39,3.753c0.267,0.582,0.736,1.116,1.281,1.487c0.001,0.075,0.007,0.151,0.002,0.227  c-0.066,1.08-3.579,2.914-3.751,3.148V23h10v-2.992C22.713,19.772,19.2,17.938,19.134,16.857z" fill-opacity="0.2" stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_play.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_play.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_play.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<path d="M5.294,26.47c-0.156,0-0.313-0.042-0.45-0.124-0.268-0.16-0.432-0.45-0.432-0.76v-21.18c0-0.312,0.164-0.6,0.432-0.759,0.138-0.082,0.294-0.123,0.45-0.123,0.146,0,0.291,0.036,0.423,0.107l19.41,10.59c0.283,0.154,0.46,0.452,0.46,0.775s-0.177,0.62-0.46,0.774l-19.41,10.59c-0.132,0.08-0.277,0.11-0.423,0.11z" fill-opacity="0.6" stroke-opacity="0.6" style="enable-background:new;"/>
-<polygon fill="url(#SVGID_1_)" points="5.294,4.412,24.71,15,5.294,25.59"/>
-<polygon fill="#753200" fill-opacity="0.1" points="5.294,24.71,5.294,25.59,24.71,15,23.9,14.56" stroke-opacity="0.1" style="enable-background:new;"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="24.71,15,5.294,4.412,5.294,5.294,23.9,15.44" stroke-opacity="0.4" style="enable-background:new;"/>
+<g>
+<path d="M5.294,26.471c-0.156,0-0.313-0.043-0.45-0.125  c-0.268-0.16-0.432-0.449-0.432-0.76V4.406c0-0.312,0.164-0.6,0.432-0.759c0.138-0.082,0.294-0.123,0.45-0.123  c0.146,0,0.291,0.036,0.423,0.107l19.41,10.59c0.283,0.154,0.46,0.452,0.46,0.775c0,0.323-0.177,0.62-0.46,0.773l-19.41,10.59  C5.585,26.439,5.44,26.471,5.294,26.471z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<polygon fill="url(#SVGID_1_)" points="5.294,4.412 24.71,15 5.294,25.59 "/>
+<polygon fill="#522523" fill-opacity="0.1" points="5.294,24.71 5.294,25.59 24.71,15 23.9,14.56 " stroke-opacity="0.1"/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="24.71,15 5.294,4.412 5.294,5.294 23.9,15.44 " stroke-opacity="0.4"/>
 <rect fill="none" height="30" width="30"/>
 <defs>
-<linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="339.8" x2="339.8" y1="-399.8" y2="-423.8">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#048CC6"/>
+<linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -862.1367 -1160.3917)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="994.0371" x2="994.0371" y1="-1320.041" y2="-1344.041">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 </defs>
+</g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_playlist.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_playlist.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_playlist.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -24,9 +24,9 @@
 <rect fill="none" height="15" width="15" x="15" y="15"/>
 <defs>
 <linearGradient gradientTransform="matrix(0.8824 0 0 0.8824 -252.2905 -982.9092)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="311.4" x2="311.4" y1="1131" y2="1148">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.2606" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.2606" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 </defs>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_presentation.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_presentation.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_presentation.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -11,7 +11,7 @@
 <rect fill="url(#SVGID_1_)" height="4" width="26" x="2" y="3"/>
 <rect fill="#FFFFFF" height="18" width="24" x="3" y="7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="8" y2="24.0005">
-<stop offset="0" style="stop-color:#E6E7E7"/>
+<stop offset="0" style="stop-color:#E6E7E6"/>
 <stop offset="1" style="stop-color:#999999"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="16" width="22" x="4" y="8"/>
@@ -21,23 +21,23 @@
 <rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="26" x="2" y="25"/>
 <rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="26" x="2" y="6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="7.5" x2="7.5" y1="10.9995" y2="21.8879">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="6" width="3" x="6" y="16"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="12.5" x2="12.5" y1="11.0005" y2="21.888">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="4" width="3" x="11" y="18"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="17.5" x2="17.5" y1="11" y2="21.8882">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="8" width="3" x="16" y="14"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="22.5" x2="22.5" y1="11" y2="21.888">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_6_)" height="11" width="3" x="21" y="11"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="6" y="16"/>
@@ -45,8 +45,8 @@
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="16" y="14"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="21" y="11"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="5" x2="19" y1="12.5" y2="12.5">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<stop offset="0" style="stop-color:#A8835F"/>
+<stop offset="1" style="stop-color:#9A5047"/>
 </linearGradient>
 <polygon fill="url(#SVGID_7_)" points="19,9 15.564,9 11.394,13.172 10.223,12 5,12 5,14 9.394,14 11.394,16 16.394,11 19,11 "/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_high.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_high.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_high.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,14 +4,14 @@
 <g>
 <polygon fill-opacity="0.6" points="11.117,18 8.867,1 21.133,1 18.883,18 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="27.0027">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="1" style="stop-color:#800000"/>
+<stop offset="0" style="stop-color:#B36B4D"/>
+<stop offset="1" style="stop-color:#5A2633"/>
 </linearGradient>
 <path d="M20,2l-2,15h-6L10,2H20z" fill="url(#SVGID_1_)"/>
 <path d="M15,29c-2.757,0-5-2.243-5-5s2.243-5,5-5s5,2.243,5,5S17.757,29,15,29L15,29z" fill-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="20.333" y2="27.8994">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="1" style="stop-color:#800000"/>
+<stop offset="0" style="stop-color:#B36B4D"/>
+<stop offset="1" style="stop-color:#5A2633"/>
 </linearGradient>
 <circle cx="15" cy="24" fill="url(#SVGID_2_)" r="4"/>
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="19.866,3 20,2 10,2 10.134,3 " stroke-opacity="0.4"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_low.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_low.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_low.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -9,9 +9,9 @@
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="11,17 11,16 5,16 5.833,17 " stroke-opacity="0.4"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="8" x="11" y="2"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.8545" y2="28.0011">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="593.9609" x2="593.9609" y1="813.8945" y2="840.0411">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,8 +5,8 @@
 <rect fill="none" fill-opacity="0.5" height="30" stroke-opacity="0.5" width="30"/>
 <path d="M15,30c-8.271,0-15-6.73-15-15s6.729-15,15-15,15,6.729,15,15-6.73,15-15,15z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
-<stop offset="0" stop-color="#B9BCBD"/>
-<stop offset="0.3394" stop-color="#E0E1E2"/>
+<stop offset="0" stop-color="#BABCBB"/>
+<stop offset="0.3394" stop-color="#E1E1E1"/>
 <stop offset="1" stop-color="#FFFFFF"/>
 </linearGradient>
 <path d="M15,29c-7.721,0-14-6.28-14-14s6.279-14,14-14,14,6.28,14,14-6.28,14-14,14z" fill="url(#SVGID_1_)"/>
@@ -14,15 +14,15 @@
 <path d="M15,2c7.551,0,13.71,6.013,13.98,13.5,0-0.17,0.02-0.33,0.02-0.5,0-7.72-6.279-14-14-14s-14,6.28-14,14c0,0.169,0.02,0.333,0.025,0.5,0.266-7.487,6.424-13.5,13.98-13.5z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <path d="M15,24c-4.963,0-9-4.038-9-9s4.037-9,9-9,9,4.038,9,9-4.04,9-9,9z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="7.125" y2="23.25">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
+<stop offset="0" stop-color="#85AE4A"/>
+<stop offset="1" stop-color="#2F6F44"/>
 </linearGradient>
 <path d="M15,23c-4.411,0-8-3.59-8-8s3.589-8,8-8,8,3.59,8,8-3.59,8-8,8z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="7" y2="23">
-<stop offset="0" stop-color="#D6FF8C"/>
-<stop offset="0.3394" stop-color="#7AD900"/>
-<stop offset="0.6182" stop-color="#5BC000"/>
-<stop offset="1" stop-color="#96DB00"/>
+<stop offset="0" stop-color="#D1DDAF"/>
+<stop offset="0.3394" stop-color="#5B9841"/>
+<stop offset="0.6182" stop-color="#3D863A"/>
+<stop offset="1" stop-color="#679942"/>
 </linearGradient>
 <path d="M15,8c3.859,0,7,3.141,7,7s-3.141,7-7,7-7-3.141-7-7,3.14-7,7-7m0-1c-4.411,0-8,3.59-8,8s3.589,8,8,8,8-3.59,8-8-3.59-8-8-8z" fill="url(#SVGID_3_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_disabled.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_disabled.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<rect fill="none" fill-opacity="0.5" height="30" stroke-opacity="0.5" width="30"/>
+<path d="M15,30C6.729,30,0,23.271,0,15S6.729,0,15,0s15,6.729,15,15S23.271,30,15,30L15,30z" fill="#B4B4B4"/>
+<path d="M15,28C7.831,28,2,22.168,2,15S7.831,2,15,2s13,5.832,13,13S22.169,28,15,28L15,28z" fill="#DCDCDC"/>
+<path d="M15,23c-4.411,0-8-3.59-8-8s3.589-8,8-8s8,3.59,8,8S19.411,23,15,23L15,23z" fill="#B4B4B4"/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_highlight.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_highlight.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_highlight.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,31 +2,31 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
-<path d="M15,30c-8.271,0-15-6.73-15-15s6.729-15,15-15,15,6.729,15,15-6.73,15-15,15z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#16A0D4"/>
+<path d="M15,30C6.729,30,0,23.27,0,15C0,6.73,6.729,0,15,0c8.271,0,15,6.729,15,15C30,23.271,23.27,30,15,30z" fill-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -289.4805 -383.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="304.4795" x2="304.4795" y1="-384.2393" y2="-412.4603">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
-<path d="M15,29c-7.72,0-14-6.28-14-14s6.28-14,14-14,14,6.28,14,14-6.28,14-14,14z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="3.188" y2="27.38">
-<stop offset="0" stop-color="#E0E1E2"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<path d="M15,29C7.28,29,1,22.721,1,15C1,7.28,7.28,1,15,1c7.721,0,14,6.28,14,14C29,22.721,22.721,29,15,29z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -289.4805 -383.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="304.4795" x2="304.4795" y1="-386.209" y2="-410.401">
+<stop offset="0" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M15,27c-6.617,0-12-5.38-12-12s5.383-12,12-12,12,5.383,12,12-5.38,12-12,12z" fill="url(#SVGID_2_)"/>
-<path d="M15,4c6.448,0,11.71,5.115,11.98,11.5,0-0.17,0.02-0.33,0.02-0.5,0-6.617-5.383-12-12-12s-12,5.383-12,12c0,0.169,0.019,0.333,0.025,0.5,0.265-6.385,5.527-11.5,11.98-11.5z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M15,24c-4.963,0-9-4.038-9-9s4.037-9,9-9,9,4.038,9,9-4.04,9-9,9z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="7.125" y2="23.25">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
+<path d="M15,27C8.383,27,3,21.62,3,15S8.383,3,15,3s12,5.383,12,12S21.62,27,15,27z" fill="url(#SVGID_2_)"/>
+<path d="M15,4c6.447,0,11.71,5.115,11.98,11.5c0-0.17,0.02-0.33,0.02-0.5c0-6.617-5.383-12-12-12S3,8.383,3,15  c0,0.169,0.019,0.333,0.025,0.5C3.29,9.115,8.552,4,15.005,4H15z" fill-opacity="0.2"/>
+<path d="M15,24c-4.963,0-9-4.038-9-9s4.037-9,9-9s9,4.038,9,9S19.96,24,15,24z" fill-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -289.4805 -383.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="304.4795" x2="304.4795" y1="-390.1455" y2="-406.2705">
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
-<path d="M15,23c-4.411,0-8-3.59-8-8s3.589-8,8-8,8,3.59,8,8-3.59,8-8,8z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15" x2="15" y1="7" y2="23">
-<stop offset="0" stop-color="#D6FF8C"/>
-<stop offset="0.3394" stop-color="#7AD900"/>
-<stop offset="0.6182" stop-color="#5BC000"/>
-<stop offset="1" stop-color="#96DB00"/>
+<path d="M15,23c-4.411,0-8-3.59-8-8s3.589-8,8-8s8,3.59,8,8S19.41,23,15,23z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -289.4805 -383.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="304.4795" x2="304.4795" y1="-390.0195" y2="-406.0195">
+<stop offset="0" style="stop-color:#D1DDAF"/>
+<stop offset="0.3394" style="stop-color:#5B9841"/>
+<stop offset="0.6182" style="stop-color:#3D863A"/>
+<stop offset="1" style="stop-color:#679942"/>
 </linearGradient>
-<path d="M15,8c3.859,0,7,3.141,7,7s-3.141,7-7,7-7-3.141-7-7,3.14-7,7-7m0-1c-4.411,0-8,3.59-8,8s3.589,8,8,8,8-3.59,8-8-3.59-8-8-8z" fill="url(#SVGID_4_)"/>
+<path d="M15,8c3.859,0,7,3.141,7,7c0,3.859-3.141,7-7,7c-3.859,0-7-3.141-7-7C8,11.141,11.14,8,15,8 M15,7  c-4.411,0-8,3.59-8,8s3.589,8,8,8s8-3.59,8-8S19.41,7,15,7z" fill="url(#SVGID_4_)"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -9,7 +9,7 @@
 <path d="M15,2c7.551,0,13.71,6.013,13.98,13.5,0-0.17,0.02-0.33,0.02-0.5,0-7.72-6.279-14-14-14s-14,6.28-14,14c0,0.169,0.02,0.333,0.025,0.5,0.266-7.487,6.424-13.5,13.98-13.5z" fill-opacity="0.1" stroke-opacity="0.1"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
-<stop offset="0" stop-color="#E0E1E2"/>
+<stop offset="0" stop-color="#E1E1E1"/>
 <stop offset="1" stop-color="#FFFFFF"/>
 </linearGradient>
 </defs>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_disabled.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_disabled.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<rect fill="none" fill-opacity="0.5" height="30" stroke-opacity="0.5" width="30"/>
+<path d="M15,30C6.729,30,0,23.271,0,15S6.729,0,15,0s15,6.729,15,15S23.271,30,15,30L15,30z" fill="#B4B4B4"/>
+<path d="M15,28C7.831,28,2,22.168,2,15S7.831,2,15,2s13,5.832,13,13S22.169,28,15,28L15,28z" fill="#DCDCDC"/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_highlight.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_highlight.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_highlight.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,19 +2,19 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
-<path d="M15,30c-8.271,0-15-6.73-15-15s6.729-15,15-15,15,6.729,15,15-6.73,15-15,15z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#16A0D4"/>
+<path d="M15,30C6.729,30,0,23.27,0,15C0,6.73,6.729,0,15,0c8.271,0,15,6.729,15,15C30,23.271,23.27,30,15,30z" fill-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -289.4805 -383.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="304.4795" x2="304.4795" y1="-384.2393" y2="-412.4603">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
-<path d="M15,29c-7.72,0-14-6.28-14-14s6.28-14,14-14,14,6.28,14,14-6.28,14-14,14z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="3.188" y2="27.38">
-<stop offset="0" stop-color="#E0E1E2"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<path d="M15,29C7.28,29,1,22.721,1,15C1,7.28,7.28,1,15,1c7.721,0,14,6.28,14,14C29,22.721,22.721,29,15,29z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -289.4805 -383.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="304.4795" x2="304.4795" y1="-386.209" y2="-410.401">
+<stop offset="0" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
-<path d="M15,27c-6.617,0-12-5.38-12-12s5.383-12,12-12,12,5.383,12,12-5.38,12-12,12z" fill="url(#SVGID_2_)"/>
-<path d="M15,3c-6.617,0-12,5.383-12,12,0,6.238,4.785,11.37,10.88,11.94-5.543-0.56-9.88-5.25-9.88-10.94,0-6.065,4.935-11,11-11s11,4.935,11,11c0,5.687-4.337,10.38-9.877,10.94,6.1-0.57,10.88-5.7,10.88-11.94,0-6.617-5.38-12-12-12z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M15,4c6.448,0,11.71,5.115,11.98,11.5,0-0.17,0.02-0.33,0.02-0.5,0-6.617-5.383-12-12-12s-12,5.383-12,12c0,0.169,0.019,0.333,0.025,0.5,0.265-6.385,5.527-11.5,11.98-11.5z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M15,27C8.383,27,3,21.62,3,15S8.383,3,15,3s12,5.383,12,12S21.62,27,15,27z" fill="url(#SVGID_2_)"/>
+<path d="M15,3C8.383,3,3,8.383,3,15c0,6.238,4.785,11.37,10.88,11.939C8.337,26.38,4,21.689,4,16  C4,9.935,8.935,5,15,5c6.064,0,11,4.935,11,11c0,5.688-4.337,10.38-9.877,10.939c6.1-0.569,10.88-5.699,10.88-11.939  c0-6.617-5.38-12-12-12H15z" fill-opacity="0.1"/>
+<path d="M15,4c6.447,0,11.71,5.115,11.98,11.5c0-0.17,0.02-0.33,0.02-0.5c0-6.617-5.383-12-12-12S3,8.383,3,15  c0,0.169,0.019,0.333,0.025,0.5C3.29,9.115,8.552,4,15.005,4H15z" fill-opacity="0.1"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reboot.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reboot.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reboot.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,9 +6,9 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29C7.279,29,1,22.719,1,15C1,7.279,7.279,1,15,1c7.719,0,14,6.279,14,14C29,22.719,22.719,29,15,29L15,29  z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+<stop offset="0" style="stop-color:#C39072"/>
+<stop offset="0.7939" style="stop-color:#88444B"/>
+<stop offset="1" style="stop-color:#AF7563"/>
 </linearGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
 <path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13  S2,7.82,2,15c0,0.169,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
@@ -16,13 +16,13 @@
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="8.8188" y2="38.4606">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.5273" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CAD1D4"/>
+<stop offset="1" style="stop-color:#CDD1CF"/>
 </linearGradient>
 <path d="M20.03,9.343c-0.616-0.464-1.492-0.34-1.955,0.277c-0.463,0.616-0.341,1.494,0.278,1.955  c1.42,1.068,2.234,2.698,2.234,4.472c0,3.083-2.507,5.59-5.588,5.59s-5.587-2.507-5.587-5.59c0-1.773,0.814-3.404,2.234-4.473  c0.618-0.463,0.74-1.338,0.277-1.955c-0.463-0.616-1.339-0.74-1.955-0.277c-2.131,1.6-3.353,4.045-3.353,6.705  c0,4.623,3.762,8.382,8.383,8.382s8.383-3.759,8.383-8.382C23.383,13.387,22.161,10.942,20.03,9.343z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="5.4111" y2="24.9469">
 <stop offset="0" style="stop-color:#FFFFFF"/>
 <stop offset="0.5273" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CAD1D4"/>
+<stop offset="1" style="stop-color:#CDD1CF"/>
 </linearGradient>
 <path d="M15,15.699c0.771,0,1.396-0.626,1.396-1.398V6.967c0-0.772-0.625-1.396-1.396-1.396  s-1.396,0.623-1.396,1.396v7.334C13.604,15.073,14.229,15.699,15,15.699z" fill="url(#SVGID_3_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_received.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_received.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_received.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,14 +5,14 @@
 <rect fill="none" height="30" width="30"/>
 <polygon fill-opacity="0.6" points="2.865,15 10,15 10,1 20,1 20,15 27.135,15 15,29.563 " stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.8545" y2="28.0011">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="0.7576" style="stop-color:#4CB400"/>
-<stop offset="1" style="stop-color:#89CC6A"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="0.7576" style="stop-color:#367E3C"/>
+<stop offset="1" style="stop-color:#97AF87"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="19,16 19,2 11,2 11,16 5,16 15,28 25,16 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="2.8687" y2="26.4384">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="7.135,17 12,17 12,3 18,3 18,17 22.865,17 15,26.438 "/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_record.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_record.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_record.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -9,8 +9,8 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#DE5229"/>
-<stop offset="1" style="stop-color:#D81A00"/>
+<stop offset="0" style="stop-color:#A8715F"/>
+<stop offset="1" style="stop-color:#974441"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_refresh.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_refresh.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_refresh.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,13 +5,13 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M27.799,26.385l-4.348-4.349C25.102,20.063,26,17.6,26,15c0-5.405-4.033-10.077-9.382-10.869l-1.033-0.153  l0.183-1.766L2.201,3.615l4.348,4.348C4.898,9.937,4,12.4,4,15c0,5.405,4.033,10.077,9.382,10.869l1.033,0.153l-0.183,1.766  L27.799,26.385z M14.004,20.909C11.104,20.421,9,17.936,9,15c0-1.251,0.395-2.45,1.125-3.462l4.239,4.241l0.708-6.845l0.925,0.156  C18.896,9.579,21,12.063,21,15c0,1.256-0.392,2.458-1.117,3.469l-4.247-4.247l-0.708,6.844L14.004,20.909z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.0454" x2="24.9205" y1="5.4551" y2="26.3301">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <path d="M8,15c0-1.931,0.799-3.666,2.068-4.932l3.518,3.518l1.061-10.253L4.394,4.394l3.538,3.538  C6.122,9.741,5,12.239,5,15c0,5.021,3.705,9.166,8.528,9.88l0.309-2.984C10.53,21.338,8,18.462,8,15z" fill="url(#SVGID_1_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5.4556" x2="26.3306" y1="4.0459" y2="24.921">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <path d="M16.414,16.414l-1.061,10.253l10.253-1.061l-3.538-3.539C23.878,20.259,25,17.762,25,15  c0-5.021-3.705-9.166-8.528-9.88l-0.309,2.984C19.47,8.661,22,11.538,22,15c0,1.93-0.793,3.673-2.061,4.939L16.414,16.414z" fill="url(#SVGID_2_)"/>
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="14.507,4.681 14.646,3.333 4.394,4.394 5.602,5.602 " stroke-opacity="0.4"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reminder.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reminder.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reminder.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,37 +5,37 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M4.97,9.928c1.073-1.074,2.104-1.602,3.937-1.109l3.82-3.82c2.777-2.777,6.931-3.346,10.283-1.727  c1.171-0.836,2.809-0.737,3.858,0.313c1.051,1.051,1.149,2.688,0.313,3.859c1.619,3.353,1.05,7.506-1.728,10.283l-3.819,3.82  c0.493,1.833-0.035,2.863-1.109,3.937l-2.143,2.143l-4.456-4.456c-1.745,0.771-3.913,0.33-5.443-1.201  c-1.53-1.529-1.972-3.697-1.2-5.442L2.827,12.07L4.97,9.928z" fill-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 -1585.0613 -656.5991)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1608.3745" x2="-1605.019" y1="-670.4932" y2="-670.4932">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.24" style="stop-color:#FFE692"/>
-<stop offset="0.75" style="stop-color:#ED8C0D"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+<stop offset="0" style="stop-color:#C2A770"/>
+<stop offset="0.24" style="stop-color:#DED7B3"/>
+<stop offset="0.75" style="stop-color:#AA8250"/>
+<stop offset="1" style="stop-color:#BCA162"/>
 </linearGradient>
 <path d="M22.626,4.998l0.707-0.707c0.777-0.777,2.051-0.777,2.828,0c0.778,0.779,0.777,2.051,0,2.829  l-0.707,0.707L22.626,4.998z" fill="url(#SVGID_1_)"/>
-<path d="M23.333,4.291c0.205-0.205,0.445-0.352,0.702-0.449c0.502,0.33,0.978,0.716,1.419,1.156  c0.441,0.441,0.826,0.918,1.157,1.42c-0.098,0.256-0.245,0.497-0.45,0.702l-0.707,0.707l-2.828-2.829L23.333,4.291z" fill="#873900" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M23.333,4.291c0.205-0.205,0.445-0.352,0.702-0.449c0.502,0.33,0.978,0.716,1.419,1.156  c0.441,0.441,0.826,0.918,1.157,1.42c-0.098,0.256-0.245,0.497-0.45,0.702l-0.707,0.707l-2.828-2.829L23.333,4.291z" fill="#5E2D29" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 -1585.0613 -656.5991)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1613.5698" x2="-1600.1477" y1="-661.9927" y2="-661.9927">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.24" style="stop-color:#FFE692"/>
-<stop offset="0.75" style="stop-color:#ED8C0D"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+<stop offset="0" style="stop-color:#C2A770"/>
+<stop offset="0.24" style="stop-color:#DED7B3"/>
+<stop offset="0.75" style="stop-color:#AA8250"/>
+<stop offset="1" style="stop-color:#BCA162"/>
 </linearGradient>
 <path d="M19.09,22.676l5.657-5.656c3.119-3.119,3.119-8.195,0-11.314s-8.194-3.119-11.313,0l-5.657,5.658  L19.09,22.676z" fill="url(#SVGID_2_)"/>
 <path d="M24.747,5.705c3.119,3.119,3.119,8.195,0,11.314l-0.707,0.707  c3.119-3.119,3.119-8.194,0-11.313s-8.194-3.119-11.313,0l0.707-0.708C16.553,2.586,21.628,2.586,24.747,5.705z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 -1585.0613 -656.5991)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1615.3008" x2="-1598.524" y1="-653.4927" y2="-653.4927">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.24" style="stop-color:#FFE692"/>
-<stop offset="0.75" style="stop-color:#ED8C0D"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+<stop offset="0" style="stop-color:#C2A770"/>
+<stop offset="0.24" style="stop-color:#DED7B3"/>
+<stop offset="0.75" style="stop-color:#AA8250"/>
+<stop offset="1" style="stop-color:#BCA162"/>
 </linearGradient>
 <path d="M9.19,9.949l11.314,11.313c0.685,1.913,0.191,2.637-0.687,3.515l-1.436,1.436L4.241,12.07  l1.436-1.436C6.555,9.756,7.278,9.264,9.19,9.949z" fill="url(#SVGID_3_)"/>
-<rect fill="#873900" fill-opacity="0.2" height="1" stroke-opacity="0.2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 15.1665 36.7847)" width="16" x="7.201" y="14.752"/>
-<rect fill="#753200" fill-opacity="0.1" height="1" stroke-opacity="0.1" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 6.6295 40.3212)" width="19.999" x="1.666" y="18.288"/>
+<rect fill="#5E2D29" fill-opacity="0.2" height="1" stroke-opacity="0.2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 15.1665 36.7847)" width="16" x="7.201" y="14.752"/>
+<rect fill="#522523" fill-opacity="0.1" height="1" stroke-opacity="0.1" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 6.6295 40.3212)" width="19.999" x="1.666" y="18.288"/>
 <linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 -1585.0613 -656.5991)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1606.6431" x2="-1606.6431" y1="-647.9927" y2="-650.8915">
-<stop offset="0" style="stop-color:#F56700"/>
-<stop offset="1" style="stop-color:#EF2D00"/>
+<stop offset="0" style="stop-color:#AB704A"/>
+<stop offset="1" style="stop-color:#A75648"/>
 </linearGradient>
 <path d="M14.1,21.929c-1.396,1.001-3.485,0.757-4.909-0.667c-1.423-1.424-1.667-3.514-0.666-4.908  L14.1,21.929z" fill="url(#SVGID_4_)"/>
-<path d="M8.071,17.314c0.101-0.342,0.243-0.668,0.453-0.961l5.575,5.575  c-0.293,0.21-0.62,0.353-0.961,0.453L8.071,17.314z" fill="#753200" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M20.818,22.99L7.462,9.635C7.918,9.6,8.47,9.689,9.19,9.949l11.314,11.313  C20.763,21.983,20.853,22.535,20.818,22.99z" fill="#FFF6C9" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M8.071,17.314c0.101-0.342,0.243-0.668,0.453-0.961l5.575,5.575  c-0.293,0.21-0.62,0.353-0.961,0.453L8.071,17.314z" fill="#522523" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M20.818,22.99L7.462,9.635C7.918,9.6,8.47,9.689,9.19,9.949l11.314,11.313  C20.763,21.983,20.853,22.535,20.818,22.99z" fill="#EFEDD9" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill="none" height="30" width="30" x="0.453"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -12,8 +12,8 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="2.6978" x2="23.286" y1="3.7852" y2="24.3734">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat_exception.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat_exception.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat_exception.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,8 +5,8 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15.05,28.784c-3.378,0-6.554-1.315-8.942-3.704c-4.692-4.693-4.918-12.188-0.68-17.151L0.505,3.006  L15.76,1.428l-1.578,15.255l-4.847-4.847c-0.931,1.231-1.434,2.727-1.434,4.302c0,1.913,0.743,3.709,2.092,5.058  c1.348,1.348,3.145,2.091,5.058,2.091s3.709-0.743,5.058-2.091c2.788-2.789,2.788-7.327,0-10.115l-0.707-0.707l3.884-3.887  l0.707,0.708c4.931,4.931,4.931,12.955,0,17.886C21.604,27.469,18.428,28.784,15.05,28.784L15.05,28.784z" fill-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="2.6978" x2="23.286" y1="3.7852" y2="24.3734">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <path d="M23.285,7.901l-2.47,2.472c3.178,3.178,3.178,8.351,0,11.529c-3.179,3.178-8.352,3.178-11.529,0  c-3.18-3.179-3.18-8.352,0-11.529l4.117,4.117l1.235-11.941L2.697,3.784l4.117,4.117c-4.549,4.55-4.549,11.922,0,16.472  c4.549,4.548,11.922,4.548,16.471,0C27.834,19.823,27.834,12.451,23.285,7.901z" fill="url(#SVGID_1_)"/>
 <path d="M5.905,8.935c-1.874,2.376-2.694,5.308-2.456,8.174c0.22-2.649,1.338-5.237,3.365-7.266  L5.905,8.935z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
@@ -21,9 +21,9 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="339.8" x2="339.8" y1="-397.3" y2="-425.3">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.2606" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.2606" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -9,8 +9,8 @@
 <rect fill="#FFFFFF" fill-opacity="0.5" height="1.135" stroke-opacity="0.5" width="14" x="14" y="11"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="4.8848" y2="25.2603">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply_all.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply_all.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply_all.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,13 +6,13 @@
 <rect fill="none" height="30" width="30"/>
 <polygon fill-opacity="0.6" points="17.81,7.626,17.81,0.938,4.161,12.31,6.692,14.42,1.348,18.88,15,30.25,15,23.56,28.12,23.56,28.12,15.13,28.12,14.19,28.12,7.626" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="16.41" x2="16.41" y1="2.87" y2="14.34">
-<stop offset="0" stop-color="#86D100"/>
-<stop offset="1" stop-color="#2F9600"/>
+<stop offset="0" stop-color="#59923F"/>
+<stop offset="1" stop-color="#2D6943"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1)" points="15,7.5,15,14.19,27.19,14.19,27.19,8.564,16.88,8.564,16.88,2.939,5.625,12.31,7.424,13.81"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15" x2="15" y1="9.39" y2="28.5">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
+<stop offset="0" stop-color="#85AE4A"/>
+<stop offset="1" stop-color="#2F6F44"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2)" points="14.06,22.63,27.19,22.63,27.19,15.13,14.06,15.13,14.06,9.501,2.813,18.88,14.06,28.25"/>
 <polygon fill="#FFFFFF" fill-opacity="0.5" points="14.06,10.56,14.06,9.501,2.813,18.88,3.451,19.41" stroke-opacity="0.5"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_rgb.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_rgb.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_rgb.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,11 +4,11 @@
 <g>
 <rect fill="none" height="30" width="30"/>
 <path d="M15,15c-3.859,0-7-3.141-7-7s3.141-7,7-7c3.859,0,7,3.141,7,7S18.859,15,15,15L15,15z" fill-opacity="0.6"/>
-<path d="M15,14c-3.309,0-6-2.691-6-6s2.691-6,6-6c3.31,0,6,2.691,6,6S18.311,14,15,14L15,14z" fill="#FF0000"/>
+<path d="M15,14c-3.309,0-6-2.691-6-6s2.691-6,6-6c3.31,0,6,2.691,6,6S18.311,14,15,14L15,14z" fill="#B34D4D"/>
 <path d="M8,28c-3.859,0-7-3.141-7-7s3.141-7,7-7s7,3.141,7,7S11.86,28,8,28L8,28z" fill-opacity="0.6"/>
-<circle cx="8" cy="21" fill="#00FF00" r="6"/>
+<circle cx="8" cy="21" fill="#4DB34D" r="6"/>
 <path d="M22,28c-3.859,0-7-3.141-7-7s3.14-7,7-7s7,3.141,7,7S25.859,28,22,28L22,28z" fill-opacity="0.6"/>
-<circle cx="22" cy="21" fill="#0000FF" r="6"/>
+<circle cx="22" cy="21" fill="#4D4DB3" r="6"/>
 <rect fill="none" height="30" width="30" x="0"/>
 <rect fill="none" height="30" width="30" x="0"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,7 +4,7 @@
 <g>
 <rect fill="none" fill-opacity="0.5" height="30" stroke-opacity="0.5" width="30"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
-<stop offset="0" stop-color="#E0E1E2"/>
+<stop offset="0" stop-color="#E1E1E1"/>
 <stop offset="1" stop-color="#FFFFFF"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
@@ -14,8 +14,8 @@
 <path d="M0,0v30h30v-30h-30zm29,29h-28v-28h28v28z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <polygon fill-opacity="0.6" points="11.89,22.98,4.213,15.31,8.303,11.22,12.54,15.46,21.7,6.31,25.79,10.4,12.49,23.69" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="6.972" y2="23.64">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
+<stop offset="0" stop-color="#85AE4A"/>
+<stop offset="1" stop-color="#2F6F44"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="24.37,10.4,21.7,7.724,12.54,16.88,8.303,12.63,5.627,15.31,12.54,22.22,12.54,22.21,12.55,22.22"/>
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="8.303,13.63,12.54,17.88,21.7,8.724,23.87,10.9,24.37,10.4,21.7,7.724,12.54,16.88,8.303,12.63,5.627,15.31,6.127,15.81" stroke-opacity="0.4"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_disabled.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_disabled.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<rect fill="#B4B4B4" height="30" width="30"/>
+<polyline fill="#DCDCDC" points="28,11 28,28 2,28 2,2 28,2 28,11 "/>
+<polygon fill="#B4B4B4" points="24.371,10.399 21.695,7.724 12.545,16.876 8.303,12.634 5.627,15.31 12.54,22.22 12.545,22.212   12.551,22.22 "/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_highlight.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_highlight.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_highlight.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,26 +2,26 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
-<rect fill-opacity="0.6" height="30" stroke-opacity="0.6" width="30"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#16A0D4"/>
+<rect fill-opacity="0.6" height="30" width="30"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -289.4805 -383.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="304.4795" x2="304.4795" y1="-384.2393" y2="-412.4603">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="3.188" y2="27.38">
-<stop offset="0" stop-color="#E0E1E2"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -289.4805 -383.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="304.4795" x2="304.4795" y1="-386.209" y2="-410.401">
+<stop offset="0" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="24" width="24" x="3" y="3"/>
-<path d="M3,3v24h2v-20c0-0.55,0.45-1,1-1h18c0.55,0,1,0.45,1,1v20h2v-24h-24z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M3,3v24h1v-21c0-0.55,0.45-1,1-1h20c0.55,0,1,0.45,1,1v21h1v-24h-24z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="24" x="3" y="3"/>
-<polygon fill-opacity="0.6" points="11.89,22.98,4.213,15.31,8.303,11.22,12.54,15.46,21.7,6.31,25.79,10.4,12.49,23.69" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="6.972" y2="23.64">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
+<path d="M3,3v24h2V7c0-0.55,0.45-1,1-1h18c0.55,0,1,0.45,1,1v20h2V3H3z" fill-opacity="0.05"/>
+<path d="M3,3v24h1V6c0-0.55,0.45-1,1-1h20c0.55,0,1,0.45,1,1v21h1V3H3z" fill-opacity="0.1"/>
+<rect fill-opacity="0.1" height="1" width="24" x="3" y="3"/>
+<polygon fill-opacity="0.6" points="11.89,22.98 4.213,15.31 8.303,11.22 12.54,15.46 21.7,6.31 25.79,10.4 12.49,23.689 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -289.4805 -383.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="304.4785" x2="304.4785" y1="-389.9922" y2="-406.6607">
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
-<polygon fill="url(#SVGID_3_)" points="24.37,10.4,21.7,7.724,12.54,16.88,8.303,12.63,5.627,15.31,12.54,22.22,12.54,22.21,12.55,22.22"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="8.303,13.63,12.54,17.88,21.7,8.724,23.87,10.9,24.37,10.4,21.7,7.724,12.54,16.88,8.303,12.63,5.627,15.31,6.127,15.81" stroke-opacity="0.4"/>
+<polygon fill="url(#SVGID_3_)" points="24.37,10.4 21.7,7.724 12.54,16.88 8.303,12.63 5.627,15.31 12.54,22.221 12.54,22.21   12.55,22.221 "/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="8.303,13.63 12.54,17.88 21.7,8.724 23.87,10.9 24.37,10.4 21.7,7.724   12.54,16.88 8.303,12.63 5.627,15.31 6.127,15.811 "/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_partial.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_partial.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_partial.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,7 +3,7 @@
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
-<stop offset="0" stop-color="#E0E1E2"/>
+<stop offset="0" stop-color="#E1E1E1"/>
 <stop offset="1" stop-color="#FFFFFF"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
@@ -13,15 +13,15 @@
 <path d="M0,0v30h30v-30h-30zm29,29h-28v-28h28v28z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <rect fill-opacity="0.4" height="18" stroke-opacity="0.4" width="18" x="6" y="6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="7.125" y2="23.25">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
+<stop offset="0" stop-color="#85AE4A"/>
+<stop offset="1" stop-color="#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="16" width="16" x="7" y="7"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="7" y2="23">
-<stop offset="0" stop-color="#D6FF8C"/>
-<stop offset="0.3394" stop-color="#7AD900"/>
-<stop offset="0.6182" stop-color="#5BC000"/>
-<stop offset="1" stop-color="#96DB00"/>
+<stop offset="0" stop-color="#D1DDAF"/>
+<stop offset="0.3394" stop-color="#5B9841"/>
+<stop offset="0.6182" stop-color="#3D863A"/>
+<stop offset="1" stop-color="#679942"/>
 </linearGradient>
 <path d="M22,8v14h-14v-14h14m1-1h-16v16h16v-16z" fill="url(#SVGID_3_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sent.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sent.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sent.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,15 +4,14 @@
 <g>
 <rect fill="none" height="30" width="30"/>
 <polygon fill-opacity="0.6" points="10,29 10,15 2.865,15 15,0.438 27.135,15 20,15 20,29 " stroke-opacity="0.6"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 0 682)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="653.8545" y2="680.0006">
-<stop offset="0" style="stop-color:#57CDFF"/>
-<stop offset="0.2788" style="stop-color:#19A3D6"/>
-<stop offset="1" style="stop-color:#4EDEFF"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -289.4805 252.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="304.4805" x2="304.4805" y1="-251.1265" y2="-224.9803">
+<stop offset="0" style="stop-color:#65AEBD"/>
+<stop offset="1" style="stop-color:#526085"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="19,14 19,28 11,28 11,14 5,14 15,2 25,14 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 0 682)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="654.8691" y2="678.4384">
-<stop offset="0" style="stop-color:#048CC6"/>
-<stop offset="1" style="stop-color:#4EDEFF"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -289.4805 252.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="304.4805" x2="304.4805" y1="-249.5488" y2="-225.9795">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="7.135,13 12,13 12,27 18,27 18,13 22.865,13 15,3.563 "/>
 <rect fill="none" height="30" width="30"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,14 +4,14 @@
 <g>
 <polygon fill-opacity="0.6" points="0.149,23.029 10.737,16.228 10.737,20.374 20.562,20.374 20.562,14 26,14 26,25.687   10.737,25.687 10.737,29.831 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="13.4995" x2="13.4995" y1="2.3745" y2="28.1255">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="1" style="stop-color:#EF6902"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="1" style="stop-color:#A86F49"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="21.562,15 21.562,21.374 9.737,21.374 9.737,18.059 2,23.029 9.737,28 9.737,24.687   25,24.687 25,15 "/>
 <polygon fill-opacity="0.6" points="4,16 4,4.313 19.263,4.313 19.263,0.169 29.851,6.971 19.263,13.772 19.263,9.626 9.438,9.626   9.438,16 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="16.5" x2="16.5" y1="2.375" y2="28.125">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="1" style="stop-color:#EF6902"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="1" style="stop-color:#A86F49"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="8.438,15 8.438,8.626 20.263,8.626 20.263,11.941 28,6.971 20.263,2 20.263,5.313 5,5.313   5,15 "/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3.438" x="21.562" y="15"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle_off.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle_off.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_shuffle_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,14 +4,14 @@
 <g>
 <polygon fill-opacity="0.6" points="0.149,23.029 10.737,16.228 10.737,20.374 20.562,20.374 20.562,14 26,14 26,25.687   10.737,25.687 10.737,29.831 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="13.4995" x2="13.4995" y1="2.3745" y2="28.1255">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="1" style="stop-color:#EF6902"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="1" style="stop-color:#A86F49"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="21.562,15 21.562,21.374 9.737,21.374 9.737,18.059 2,23.029 9.737,28 9.737,24.687   25,24.687 25,15 "/>
 <polygon fill-opacity="0.6" points="4,16 4,4.313 19.263,4.313 19.263,0.169 29.851,6.971 19.263,13.772 19.263,9.626 9.438,9.626   9.438,16 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="16.5" x2="16.5" y1="2.375" y2="28.125">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="1" style="stop-color:#EF6902"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="1" style="stop-color:#A86F49"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="8.438,15 8.438,8.626 20.263,8.626 20.263,11.941 28,6.971 20.263,2 20.263,5.313 5,5.313   5,15 "/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3.438" x="21.562" y="15"/>
@@ -29,9 +29,9 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="339.8" x2="339.8" y1="-397.3" y2="-425.3">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.2606" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.2606" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_good.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_good.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_good.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,20 +5,20 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill-opacity="0.6" height="12" width="8" x="1" y="15"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="3.9995" y2="25.752">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="10" width="6" x="2" y="16"/>
 <rect fill-opacity="0.6" height="18" width="8" x="11" y="9"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="4" y2="25.752">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="16" width="6" x="12" y="10"/>
 <rect fill-opacity="0.6" height="24" width="8" x="21" y="3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="25" x2="25" y1="4" y2="25.7519">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <rect fill="url(#SVGID_3_)" height="22" width="6" x="22" y="4"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="2" y="16"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_low.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_low.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_low.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,8 +5,8 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill-opacity="0.6" height="12" width="8" x="1" y="15"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="16" y2="26.1378">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+<stop offset="0" style="stop-color:#A8835F"/>
+<stop offset="1" style="stop-color:#9A5047"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="10" width="6" x="2" y="16"/>
 <rect fill-opacity="0.6" height="18" width="8" x="11" y="9"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_medium.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_medium.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_medium.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,14 +5,14 @@
 <rect fill="none" height="30" width="30"/>
 <rect fill-opacity="0.6" height="12" width="8" x="1" y="15"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="9.7495" y2="25.5003">
-<stop offset="0" style="stop-color:#FECF5E"/>
-<stop offset="1" style="stop-color:#FF9E01"/>
+<stop offset="0" style="stop-color:#CEBF8E"/>
+<stop offset="1" style="stop-color:#B38C4D"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="10" width="6" x="2" y="16"/>
 <rect fill-opacity="0.6" height="18" width="8" x="11" y="9"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="9.75" y2="25.5005">
-<stop offset="0" style="stop-color:#FECF5E"/>
-<stop offset="1" style="stop-color:#FF9E01"/>
+<stop offset="0" style="stop-color:#CEBF8E"/>
+<stop offset="1" style="stop-color:#B38C4D"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="16" width="6" x="12" y="10"/>
 <rect fill-opacity="0.6" height="24" width="8" x="21" y="3"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sisx.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sisx.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sisx.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -17,8 +17,8 @@
 <path d="M11.065,19.038C11.034,19.206,11,19.373,11,19.548c0,1.274,1.141,1.955,2.225,2.586v-1  C12.289,20.59,11.316,20.006,11.065,19.038z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill-opacity="0.6" height="12" stroke-opacity="0.6" width="12" x="17" y="16"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="23" x2="23" y1="17" y2="27">
-<stop offset="0" style="stop-color:#DE6929"/>
-<stop offset="1" style="stop-color:#D9340F"/>
+<stop offset="0" style="stop-color:#A87A5F"/>
+<stop offset="1" style="stop-color:#9C564C"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="10" width="10" x="18" y="17"/>
 <rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="10" x="18" y="17"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_angry.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_angry.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_angry.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,40 +7,40 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="14.8193" cy="9.7041" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="18.1413">
-<stop offset="0" style="stop-color:#FF6855"/>
-<stop offset="1" style="stop-color:#CC0E06"/>
+<stop offset="0" style="stop-color:#CC9A88"/>
+<stop offset="1" style="stop-color:#914145"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28  z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15  c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="10.3823" y2="16.7968">
-<stop offset="0" style="stop-color:#D82E09"/>
-<stop offset="1" style="stop-color:#FACCB9"/>
+<stop offset="0" style="stop-color:#9A5047"/>
+<stop offset="1" style="stop-color:#E7DBCC"/>
 </linearGradient>
 <path d="M8.5,17C7.074,17,6,15.495,6,13.5S7.074,10,8.5,10s2.5,1.505,2.5,3.5S9.926,17,8.5,17L8.5,17z" fill="url(#SVGID_2_)"/>
-<ellipse cx="8.5" cy="13.5" fill="#0C3554" rx="1.5" ry="2.5"/>
+<ellipse cx="8.5" cy="13.5" fill="#22243E" rx="1.5" ry="2.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.583" x2="8.583" y1="12.9707" y2="16.1465">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#82969E"/>
 </linearGradient>
 <path d="M7.166,14.623C7.414,15.437,7.915,16,8.5,16c0.828,0,1.5-1.119,1.5-2.5  c0-0.155-0.012-0.305-0.027-0.452C9.819,13.018,9.662,13,9.5,13C8.43,13,7.522,13.677,7.166,14.623z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="21.5" x2="21.5" y1="9.9517" y2="17.1103">
-<stop offset="0" style="stop-color:#D82E09"/>
-<stop offset="1" style="stop-color:#FACCB9"/>
+<stop offset="0" style="stop-color:#9A5047"/>
+<stop offset="1" style="stop-color:#E7DBCC"/>
 </linearGradient>
 <path d="M21.5,17c-1.426,0-2.5-1.505-2.5-3.5s1.074-3.5,2.5-3.5s2.5,1.505,2.5,3.5S22.926,17,21.5,17L21.5,17  z" fill="url(#SVGID_4_)"/>
-<ellipse cx="21.5" cy="13.5" fill="#0C3554" rx="1.5" ry="2.5"/>
+<ellipse cx="21.5" cy="13.5" fill="#22243E" rx="1.5" ry="2.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.583" x2="21.583" y1="13.0908" y2="16.2688">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#82969E"/>
 </linearGradient>
 <path d="M20.166,14.623C20.414,15.437,20.915,16,21.5,16c0.828,0,1.5-1.119,1.5-2.5  c0-0.155-0.012-0.305-0.027-0.452C22.819,13.018,22.662,13,22.5,13C21.43,13,20.522,13.677,20.166,14.623z" fill="url(#SVGID_5_)"/>
 <ellipse cx="8.258" cy="11.352" fill-opacity="0.2" rx="4.361" ry="1.541" stroke-opacity="0.2" transform="matrix(0.9259 0.3777 -0.3777 0.9259 4.8993 -2.2783)"/>
-<ellipse cx="8.26" cy="10.89" fill="#3B2314" rx="4.361" ry="1" transform="matrix(0.9259 0.3777 -0.3777 0.9259 4.7258 -2.3134)"/>
+<ellipse cx="8.26" cy="10.89" fill="#2F2021" rx="4.361" ry="1" transform="matrix(0.9259 0.3777 -0.3777 0.9259 4.7258 -2.3134)"/>
 <ellipse cx="21.92" cy="11.352" fill-opacity="0.2" rx="4.36" ry="1.541" stroke-opacity="0.2" transform="matrix(-0.9259 0.3777 -0.3777 -0.9259 46.5039 13.5832)"/>
-<ellipse cx="21.918" cy="10.89" fill="#3B2314" rx="4.36" ry="1" transform="matrix(-0.9259 0.3778 -0.3778 -0.9259 46.3259 12.6935)"/>
+<ellipse cx="21.918" cy="10.89" fill="#2F2021" rx="4.36" ry="1" transform="matrix(-0.9259 0.3778 -0.3778 -0.9259 46.3259 12.6935)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9995" x2="14.9995" y1="18.0986" y2="25.1188">
-<stop offset="0" style="stop-color:#942006"/>
-<stop offset="1" style="stop-color:#FFAA5C"/>
+<stop offset="0" style="stop-color:#693134"/>
+<stop offset="1" style="stop-color:#CEB28D"/>
 </linearGradient>
 <path d="M24,22.9c0,1.933-4.029,2.1-9,2.1s-9-0.167-9-2.1c0-1.934,4.029-4.9,9-4.9S24,20.967,24,22.9z" fill="url(#SVGID_6_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9995" x2="14.9995" y1="19.1426" y2="23.9429">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_bigsmile.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_bigsmile.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_bigsmile.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -10,32 +10,32 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13  C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13  C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.7505" x2="8.7505" y1="7.9351" y2="14.8952">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M11,15c-0.754,0-1.394-0.564-1.487-1.313C9.3,12,8.874,12,8.691,12c-0.134,0-0.49,0-0.703,1.688  C7.894,14.436,7.254,15,6.5,15H6.443l-0.118-0.01c-0.41-0.052-0.765-0.253-1.01-0.57c-0.246-0.317-0.354-0.71-0.304-1.108  C5.424,10.036,6.893,8,8.846,8c1.111,0,3.063,0.69,3.644,5.313c0.05,0.396-0.058,0.79-0.304,1.107  c-0.245,0.316-0.6,0.518-0.997,0.568l-0.063,0.008L11,15z" fill="url(#SVGID_2_)"/>
-<path d="M11,14c-0.248,0-0.464-0.185-0.495-0.438C10.214,11.249,9.371,11,8.691,11s-1.404,0.249-1.695,2.563  c-0.034,0.273-0.273,0.466-0.559,0.434c-0.273-0.035-0.468-0.285-0.434-0.559C6.343,10.742,7.458,9,8.846,9s2.313,1.742,2.651,4.438  c0.034,0.274-0.16,0.524-0.434,0.559C11.042,13.999,11.021,14,11,14L11,14z" fill="#0C3554"/>
+<path d="M11,14c-0.248,0-0.464-0.185-0.495-0.438C10.214,11.249,9.371,11,8.691,11s-1.404,0.249-1.695,2.563  c-0.034,0.273-0.273,0.466-0.559,0.434c-0.273-0.035-0.468-0.285-0.434-0.559C6.343,10.742,7.458,9,8.846,9s2.313,1.742,2.651,4.438  c0.034,0.274-0.16,0.524-0.434,0.559C11.042,13.999,11.021,14,11,14L11,14z" fill="#22243E"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -566.5 0)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-587.7495" x2="-587.7495" y1="7.9351" y2="14.8952">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M19,15c0.754,0,1.394-0.564,1.487-1.313C20.7,12,21.126,12,21.309,12c0.134,0,0.49,0,0.703,1.688  C22.106,14.436,22.746,15,23.5,15h0.057l0.118-0.01c0.41-0.052,0.765-0.253,1.01-0.57c0.246-0.317,0.354-0.71,0.304-1.108  C24.576,10.036,23.107,8,21.154,8c-1.111,0-3.063,0.69-3.644,5.313c-0.05,0.396,0.058,0.79,0.304,1.107  c0.245,0.316,0.6,0.518,0.997,0.568l0.063,0.008L19,15z" fill="url(#SVGID_3_)"/>
-<path d="M19,14c0.248,0,0.464-0.185,0.495-0.438C19.786,11.249,20.629,11,21.309,11s1.404,0.249,1.695,2.563  c0.034,0.273,0.273,0.466,0.559,0.434c0.273-0.035,0.468-0.285,0.434-0.559C23.657,10.742,22.542,9,21.154,9  s-2.313,1.742-2.651,4.438c-0.034,0.274,0.16,0.524,0.434,0.559C18.958,13.999,18.979,14,19,14L19,14z" fill="#0C3554"/>
+<path d="M19,14c0.248,0,0.464-0.185,0.495-0.438C19.786,11.249,20.629,11,21.309,11s1.404,0.249,1.695,2.563  c0.034,0.273,0.273,0.466,0.559,0.434c0.273-0.035,0.468-0.285,0.434-0.559C23.657,10.742,22.542,9,21.154,9  s-2.313,1.742-2.651,4.438c-0.034,0.274,0.16,0.524,0.434,0.559C18.958,13.999,18.979,14,19,14L19,14z" fill="#22243E"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15" x2="15" y1="15.9014" y2="27.1496">
-<stop offset="0" style="stop-color:#D48D00"/>
-<stop offset="1" style="stop-color:#FFF1B8"/>
+<stop offset="0" style="stop-color:#946C40"/>
+<stop offset="1" style="stop-color:#EAE6CD"/>
 </linearGradient>
 <path d="M15,16c-6,0-10.945,1-10.945,1C4.561,22.605,9.265,27,15,27c5.734,0,10.439-4.395,10.945-10  C25.945,17,21,16,15,16z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="16.9189" y2="26.1216">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+<stop offset="0" style="stop-color:#31151D"/>
+<stop offset="1" style="stop-color:#76464D"/>
 </linearGradient>
 <path d="M4.055,17C4.561,22.045,9.265,26,15,26c5.734,0,10.439-3.955,10.945-9H4.055z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="6.3335" x2="23.505" y1="19" y2="19">
@@ -46,8 +46,8 @@
 <polygon fill="url(#SVGID_6_)" points="23,20 7,20 6,18 24,18 "/>
 <polygon fill-opacity="0.2" points="23.5,19 24,18 6,18 6.5,19 " stroke-opacity="0.2"/>
 <radialGradient cx="14.9717" cy="20.0801" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="5.1583">
-<stop offset="0" style="stop-color:#CC1900"/>
-<stop offset="1" style="stop-color:#950A04"/>
+<stop offset="0" style="stop-color:#8F3E3D"/>
+<stop offset="1" style="stop-color:#6A3039"/>
 </radialGradient>
 <ellipse cx="15" cy="23.5" fill="url(#SVGID_7_)" rx="5" ry="1.5"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_cry.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_cry.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_cry.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,40 +7,40 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28  z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15  c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <ellipse cx="22.92" cy="7.352" fill-opacity="0.2" rx="4.361" ry="1.541" stroke-opacity="0.2" transform="matrix(0.9259 0.3777 -0.3777 0.9259 4.4746 -8.1124)"/>
-<ellipse cx="22.922" cy="6.89" fill="#3B2314" rx="4.361" ry="1" transform="matrix(0.9259 0.3777 -0.3777 0.9259 4.3011 -8.1483)"/>
+<ellipse cx="22.922" cy="6.89" fill="#2F2021" rx="4.361" ry="1" transform="matrix(0.9259 0.3777 -0.3777 0.9259 4.3011 -8.1483)"/>
 <ellipse cx="6.92" cy="7.173" fill-opacity="0.2" rx="4.361" ry="1.541" stroke-opacity="0.2" transform="matrix(-0.9259 0.3777 -0.3777 -0.9259 16.0374 11.2006)"/>
-<ellipse cx="6.918" cy="6.711" fill="#3B2314" rx="4.361" ry="1" transform="matrix(-0.9259 0.3777 -0.3777 -0.9259 15.8594 10.3117)"/>
+<ellipse cx="6.918" cy="6.711" fill="#2F2021" rx="4.361" ry="1" transform="matrix(-0.9259 0.3777 -0.3777 -0.9259 15.8594 10.3117)"/>
 <path d="M23.501,23c-0.169,0-0.335-0.086-0.429-0.241C21.691,20.476,18.71,20,15.476,20  s-6.216,0.476-7.597,2.759c-0.144,0.235-0.451,0.312-0.688,0.169s-0.312-0.45-0.168-0.687C8.604,19.625,11.844,18,15.476,18  s6.871,1.625,8.452,4.241c0.144,0.236,0.068,0.544-0.168,0.687C23.678,22.977,23.589,23,23.501,23L23.501,23z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M23.501,22c-0.169,0-0.335-0.086-0.429-0.241C21.691,19.476,18.71,18,15.476,18s-6.216,1.476-7.597,3.759  c-0.144,0.235-0.451,0.312-0.688,0.169s-0.312-0.45-0.168-0.687C8.604,18.625,11.844,17,15.476,17s6.871,1.625,8.452,4.241  c0.144,0.236,0.068,0.544-0.168,0.687C23.678,21.977,23.589,22,23.501,22L23.501,22z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M6.563,13.688c-0.396,0.724-1.43,1.504-1.656,3.094c-0.167,1.178,0.756,3.182,0.438,4.438  c-0.815,3.219-0.67,4.492,0.438,4.719c1.219,0.25,2.622-2.725,3-4.906C8.998,19.787,8.345,18.11,8.625,17  c0.275-1.088,1.746-2.412,2.438-3.752C12.063,11.311,12,11,12,11l-4.918,0.872C7.082,11.872,7.152,12.612,6.563,13.688z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.4756" x2="15.4756" y1="17.5723" y2="22.6656">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+<stop offset="0" style="stop-color:#31151D"/>
+<stop offset="1" style="stop-color:#76464D"/>
 </linearGradient>
 <path d="M23.501,22.5c-0.169,0-0.335-0.086-0.429-0.241c-1.381-2.283-4.362-3.759-7.597-3.759  s-6.216,1.476-7.597,3.759c-0.144,0.235-0.451,0.312-0.688,0.169s-0.312-0.45-0.168-0.687c1.581-2.616,4.82-4.241,8.452-4.241  s6.871,1.625,8.452,4.241c0.144,0.236,0.068,0.544-0.168,0.687C23.678,22.477,23.589,22.5,23.501,22.5L23.501,22.5z" fill="url(#SVGID_2_)"/>
 <path d="M23.443,13.688c0.396,0.724,1.43,1.504,1.656,3.094c0.168,1.178-0.756,3.182-0.438,4.438  c0.816,3.219,0.67,4.492-0.438,4.719c-1.219,0.25-2.621-2.725-3-4.906c-0.216-1.244,0.438-2.921,0.156-4.031  c-0.275-1.088-1.746-2.412-2.438-3.752c-1-1.938-0.938-2.248-0.938-2.248l4.919,0.872C22.925,11.872,22.854,12.612,23.443,13.688z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="7.4126" x2="7.4126" y1="12.042" y2="25.838">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#83CABF"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <path d="M5.563,13.688c-0.396,0.724-1.43,1.504-1.656,3.094c-0.167,1.178,0.756,3.182,0.438,4.438  c-0.815,3.219-0.67,4.492,0.438,4.719c1.219,0.25,2.622-2.725,3-4.906C7.998,19.787,7.345,18.11,7.625,17  c0.275-1.088,1.746-2.412,2.438-3.752C11.063,11.311,11,11,11,11l-4.918,0.872C6.082,11.872,6.152,12.612,5.563,13.688z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -1800.1367 0)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1822.73" x2="-1822.73" y1="12.042" y2="25.838">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#83CABF"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <path d="M24.443,13.688c0.396,0.724,1.43,1.504,1.656,3.094c0.168,1.178-0.756,3.182-0.438,4.438  c0.816,3.219,0.67,4.492-0.438,4.719c-1.219,0.25-2.621-2.725-3-4.906c-0.216-1.244,0.438-2.921,0.156-4.031  c-0.275-1.088-1.746-2.412-2.438-3.752c-1-1.938-0.938-2.248-0.938-2.248l4.919,0.872C23.925,11.872,23.854,12.612,24.443,13.688z" fill="url(#SVGID_4_)"/>
 <path d="M11.813,9.888c0.119,0.54,0.023,1.019-0.213,1.07l-5.984,1.309  c-0.236,0.052-0.522-0.343-0.641-0.883l0,0c-0.118-0.54-0.022-1.019,0.213-1.07l5.984-1.309C11.408,8.953,11.695,9.348,11.813,9.888  L11.813,9.888z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M24.848,12.26c-0.102,0.543-0.376,0.947-0.613,0.902l-6.021-1.128c-0.237-0.045-0.347-0.521-0.245-1.063l0,0  c0.102-0.543,0.377-0.947,0.613-0.902l6.021,1.128C24.84,11.241,24.95,11.717,24.848,12.26L24.848,12.26z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M25.033,11.277c-0.103,0.543-0.377,0.947-0.615,0.902l-6.02-1.128  c-0.238-0.044-0.348-0.521-0.246-1.064l0,0c0.102-0.543,0.377-0.946,0.615-0.902l6.02,1.128  C25.024,10.259,25.135,10.734,25.033,11.277L25.033,11.277z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M24.94,11.769c-0.051,0.272-0.284,0.456-0.522,0.411l-6.02-1.128c-0.238-0.044-0.389-0.3-0.338-0.572l0,0  c0.051-0.271,0.285-0.456,0.521-0.411l6.021,1.128C24.84,11.241,24.992,11.497,24.94,11.769L24.94,11.769z" fill="#3B2314"/>
+<path d="M24.94,11.769c-0.051,0.272-0.284,0.456-0.522,0.411l-6.02-1.128c-0.238-0.044-0.389-0.3-0.338-0.572l0,0  c0.051-0.271,0.285-0.456,0.521-0.411l6.021,1.128C24.84,11.241,24.992,11.497,24.94,11.769L24.94,11.769z" fill="#2F2021"/>
 <path d="M12.026,10.865c0.118,0.54,0.022,1.019-0.214,1.07l-5.983,1.309C5.594,13.295,5.307,12.9,5.188,12.36l0,0  c-0.117-0.54-0.021-1.019,0.215-1.07l5.982-1.309C11.621,9.93,11.908,10.325,12.026,10.865L12.026,10.865z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M11.92,10.376c0.059,0.27-0.084,0.53-0.32,0.582l-5.984,1.309c-0.236,0.052-0.475-0.125-0.533-0.395l0,0  c-0.06-0.27,0.084-0.53,0.32-0.582l5.982-1.309C11.621,9.93,11.861,10.106,11.92,10.376L11.92,10.376z" fill="#3B2314"/>
+<path d="M11.92,10.376c0.059,0.27-0.084,0.53-0.32,0.582l-5.984,1.309c-0.236,0.052-0.475-0.125-0.533-0.395l0,0  c-0.06-0.27,0.084-0.53,0.32-0.582l5.982-1.309C11.621,9.93,11.861,10.106,11.92,10.376L11.92,10.376z" fill="#2F2021"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_evil.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_evil.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_evil.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,9 +7,9 @@
 </g>
 <path d="M26.827,7.531L28.439,2l-4.335,2.378C21.655,2.277,18.479,1,15,1S8.345,2.277,5.896,4.378L1.56,2l1.613,5.531  C1.804,9.694,1,12.25,1,15c0,7.732,6.268,14,14,14c7.732,0,14-6.268,14-14C29,12.25,28.196,9.694,26.827,7.531z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.4897" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.3695">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15c0-2.45,0.698-4.848,2.019-6.935L4.26,7.684L3.196,4.038l2.826,1.55  l0.525-0.451C8.905,3.114,11.907,2,15,2c3.093,0,6.096,1.114,8.453,3.137l0.525,0.451l2.825-1.55l-1.063,3.646l0.241,0.381  C27.303,10.151,28,12.549,28,15C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
 <path d="M6.022,6.587l0.525-0.451C8.905,4.114,11.907,3,15,3c3.093,0,6.096,1.114,8.453,3.137  l0.525,0.451l2.479-1.36l0.347-1.19l-2.825,1.55l-0.525-0.451C21.096,3.114,18.093,2,15,2c-3.093,0-6.095,1.114-8.453,3.137  L6.022,5.587l-2.826-1.55l0.347,1.19L6.022,6.587z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
@@ -19,19 +19,19 @@
 <path d="M12.703,14.146l-9-4c-0.252-0.112-0.548,0.001-0.66,0.254c-0.112,0.252,0.001,0.548,0.254,0.66l0.662,0.294  c-0.188,0.895-0.137,2.118,0.393,3.214c0.519,1.075,1.408,1.851,2.57,2.246C7.296,16.941,7.683,17,8.067,17  c1.561,0,3.104-0.955,3.806-2.128l0.423,0.188c0.066,0.029,0.135,0.043,0.203,0.043c0.192,0,0.375-0.11,0.458-0.297  C13.069,14.554,12.956,14.259,12.703,14.146z M7.243,15.868c-0.916-0.311-1.585-0.894-1.991-1.734  c-0.385-0.796-0.451-1.684-0.353-2.361l6.049,2.688C10.283,15.437,8.674,16.354,7.243,15.868z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M12.703,13.043l-9-4c-0.252-0.112-0.548,0.001-0.66,0.254C2.931,9.55,3.044,9.845,3.297,9.958  c0,0,9.135,4.043,9.203,4.043c0.192,0,0.375-0.11,0.458-0.297C13.069,13.451,12.956,13.156,12.703,13.043z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M4.555,10.505c-0.5,1.4-0.205,4.357,2.527,5.285c1.889,0.641,4.044-0.755,4.563-2.133L4.555,10.505z" fill="#FFFFFF"/>
-<circle cx="7.985" cy="13.228" fill="#0C3554" r="1.5"/>
+<circle cx="7.985" cy="13.228" fill="#22243E" r="1.5"/>
 <path d="M4.365,11.53l6.729,2.99c0.239-0.273,0.434-0.561,0.546-0.852l-7.088-3.15  C4.451,10.802,4.386,11.15,4.365,11.53z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M12.703,13.595l-9-4c-0.252-0.112-0.548,0.001-0.66,0.254c-0.112,0.252,0.001,0.548,0.254,0.66l0.662,0.294  c-0.188,0.895-0.137,2.118,0.393,3.214c0.519,1.075,1.408,1.852,2.57,2.247c0.375,0.127,0.761,0.185,1.146,0.185  c1.561,0,3.104-0.956,3.806-2.128l0.423,0.188c0.066,0.029,0.135,0.043,0.203,0.043c0.192,0,0.375-0.11,0.458-0.297  C13.069,14.002,12.956,13.707,12.703,13.595z M7.243,15.316c-0.916-0.311-1.585-0.894-1.991-1.734  c-0.385-0.796-0.451-1.684-0.353-2.361l6.049,2.688C10.283,14.885,8.674,15.802,7.243,15.316z" fill="#3B2314"/>
+<path d="M12.703,13.595l-9-4c-0.252-0.112-0.548,0.001-0.66,0.254c-0.112,0.252,0.001,0.548,0.254,0.66l0.662,0.294  c-0.188,0.895-0.137,2.118,0.393,3.214c0.519,1.075,1.408,1.852,2.57,2.247c0.375,0.127,0.761,0.185,1.146,0.185  c1.561,0,3.104-0.956,3.806-2.128l0.423,0.188c0.066,0.029,0.135,0.043,0.203,0.043c0.192,0,0.375-0.11,0.458-0.297  C13.069,14.002,12.956,13.707,12.703,13.595z M7.243,15.316c-0.916-0.311-1.585-0.894-1.991-1.734  c-0.385-0.796-0.451-1.684-0.353-2.361l6.049,2.688C10.283,14.885,8.674,15.802,7.243,15.316z" fill="#2F2021"/>
 <path d="M17.043,14.807c0.083,0.187,0.266,0.297,0.457,0.297c0.068,0,0.137-0.014,0.203-0.043l0.424-0.188  C18.829,16.045,20.371,17,21.933,17c0.385,0,0.771-0.059,1.146-0.186c1.162-0.395,2.051-1.171,2.57-2.246  c0.529-1.096,0.58-2.32,0.393-3.214l0.662-0.294c0.252-0.112,0.365-0.408,0.254-0.66c-0.112-0.252-0.408-0.366-0.66-0.254l-9,4  C17.045,14.259,16.932,14.554,17.043,14.807z M19.052,14.461l6.049-2.688c0.098,0.677,0.032,1.565-0.353,2.361  c-0.406,0.84-1.076,1.423-1.991,1.734C21.326,16.354,19.717,15.437,19.052,14.461z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M17.043,13.704C17.126,13.89,17.309,14,17.5,14c0.068,0,9.203-4.043,9.203-4.043  c0.252-0.112,0.365-0.408,0.254-0.66c-0.112-0.252-0.408-0.366-0.66-0.254l-9,4C17.045,13.156,16.932,13.451,17.043,13.704z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M25.444,10.505c0.501,1.4,0.205,4.357-2.526,5.285c-1.889,0.641-4.045-0.755-4.563-2.133L25.444,10.505z" fill="#FFFFFF"/>
-<circle cx="22.015" cy="13.228" fill="#0C3554" r="1.5"/>
+<circle cx="22.015" cy="13.228" fill="#22243E" r="1.5"/>
 <path d="M25.635,11.53l-6.729,2.99c-0.238-0.273-0.434-0.561-0.545-0.852l7.087-3.15  C25.549,10.802,25.613,11.15,25.635,11.53z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M17.043,14.255c0.083,0.187,0.266,0.297,0.457,0.297c0.068,0,0.137-0.014,0.203-0.043l0.424-0.188  c0.702,1.172,2.244,2.128,3.806,2.128c0.385,0,0.771-0.058,1.146-0.185c1.162-0.395,2.051-1.172,2.57-2.247  c0.529-1.096,0.58-2.32,0.393-3.214l0.662-0.294c0.252-0.112,0.365-0.408,0.254-0.66c-0.112-0.252-0.408-0.366-0.66-0.254l-9,4  C17.045,13.707,16.932,14.002,17.043,14.255z M19.052,13.909l6.049-2.688c0.098,0.677,0.032,1.565-0.353,2.361  c-0.406,0.84-1.076,1.423-1.991,1.734C21.326,15.802,19.717,14.885,19.052,13.909z" fill="#3B2314"/>
+<path d="M17.043,14.255c0.083,0.187,0.266,0.297,0.457,0.297c0.068,0,0.137-0.014,0.203-0.043l0.424-0.188  c0.702,1.172,2.244,2.128,3.806,2.128c0.385,0,0.771-0.058,1.146-0.185c1.162-0.395,2.051-1.172,2.57-2.247  c0.529-1.096,0.58-2.32,0.393-3.214l0.662-0.294c0.252-0.112,0.365-0.408,0.254-0.66c-0.112-0.252-0.408-0.366-0.66-0.254l-9,4  C17.045,13.707,16.932,14.002,17.043,14.255z M19.052,13.909l6.049-2.688c0.098,0.677,0.032,1.565-0.353,2.361  c-0.406,0.84-1.076,1.423-1.991,1.734C21.326,15.802,19.717,14.885,19.052,13.909z" fill="#2F2021"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="16.9766" y2="24.878">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+<stop offset="0" style="stop-color:#31151D"/>
+<stop offset="1" style="stop-color:#76464D"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_eyebrows.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_eyebrows.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_eyebrows.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,31 +7,31 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13  C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13  C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.333,29,15.169,29,15c0-7.732-6.268-14-14-14  C7.268,1,1,7.268,1,15c0,0.169,0.02,0.333,0.025,0.5C1.291,8.002,7.437,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="22.5" y2="26.25">
-<stop offset="0" style="stop-color:#D48D00"/>
-<stop offset="1" style="stop-color:#FFF1B8"/>
+<stop offset="0" style="stop-color:#946C40"/>
+<stop offset="1" style="stop-color:#EAE6CD"/>
 </linearGradient>
 <ellipse cx="15" cy="24" fill="url(#SVGID_2_)" rx="4" ry="2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="23.25" y2="25.125">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+<stop offset="0" style="stop-color:#31151D"/>
+<stop offset="1" style="stop-color:#76464D"/>
 </linearGradient>
 <ellipse cx="15" cy="24" fill="url(#SVGID_3_)" rx="4" ry="1"/>
 <path d="M11.555,24.5C12.248,24.202,13.523,24,15,24c1.477,0,2.752,0.202,3.445,0.5C18.789,24.353,19,24.184,19,24  c0-0.553-1.791-1-4-1c-2.209,0-4,0.447-4,1C11,24.184,11.211,24.353,11.555,24.5z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <ellipse cx="20.936" cy="5.254" fill-opacity="0.2" rx="4.36" ry="1.541" stroke-opacity="0.2" transform="matrix(0.9218 -0.3876 0.3876 0.9218 -0.3997 8.5257)"/>
-<ellipse cx="20.61" cy="4.926" fill="#3B2314" rx="4.361" ry="1" transform="matrix(0.9218 -0.3876 0.3876 0.9218 -0.2983 8.373)"/>
+<ellipse cx="20.61" cy="4.926" fill="#2F2021" rx="4.361" ry="1" transform="matrix(0.9218 -0.3876 0.3876 0.9218 -0.2983 8.373)"/>
 <ellipse cx="8.446" cy="6.419" fill-opacity="0.2" rx="4.361" ry="1.541" stroke-opacity="0.2" transform="matrix(-0.9963 -0.0858 0.0858 -0.9963 16.31 13.5396)"/>
-<ellipse cx="8.655" cy="6.007" fill="#3B2314" rx="4.361" ry="1" transform="matrix(-0.9963 -0.0858 0.0858 -0.9963 16.7619 12.7348)"/>
+<ellipse cx="8.655" cy="6.007" fill="#2F2021" rx="4.361" ry="1" transform="matrix(-0.9963 -0.0858 0.0858 -0.9963 16.7619 12.7348)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="8.5" x2="8.5" y1="7.5415" y2="19.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M8.5,19C5.467,19,3,16.533,3,13.5C3,10.467,5.467,8,8.5,8s5.5,2.467,5.5,5.5  C14,16.533,11.533,19,8.5,19L8.5,19z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.5" x2="8.5" y1="8.625" y2="18.5013">
@@ -41,15 +41,15 @@
 </linearGradient>
 <circle cx="8.5" cy="13.5" fill="url(#SVGID_5_)" r="4.5"/>
 <path d="M8.5,10c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.329,0.05-0.5C13,11.015,10.985,9,8.5,9  S4,11.015,4,13.5c0,0.171,0.032,0.334,0.05,0.5C4.302,11.753,6.186,10,8.5,10z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M9.5,15C8.122,15,7,13.878,7,12.5S8.122,10,9.5,10s2.5,1.122,2.5,2.5S10.878,15,9.5,15L9.5,15z" fill="#0C3554"/>
+<path d="M9.5,15C8.122,15,7,13.878,7,12.5S8.122,10,9.5,10s2.5,1.122,2.5,2.5S10.878,15,9.5,15L9.5,15z" fill="#22243E"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="10.0005" x2="10.0005" y1="12.0034" y2="14.1348">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#84B2D9"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#9EBFC0"/>
 </linearGradient>
 <circle cx="10" cy="13" fill="url(#SVGID_6_)" r="1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="21.5" x2="21.5" y1="7.5415" y2="19.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M21.5,19c-3.033,0-5.5-2.467-5.5-5.5c0-3.033,2.467-5.5,5.5-5.5s5.5,2.467,5.5,5.5  C27,16.533,24.533,19,21.5,19L21.5,19z" fill="url(#SVGID_7_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="21.5" x2="21.5" y1="8.625" y2="18.5013">
@@ -59,10 +59,10 @@
 </linearGradient>
 <circle cx="21.5" cy="13.5" fill="url(#SVGID_8_)" r="4.5"/>
 <path d="M21.5,10c2.314,0,4.197,1.753,4.449,4C25.969,13.834,26,13.671,26,13.5c0-2.485-2.015-4.5-4.5-4.5  S17,11.015,17,13.5c0,0.171,0.031,0.334,0.051,0.5C17.303,11.753,19.186,10,21.5,10z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M22.5,15c-1.379,0-2.5-1.122-2.5-2.5s1.121-2.5,2.5-2.5s2.5,1.122,2.5,2.5S23.879,15,22.5,15L22.5,15z" fill="#0C3554"/>
+<path d="M22.5,15c-1.379,0-2.5-1.122-2.5-2.5s1.121-2.5,2.5-2.5s2.5,1.122,2.5,2.5S23.879,15,22.5,15L22.5,15z" fill="#22243E"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="23" x2="23" y1="12.0039" y2="14.1352">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#84B2D9"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#9EBFC0"/>
 </linearGradient>
 <circle cx="23" cy="13" fill="url(#SVGID_9_)" r="1"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_heart.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_heart.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_heart.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,8 +7,8 @@
 </g>
 <path d="M14.05,27.266c-0.25-0.904-2.137-3.52-5.009-5.513  c-0.451-0.313-0.938-0.623-1.437-0.942C4.647,18.923,0.967,16.572,1,11.517C1.042,5.269,4.802,2,8.495,2  c2.596,0,4.931,1.478,6.507,4.038c1.564-2.464,3.938-3.929,6.52-3.929c3.572,0,7.437,2.926,7.479,9.351  c0.032,4.867-3.461,7.167-6.267,9.017c-0.61,0.402-1.204,0.793-1.744,1.198c-2.774,2.083-4.815,4.783-5.003,5.56L15.08,29  L14.05,27.266z" fill-opacity="0.6" fill-rule="evenodd" stroke-opacity="0.6"/>
 <radialGradient cx="30.8457" cy="15.8979" gradientTransform="matrix(0.9286 0 0 0.984 -13.6423 -6.1737)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="13.8351">
-<stop offset="0" style="stop-color:#FF6855"/>
-<stop offset="1" style="stop-color:#CC0E06"/>
+<stop offset="0" style="stop-color:#CC9A88"/>
+<stop offset="1" style="stop-color:#914145"/>
 </radialGradient>
 <path d="M14.994,8.245C11.629-0.077,2.064,1.864,2,11.523  c-0.035,5.305,4.555,7.288,7.611,9.408c2.963,2.057,5.072,4.87,5.403,6.068c0.283-1.174,2.632-4.066,5.375-6.125  c3-2.252,7.646-4.104,7.611-9.409C27.937,1.783,18.205,0.255,14.994,8.245z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
 <path d="M14.994,9.245  c3.146-7.832,12.552-6.514,12.984,2.659c0.006-0.146,0.022-0.286,0.021-0.438c-0.063-9.683-9.795-11.211-13.006-3.221  C11.629-0.077,2.064,1.864,2,11.523C2,11.675,2.015,11.815,2.021,11.962C2.448,2.796,11.696,1.088,14.994,9.245z" fill="#FFFFFF" fill-opacity="0.3" fill-rule="evenodd" stroke-opacity="0.3"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_irritated.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_irritated.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_irritated.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,20 +7,20 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13  C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13  C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M24.854,22.146l-3-3c-0.195-0.195-0.512-0.195-0.707,0L18.5,21.793l-2.646-2.646  c-0.195-0.195-0.512-0.195-0.707,0L12.5,21.793l-2.646-2.646c-0.195-0.195-0.512-0.195-0.707,0l-3,3  c-0.195,0.195-0.195,0.512,0,0.707C6.244,22.951,6.372,23,6.5,23s0.256-0.049,0.354-0.146L9.5,20.207l2.646,2.646  C12.244,22.951,12.372,23,12.5,23s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C18.244,22.951,18.372,23,18.5,23  s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C24.244,22.951,24.372,23,24.5,23s0.256-0.049,0.354-0.146  C25.049,22.658,25.049,22.342,24.854,22.146z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M24.854,20.146l-3-3c-0.195-0.195-0.512-0.195-0.707,0L18.5,19.793l-2.646-2.646  c-0.195-0.195-0.512-0.195-0.707,0L12.5,19.793l-2.646-2.646c-0.195-0.195-0.512-0.195-0.707,0l-3,3  c-0.195,0.195-0.195,0.512,0,0.707C6.244,20.951,6.372,21,6.5,21s0.256-0.049,0.354-0.146L9.5,18.207l2.646,2.646  C12.244,20.951,12.372,21,12.5,21s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C18.244,20.951,18.372,21,18.5,21  s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C24.244,20.951,24.372,21,24.5,21s0.256-0.049,0.354-0.146  C25.049,20.658,25.049,20.342,24.854,20.146z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M24.854,21.146l-3-3c-0.195-0.195-0.512-0.195-0.707,0L18.5,20.793l-2.646-2.646  c-0.195-0.195-0.512-0.195-0.707,0L12.5,20.793l-2.646-2.646c-0.195-0.195-0.512-0.195-0.707,0l-3,3  c-0.195,0.195-0.195,0.512,0,0.707C6.244,21.951,6.372,22,6.5,22s0.256-0.049,0.354-0.146L9.5,19.207l2.646,2.646  C12.244,21.951,12.372,22,12.5,22s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C18.244,21.951,18.372,22,18.5,22  s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C24.244,21.951,24.372,22,24.5,22s0.256-0.049,0.354-0.146  C25.049,21.658,25.049,21.342,24.854,21.146z" fill="#3B2314"/>
+<path d="M24.854,21.146l-3-3c-0.195-0.195-0.512-0.195-0.707,0L18.5,20.793l-2.646-2.646  c-0.195-0.195-0.512-0.195-0.707,0L12.5,20.793l-2.646-2.646c-0.195-0.195-0.512-0.195-0.707,0l-3,3  c-0.195,0.195-0.195,0.512,0,0.707C6.244,21.951,6.372,22,6.5,22s0.256-0.049,0.354-0.146L9.5,19.207l2.646,2.646  C12.244,21.951,12.372,22,12.5,22s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C18.244,21.951,18.372,22,18.5,22  s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C24.244,21.951,24.372,22,24.5,22s0.256-0.049,0.354-0.146  C25.049,21.658,25.049,21.342,24.854,21.146z" fill="#2F2021"/>
 <path d="M6.5,16c-0.198,0-0.386-0.118-0.464-0.314c-0.103-0.256,0.022-0.547,0.279-0.65l3.839-2.536l-3.839-0.535  c-0.256-0.103-0.381-0.394-0.279-0.65c0.103-0.257,0.395-0.382,0.65-0.279l6.161,1.464l-6.161,3.465C6.625,15.989,6.562,16,6.5,16  L6.5,16z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M6.5,14c-0.198,0-0.386-0.119-0.464-0.314c-0.103-0.256,0.022-0.547,0.279-0.65l3.839-0.536  L6.314,9.965c-0.256-0.103-0.381-0.394-0.279-0.65c0.103-0.257,0.395-0.382,0.65-0.279l6.161,3.464l-6.161,1.465  C6.625,13.989,6.562,14,6.5,14L6.5,14z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M6.5,15c-0.198,0-0.386-0.119-0.464-0.314c-0.103-0.256,0.022-0.547,0.279-0.65l3.839-1.536l-3.839-1.536  c-0.256-0.103-0.381-0.394-0.279-0.65c0.103-0.257,0.395-0.382,0.65-0.279l6.161,2.464l-6.161,2.464C6.625,14.989,6.562,15,6.5,15  L6.5,15z" fill="#3B2314"/>
+<path d="M6.5,15c-0.198,0-0.386-0.119-0.464-0.314c-0.103-0.256,0.022-0.547,0.279-0.65l3.839-1.536l-3.839-1.536  c-0.256-0.103-0.381-0.394-0.279-0.65c0.103-0.257,0.395-0.382,0.65-0.279l6.161,2.464l-6.161,2.464C6.625,14.989,6.562,15,6.5,15  L6.5,15z" fill="#2F2021"/>
 <path d="M23.346,16c0.199,0,0.387-0.118,0.465-0.314c0.103-0.256-0.022-0.547-0.279-0.65L19.692,12.5l3.839-0.535  c0.257-0.103,0.382-0.394,0.279-0.65c-0.103-0.257-0.395-0.382-0.65-0.279L17,12.5l6.16,3.465C23.221,15.989,23.284,16,23.346,16  L23.346,16z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M23.346,14c0.199,0,0.387-0.119,0.465-0.314c0.103-0.256-0.022-0.547-0.279-0.65L19.692,12.5  l3.839-2.535c0.257-0.103,0.382-0.394,0.279-0.65c-0.103-0.257-0.395-0.382-0.65-0.279L17,12.5l6.16,1.465  C23.221,13.989,23.284,14,23.346,14L23.346,14z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M23.346,15c0.199,0,0.387-0.119,0.465-0.314c0.103-0.256-0.022-0.547-0.279-0.65L19.692,12.5l3.839-1.536  c0.257-0.103,0.382-0.394,0.279-0.65c-0.103-0.257-0.395-0.382-0.65-0.279L17,12.5l6.16,2.464C23.221,14.989,23.284,15,23.346,15  L23.346,15z" fill="#3B2314"/>
+<path d="M23.346,15c0.199,0,0.387-0.119,0.465-0.314c0.103-0.256-0.022-0.547-0.279-0.65L19.692,12.5l3.839-1.536  c0.257-0.103,0.382-0.394,0.279-0.65c-0.103-0.257-0.395-0.382-0.65-0.279L17,12.5l6.16,2.464C23.221,14.989,23.284,15,23.346,15  L23.346,15z" fill="#2F2021"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_kissing.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_kissing.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_kissing.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,36 +7,36 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13  C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13  C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="6" cy="-65.7227" gradientTransform="matrix(1 0 0 1.1014 0 84.2272)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="5.1913">
-<stop offset="0" style="stop-color:#F36227"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+<stop offset="0" style="stop-color:#B67F64"/>
+<stop offset="1" style="stop-color:#B3964D"/>
 </radialGradient>
 <ellipse cx="6" cy="14.746" fill="url(#SVGID_2_)" rx="4" ry="2.746"/>
 <radialGradient cx="24" cy="-65.7227" gradientTransform="matrix(1 0 0 1.1014 0 84.2272)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="5.1913">
-<stop offset="0" style="stop-color:#F36227"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+<stop offset="0" style="stop-color:#B67F64"/>
+<stop offset="1" style="stop-color:#B3964D"/>
 </radialGradient>
 <ellipse cx="24" cy="14.746" fill="url(#SVGID_3_)" rx="4" ry="2.746"/>
-<path d="M17.387,16c-1.181,0-1.919,0.746-2.386,1.25C14.534,16.746,13.794,16,12.613,16  C10,16,10,18.5,6.25,19.75C8.75,19.75,7.5,26,15,26s6.25-6.25,8.75-6.25C20,18.5,20.568,16,17.387,16z" fill="#3B2314" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M17.387,16c-1.181,0-1.919,0.746-2.386,1.25C14.534,16.746,13.794,16,12.613,16  C10,16,10,18.5,6.25,19.75C8.75,19.75,7.5,26,15,26s6.25-6.25,8.75-6.25C20,18.5,20.568,16,17.387,16z" fill="#2F2021" fill-opacity="0.4" stroke-opacity="0.4"/>
 <radialGradient cx="15.1372" cy="19.4775" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="7.6943">
-<stop offset="0" style="stop-color:#FF6855"/>
-<stop offset="1" style="stop-color:#CC0E06"/>
+<stop offset="0" style="stop-color:#CC9A88"/>
+<stop offset="1" style="stop-color:#914145"/>
 </radialGradient>
 <path d="M17.387,16c-1.181,0-1.919,0.746-2.386,1.25C14.534,16.746,13.794,16,12.613,16  C10,16,10,18.5,6.25,19.75c2.5,0,2.5,5,8.75,5s6.25-5,8.75-5C20,18.5,20.568,16,17.387,16z" fill="url(#SVGID_4_)"/>
-<ellipse cx="14.941" cy="19.75" fill="#821014" fill-opacity="0.9" rx="2.441" ry="0.625" stroke-opacity="0.9"/>
+<ellipse cx="14.941" cy="19.75" fill="#60323D" fill-opacity="0.9" rx="2.441" ry="0.625" stroke-opacity="0.9"/>
 <ellipse cx="11.754" cy="21.625" fill="#FFFFFF" fill-opacity="0.5" rx="1.754" ry="0.625" stroke-opacity="0.5"/>
 <ellipse cx="18.629" cy="21.625" fill="#FFFFFF" fill-opacity="0.5" rx="1.129" ry="0.625" stroke-opacity="0.5"/>
 <path d="M9.016,11.611c-1.108,0-2.177-0.421-3.002-1.17l-0.675,0.675  c-0.195,0.195-0.512,0.195-0.707,0s-0.195-0.512,0-0.707L6.04,9l0.352,0.402c0.672,0.769,1.628,1.209,2.624,1.209  s1.952-0.44,2.624-1.209c0.182-0.209,0.498-0.23,0.706-0.047c0.208,0.182,0.229,0.498,0.047,0.706  C11.53,11.046,10.3,11.611,9.016,11.611L9.016,11.611z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M20.984,11.611c1.108,0,2.177-0.421,3.002-1.17l0.676,0.675c0.195,0.195,0.512,0.195,0.707,0  s0.195-0.512,0-0.707L23.96,9l-0.353,0.402c-0.672,0.769-1.627,1.209-2.623,1.209s-1.951-0.44-2.623-1.209  c-0.183-0.209-0.498-0.23-0.706-0.047c-0.208,0.182-0.229,0.498-0.048,0.706C18.47,11.046,19.7,11.611,20.984,11.611L20.984,11.611z  " fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M9.016,13.125c-1.108,0-2.177-0.421-3.002-1.17L5.338,12.63c-0.195,0.195-0.512,0.195-0.707,0  s-0.195-0.512,0-0.707l1.409-1.409l0.352,0.402c0.672,0.769,1.628,1.209,2.624,1.209s1.952-0.44,2.624-1.209  c0.182-0.209,0.498-0.23,0.706-0.047c0.208,0.182,0.229,0.498,0.047,0.706C11.53,12.56,10.3,13.125,9.016,13.125L9.016,13.125z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M20.984,13.125c1.108,0,2.177-0.421,3.002-1.17l0.676,0.675c0.195,0.195,0.512,0.195,0.707,0  s0.195-0.512,0-0.707l-1.409-1.409l-0.353,0.402c-0.672,0.769-1.627,1.209-2.623,1.209s-1.951-0.44-2.623-1.209  c-0.183-0.209-0.498-0.23-0.706-0.047c-0.208,0.182-0.229,0.498-0.048,0.706C18.47,12.56,19.7,13.125,20.984,13.125L20.984,13.125z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M9.016,12.313c-1.108,0-2.177-0.421-3.002-1.17l-0.675,0.675c-0.195,0.195-0.512,0.195-0.707,0  s-0.195-0.512,0-0.707L6.04,9.701l0.352,0.402c0.672,0.769,1.628,1.209,2.624,1.209s1.952-0.44,2.624-1.209  c0.182-0.209,0.498-0.23,0.706-0.047c0.208,0.182,0.229,0.498,0.047,0.706C11.53,11.747,10.3,12.313,9.016,12.313L9.016,12.313z" fill="#3B2314"/>
-<path d="M20.984,12.313c1.108,0,2.177-0.421,3.002-1.17l0.676,0.675c0.195,0.195,0.512,0.195,0.707,0  s0.195-0.512,0-0.707L23.96,9.701l-0.353,0.402c-0.672,0.769-1.627,1.209-2.623,1.209s-1.951-0.44-2.623-1.209  c-0.183-0.209-0.498-0.23-0.706-0.047c-0.208,0.182-0.229,0.498-0.048,0.706C18.47,11.747,19.7,12.313,20.984,12.313L20.984,12.313z  " fill="#3B2314"/>
+<path d="M9.016,12.313c-1.108,0-2.177-0.421-3.002-1.17l-0.675,0.675c-0.195,0.195-0.512,0.195-0.707,0  s-0.195-0.512,0-0.707L6.04,9.701l0.352,0.402c0.672,0.769,1.628,1.209,2.624,1.209s1.952-0.44,2.624-1.209  c0.182-0.209,0.498-0.23,0.706-0.047c0.208,0.182,0.229,0.498,0.047,0.706C11.53,11.747,10.3,12.313,9.016,12.313L9.016,12.313z" fill="#2F2021"/>
+<path d="M20.984,12.313c1.108,0,2.177-0.421,3.002-1.17l0.676,0.675c0.195,0.195,0.512,0.195,0.707,0  s0.195-0.512,0-0.707L23.96,9.701l-0.353,0.402c-0.672,0.769-1.627,1.209-2.623,1.209s-1.951-0.44-2.623-1.209  c-0.183-0.209-0.498-0.23-0.706-0.047c-0.208,0.182-0.229,0.498-0.048,0.706C18.47,11.747,19.7,12.313,20.984,12.313L20.984,12.313z  " fill="#2F2021"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_nerd.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_nerd.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_nerd.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,9 +7,9 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13  C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13  C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
@@ -20,27 +20,27 @@
 <stop offset="1" style="stop-color:#FCFCFC"/>
 </linearGradient>
 <path d="M8.5,17C6.019,17,4,14.981,4,12.5S6.019,8,8.5,8s4.5,2.019,4.5,4.5S10.981,17,8.5,17L8.5,17z" fill="url(#SVGID_2_)"/>
-<path d="M8.5,7C5.462,7,3,9.462,3,12.5S5.462,18,8.5,18s5.5-2.462,5.5-5.5S11.538,7,8.5,7z M8.5,17  C6.019,17,4,14.981,4,12.5S6.019,8,8.5,8s4.5,2.019,4.5,4.5S10.981,17,8.5,17z" fill="#3B2314"/>
+<path d="M8.5,7C5.462,7,3,9.462,3,12.5S5.462,18,8.5,18s5.5-2.462,5.5-5.5S11.538,7,8.5,7z M8.5,17  C6.019,17,4,14.981,4,12.5S6.019,8,8.5,8s4.5,2.019,4.5,4.5S10.981,17,8.5,17z" fill="#2F2021"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="17" x2="26" y1="12.5" y2="12.5">
 <stop offset="0" style="stop-color:#CCCCCC"/>
 <stop offset="0.2" style="stop-color:#EEEEEE"/>
 <stop offset="1" style="stop-color:#FCFCFC"/>
 </linearGradient>
 <path d="M21.5,17c-2.481,0-4.5-2.019-4.5-4.5S19.019,8,21.5,8s4.5,2.019,4.5,4.5S23.981,17,21.5,17L21.5,17z" fill="url(#SVGID_3_)"/>
-<path d="M21.5,7C18.463,7,16,9.462,16,12.5s2.463,5.5,5.5,5.5s5.5-2.462,5.5-5.5S24.537,7,21.5,7z M21.5,17  c-2.481,0-4.5-2.019-4.5-4.5S19.019,8,21.5,8s4.5,2.019,4.5,4.5S23.981,17,21.5,17z" fill="#3B2314"/>
-<rect fill="#3B2314" height="2" width="4" x="13" y="11"/>
-<path d="M30,10c0,0.552-0.448,1-1,1h-2c-0.553,0-1-0.448-1-1l0,0c0-0.552,0.447-1,1-1h2C29.552,9,30,9.448,30,10  L30,10z" fill="#3B2314"/>
-<path d="M4,10c0,0.552-0.448,1-1,1H1c-0.552,0-1-0.448-1-1l0,0c0-0.552,0.448-1,1-1h2C3.552,9,4,9.448,4,10L4,10z" fill="#3B2314"/>
+<path d="M21.5,7C18.463,7,16,9.462,16,12.5s2.463,5.5,5.5,5.5s5.5-2.462,5.5-5.5S24.537,7,21.5,7z M21.5,17  c-2.481,0-4.5-2.019-4.5-4.5S19.019,8,21.5,8s4.5,2.019,4.5,4.5S23.981,17,21.5,17z" fill="#2F2021"/>
+<rect fill="#2F2021" height="2" width="4" x="13" y="11"/>
+<path d="M30,10c0,0.552-0.448,1-1,1h-2c-0.553,0-1-0.448-1-1l0,0c0-0.552,0.447-1,1-1h2C29.552,9,30,9.448,30,10  L30,10z" fill="#2F2021"/>
+<path d="M4,10c0,0.552-0.448,1-1,1H1c-0.552,0-1-0.448-1-1l0,0c0-0.552,0.448-1,1-1h2C3.552,9,4,9.448,4,10L4,10z" fill="#2F2021"/>
 <path d="M8.5,9c2.31,0,4.197,1.756,4.449,4C12.968,12.834,13,12.671,13,12.5C13,10.019,10.981,8,8.5,8  S4,10.019,4,12.5c0,0.171,0.032,0.334,0.051,0.5C4.303,10.756,6.19,9,8.5,9z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M21.5,9c2.311,0,4.197,1.756,4.449,4C25.969,12.834,26,12.671,26,12.5c0-2.481-2.019-4.5-4.5-4.5  S17,10.019,17,12.5c0,0.171,0.031,0.334,0.051,0.5C17.303,10.756,19.189,9,21.5,9z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M15.075,25c-5.617,0-9.75-2.752-11.056-7.363c-0.075-0.266,0.079-0.542,0.345-0.617  c0.262-0.075,0.542,0.078,0.617,0.345C6.158,21.52,9.856,23,15,23c5.143,0,8.993-1.48,10.17-5.636  c0.074-0.267,0.355-0.42,0.617-0.345c0.266,0.075,0.42,0.352,0.344,0.617C24.826,22.248,20.692,25,15.075,25L15.075,25z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <path d="M27,19.969l-0.942-2.238c0.062-0.307-0.087-0.621-0.347-0.707  c-0.262-0.09-0.542,0.093-0.617,0.409C23.917,22.367,20.145,24.5,15,24.5c-5.144,0-8.917-2.133-10.095-7.067  c-0.075-0.316-0.355-0.499-0.617-0.409c-0.259,0.086-0.408,0.4-0.346,0.707L3,19.969c0.497,0,0.957-0.505,1.293-1.014  C5.888,23.702,9.807,26,15,26c5.189,0,9.107-2.295,10.704-7.038C25.994,19.344,26.407,19.734,27,19.969z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="17.1426" y2="25.0441">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+<stop offset="0" style="stop-color:#31151D"/>
+<stop offset="1" style="stop-color:#76464D"/>
 </linearGradient>
 <path d="M27,19.5l-0.942-1.885c0.062-0.258-0.087-0.522-0.347-0.596c-0.262-0.075-0.542,0.078-0.617,0.345  C23.917,21.52,20.144,24,15,24s-8.917-2.48-10.094-6.636c-0.075-0.267-0.355-0.42-0.617-0.345c-0.259,0.073-0.408,0.338-0.346,0.596  L3,19.5c0.497,0,0.957-0.426,1.293-0.854C5.888,22.645,9.807,25,15,25c5.189,0,9.107-2.354,10.704-6.348  C25.994,18.974,26.407,19.303,27,19.5z" fill="url(#SVGID_4_)"/>
-<circle cx="8.5" cy="12.5" fill="#0C3554" r="1.5"/>
-<circle cx="21.5" cy="12.5" fill="#0C3554" r="1.5"/>
+<circle cx="8.5" cy="12.5" fill="#22243E" r="1.5"/>
+<circle cx="21.5" cy="12.5" fill="#22243E" r="1.5"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_neutral.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_neutral.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_neutral.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,15 +7,15 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13  C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13  C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="7.5415" y2="19.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M8.5,19C5.467,19,3,16.533,3,13.5C3,10.467,5.467,8,8.5,8s5.5,2.467,5.5,5.5  C14,16.533,11.533,19,8.5,19L8.5,19z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.5" x2="8.5" y1="8.625" y2="18.5013">
@@ -25,15 +25,15 @@
 </linearGradient>
 <circle cx="8.5" cy="13.5" fill="url(#SVGID_3_)" r="4.5"/>
 <path d="M8.5,10c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.329,0.05-0.5C13,11.015,10.985,9,8.5,9  S4,11.015,4,13.5c0,0.171,0.032,0.334,0.05,0.5C4.302,11.753,6.186,10,8.5,10z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M8.5,16C7.122,16,6,14.878,6,13.5S7.122,11,8.5,11s2.5,1.122,2.5,2.5S9.878,16,8.5,16L8.5,16z" fill="#0C3554"/>
+<path d="M8.5,16C7.122,16,6,14.878,6,13.5S7.122,11,8.5,11s2.5,1.122,2.5,2.5S9.878,16,8.5,16L8.5,16z" fill="#22243E"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.0005" x2="9.0005" y1="13.0034" y2="15.1348">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#9BD1FF"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#B9E1D5"/>
 </linearGradient>
 <circle cx="9" cy="14" fill="url(#SVGID_4_)" r="1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.5" x2="21.5" y1="7.5415" y2="19.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M21.5,19c-3.033,0-5.5-2.467-5.5-5.5c0-3.033,2.467-5.5,5.5-5.5s5.5,2.467,5.5,5.5  C27,16.533,24.533,19,21.5,19L21.5,19z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="21.5" x2="21.5" y1="8.625" y2="18.5013">
@@ -43,14 +43,14 @@
 </linearGradient>
 <circle cx="21.5" cy="13.5" fill="url(#SVGID_6_)" r="4.5"/>
 <path d="M21.5,10c2.314,0,4.197,1.753,4.449,4C25.969,13.834,26,13.671,26,13.5c0-2.485-2.015-4.5-4.5-4.5  S17,11.015,17,13.5c0,0.171,0.031,0.334,0.051,0.5C17.303,11.753,19.186,10,21.5,10z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M21.5,16c-1.379,0-2.5-1.122-2.5-2.5s1.121-2.5,2.5-2.5s2.5,1.122,2.5,2.5S22.879,16,21.5,16L21.5,16z" fill="#0C3554"/>
+<path d="M21.5,16c-1.379,0-2.5-1.122-2.5-2.5s1.121-2.5,2.5-2.5s2.5,1.122,2.5,2.5S22.879,16,21.5,16L21.5,16z" fill="#22243E"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="22" x2="22" y1="13.0039" y2="15.1352">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#9BD1FF"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#B9E1D5"/>
 </linearGradient>
 <circle cx="22" cy="14" fill="url(#SVGID_7_)" r="1"/>
 <path d="M21,23c0,0.553-0.224,1-0.5,1h-11C9.224,24,9,23.553,9,23l0,0c0-0.553,0.224-1,0.5-1h11  C20.776,22,21,22.447,21,23L21,23z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M21,22c0,0.553-0.224,1-0.5,1h-11C9.224,23,9,22.553,9,22l0,0c0-0.553,0.224-1,0.5-1h11  C20.776,21,21,21.447,21,22L21,22z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M21,22.5c0,0.276-0.224,0.5-0.5,0.5h-11C9.224,23,9,22.776,9,22.5l0,0C9,22.224,9.224,22,9.5,22h11  C20.776,22,21,22.224,21,22.5L21,22.5z" fill="#3B2314"/>
+<path d="M21,22.5c0,0.276-0.224,0.5-0.5,0.5h-11C9.224,23,9,22.776,9,22.5l0,0C9,22.224,9.224,22,9.5,22h11  C20.776,22,21,22.224,21,22.5L21,22.5z" fill="#2F2021"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,19 +7,19 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13  C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13  C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <ellipse cx="21.936" cy="4.792" fill-opacity="0.2" rx="4.361" ry="1.541" stroke-opacity="0.2" transform="matrix(0.9218 -0.3877 0.3877 0.9218 -0.1423 8.8784)"/>
-<ellipse cx="21.611" cy="4.464" fill="#3B2314" rx="4.361" ry="1" transform="matrix(0.9218 -0.3876 0.3876 0.9218 -0.041 8.7248)"/>
+<ellipse cx="21.611" cy="4.464" fill="#2F2021" rx="4.361" ry="1" transform="matrix(0.9218 -0.3876 0.3876 0.9218 -0.041 8.7248)"/>
 <ellipse cx="7.636" cy="4.792" fill-opacity="0.2" rx="4.361" ry="1.541" stroke-opacity="0.2" transform="matrix(-0.9218 -0.3877 0.3877 -0.9218 12.8176 12.1696)"/>
-<ellipse cx="7.961" cy="4.464" fill="#3B2314" rx="4.361" ry="1" transform="matrix(-0.9218 -0.3876 0.3876 -0.9218 13.5697 11.665)"/>
+<ellipse cx="7.961" cy="4.464" fill="#2F2021" rx="4.361" ry="1" transform="matrix(-0.9218 -0.3876 0.3876 -0.9218 13.5697 11.665)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="6.5415" y2="18.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M8.5,18C5.467,18,3,15.533,3,12.5S5.467,7,8.5,7S14,9.467,14,12.5S11.533,18,8.5,18L8.5,18z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.5" x2="8.5" y1="7.625" y2="17.5013">
@@ -29,15 +29,15 @@
 </linearGradient>
 <circle cx="8.5" cy="12.5" fill="url(#SVGID_3_)" r="4.5"/>
 <path d="M8.5,9c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.329,0.05-0.5C13,10.015,10.985,8,8.5,8  S4,10.015,4,12.5c0,0.171,0.032,0.334,0.05,0.5C4.302,10.753,6.186,9,8.5,9z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M9.5,14C8.122,14,7,12.878,7,11.5S8.122,9,9.5,9s2.5,1.122,2.5,2.5S10.878,14,9.5,14L9.5,14z" fill="#0C3554"/>
+<path d="M9.5,14C8.122,14,7,12.878,7,11.5S8.122,9,9.5,9s2.5,1.122,2.5,2.5S10.878,14,9.5,14L9.5,14z" fill="#22243E"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="10.0005" x2="10.0005" y1="11.0034" y2="13.1348">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#84B2D9"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#9EBFC0"/>
 </linearGradient>
 <circle cx="10" cy="12" fill="url(#SVGID_4_)" r="1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.5" x2="21.5" y1="6.5415" y2="18.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M21.5,18c-3.033,0-5.5-2.467-5.5-5.5S18.467,7,21.5,7S27,9.467,27,12.5S24.533,18,21.5,18L21.5,18z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="21.5" x2="21.5" y1="7.625" y2="17.5013">
@@ -47,17 +47,17 @@
 </linearGradient>
 <circle cx="21.5" cy="12.5" fill="url(#SVGID_6_)" r="4.5"/>
 <path d="M21.5,9c2.314,0,4.197,1.753,4.449,4C25.969,12.834,26,12.671,26,12.5c0-2.485-2.015-4.5-4.5-4.5  S17,10.015,17,12.5c0,0.171,0.031,0.334,0.051,0.5C17.303,10.753,19.186,9,21.5,9z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M22.5,14c-1.379,0-2.5-1.122-2.5-2.5S21.121,9,22.5,9s2.5,1.122,2.5,2.5S23.879,14,22.5,14L22.5,14z" fill="#0C3554"/>
+<path d="M22.5,14c-1.379,0-2.5-1.122-2.5-2.5S21.121,9,22.5,9s2.5,1.122,2.5,2.5S23.879,14,22.5,14L22.5,14z" fill="#22243E"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="23" x2="23" y1="11.0039" y2="13.1352">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#84B2D9"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#9EBFC0"/>
 </linearGradient>
 <circle cx="23" cy="12" fill="url(#SVGID_7_)" r="1"/>
 <path d="M13.552,23.924c0.495,0.051,1.007,0.077,1.523,0.077c5.144,0,8.917-1.481,10.095-5.636  c0.074-0.267,0.354-0.423,0.617-0.346c0.266,0.076,0.42,0.352,0.344,0.617c-0.007,0.026-0.018,0.05-0.024,0.076L27,20.5  c-0.475,0-0.91-0.389-1.242-0.796c-1.609,3.963-5.59,6.827-10.758,6.827c-0.551,0-0.339-0.041-0.871-0.025  c-1.126,0.033-1.155-1.863-1.126-2.137C13.032,24.094,13.278,23.893,13.552,23.924z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M13.552,22.924c0.495,0.051,1.007,0.077,1.523,0.077c5.144,0,8.917-2.481,10.095-6.636  c0.074-0.267,0.354-0.423,0.617-0.346c0.266,0.076,0.42,0.352,0.344,0.617c-0.007,0.026-0.018,0.05-0.024,0.076L27,19.5  c-0.475,0-0.91-1.389-1.242-1.796c-1.609,3.963-5.352,6.79-10.52,6.79c-0.551,0-1.098-0.027-1.627-0.083  c-0.275-0.028-0.608-0.042-0.608-1.042C13.003,23.092,13.278,22.893,13.552,22.924z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -454 0)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-481" x2="-467" y1="21" y2="21">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+<stop offset="0" style="stop-color:#31151D"/>
+<stop offset="1" style="stop-color:#76464D"/>
 </linearGradient>
 <path d="M13.552,23.924c0.495,0.051,1.007,0.077,1.523,0.077c5.144,0,8.917-2.481,10.095-6.636  c0.074-0.267,0.354-0.423,0.617-0.346c0.266,0.076,0.42,0.352,0.344,0.617c-0.007,0.026-0.018,0.05-0.024,0.076L27,19.5  c-0.475,0-0.91-0.389-1.242-0.796c-1.609,3.963-5.515,6.297-10.683,6.297c-0.551,0-1.098-0.028-1.627-0.083  c-0.275-0.029-0.474-0.275-0.445-0.549C13.032,24.094,13.278,23.893,13.552,23.924z" fill="url(#SVGID_8_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic_mad.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic_mad.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic_mad.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,39 +7,39 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13  C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13  C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="9.917" y2="17.1255">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M8.5,17C7.075,17,6,15.495,6,13.5S7.075,10,8.5,10s2.5,1.505,2.5,3.5S9.925,17,8.5,17L8.5,17z" fill="url(#SVGID_2_)"/>
-<ellipse cx="8.5" cy="13.5" fill="#0C3554" rx="1.5" ry="2.5"/>
+<ellipse cx="8.5" cy="13.5" fill="#22243E" rx="1.5" ry="2.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.5835" x2="8.5835" y1="12.9707" y2="16.1465">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#82969E"/>
 </linearGradient>
 <path d="M7.167,14.623C7.414,15.437,7.915,16,8.5,16c0.829,0,1.5-1.119,1.5-2.5  c0-0.155-0.011-0.305-0.027-0.452C9.819,13.018,9.662,13,9.5,13C8.429,13,7.522,13.677,7.167,14.623z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="21.5" x2="21.5" y1="9.9517" y2="17.1103">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M21.5,17c-1.426,0-2.5-1.505-2.5-3.5s1.074-3.5,2.5-3.5s2.5,1.505,2.5,3.5S22.926,17,21.5,17L21.5,17  z" fill="url(#SVGID_4_)"/>
-<ellipse cx="21.5" cy="13.5" fill="#0C3554" rx="1.5" ry="2.5"/>
+<ellipse cx="21.5" cy="13.5" fill="#22243E" rx="1.5" ry="2.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.583" x2="21.583" y1="13.0908" y2="16.2688">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#82969E"/>
 </linearGradient>
 <path d="M20.166,14.623C20.414,15.437,20.915,16,21.5,16c0.828,0,1.5-1.119,1.5-2.5  c0-0.155-0.012-0.305-0.027-0.452C22.819,13.018,22.662,13,22.5,13C21.43,13,20.522,13.677,20.166,14.623z" fill="url(#SVGID_5_)"/>
 <path d="M19,21c-2.243,0-3.165,1.107-4,2.5c-0.365,0.608-1.232,1.5-3,1.5s-3-0.791-3-1.5  C9,23.224,8.776,23,8.5,23S8,23.224,8,23.5c0,1.402,1.757,2.5,4,2.5s3-1.061,4-2.5c0.404-0.582,1.232-1.5,3-1.5s3,0.791,3,1.5  c0,0.276,0.224,0.5,0.5,0.5s0.5-0.224,0.5-0.5C23,22.098,21.243,21,19,21z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M19,19c-2.243,0-3.165,1.107-4,2.5c-0.365,0.608-1.232,1.5-3,1.5s-3-0.791-3-1.5C9,21.224,8.776,21,8.5,21  S8,21.224,8,21.5c0,1.402,1.757,2.5,4,2.5s3-1.061,4-2.5c0.404-0.582,1.232-1.5,3-1.5s3,0.791,3,1.5c0,0.276,0.224,0.5,0.5,0.5  s0.5-0.224,0.5-0.5C23,20.098,21.243,19,19,19z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.4995" x2="15.4995" y1="20" y2="24.8928">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+<stop offset="0" style="stop-color:#31151D"/>
+<stop offset="1" style="stop-color:#76464D"/>
 </linearGradient>
 <path d="M19,20c-2.243,0-3.165,1.107-4,2.5c-0.365,0.608-1.232,1.5-3,1.5s-3-0.791-3-1.5  C9,22.224,8.776,22,8.5,22S8,22.224,8,22.5c0,1.402,1.757,2.5,4,2.5s3-1.061,4-2.5c0.404-0.582,1.232-1.5,3-1.5s3,0.791,3,1.5  c0,0.276,0.224,0.5,0.5,0.5s0.5-0.224,0.5-0.5C23,21.098,21.243,20,19,20z" fill="url(#SVGID_6_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_smile.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_smile.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_smile.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,29 +7,29 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13  C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13  C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.7505" x2="8.7505" y1="7.9351" y2="14.8952">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M11,15c-0.754,0-1.394-0.564-1.487-1.313C9.3,12,8.874,12,8.691,12c-0.134,0-0.49,0-0.703,1.688  C7.894,14.436,7.254,15,6.5,15H6.443l-0.118-0.01c-0.41-0.052-0.765-0.253-1.01-0.57c-0.246-0.317-0.354-0.71-0.304-1.108  C5.424,10.036,6.893,8,8.846,8c1.111,0,3.063,0.69,3.644,5.313c0.05,0.396-0.058,0.79-0.304,1.107  c-0.245,0.316-0.6,0.518-0.997,0.568l-0.063,0.008L11,15z" fill="url(#SVGID_2_)"/>
-<path d="M11,14c-0.248,0-0.464-0.185-0.495-0.438C10.214,11.249,9.371,11,8.691,11s-1.404,0.249-1.695,2.563  c-0.034,0.273-0.273,0.466-0.559,0.434c-0.273-0.035-0.468-0.285-0.434-0.559C6.343,10.742,7.458,9,8.846,9s2.313,1.742,2.651,4.438  c0.034,0.274-0.16,0.524-0.434,0.559C11.042,13.999,11.021,14,11,14L11,14z" fill="#0C3554"/>
+<path d="M11,14c-0.248,0-0.464-0.185-0.495-0.438C10.214,11.249,9.371,11,8.691,11s-1.404,0.249-1.695,2.563  c-0.034,0.273-0.273,0.466-0.559,0.434c-0.273-0.035-0.468-0.285-0.434-0.559C6.343,10.742,7.458,9,8.846,9s2.313,1.742,2.651,4.438  c0.034,0.274-0.16,0.524-0.434,0.559C11.042,13.999,11.021,14,11,14L11,14z" fill="#22243E"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -566.5 0)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-587.7495" x2="-587.7495" y1="7.9351" y2="14.8952">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M19,15c0.754,0,1.394-0.564,1.487-1.313C20.7,12,21.126,12,21.309,12c0.134,0,0.49,0,0.703,1.688  C22.106,14.436,22.746,15,23.5,15h0.057l0.118-0.01c0.41-0.052,0.765-0.253,1.01-0.57c0.246-0.317,0.354-0.71,0.304-1.108  C24.576,10.036,23.107,8,21.154,8c-1.111,0-3.063,0.69-3.644,5.313c-0.05,0.396,0.058,0.79,0.304,1.107  c0.245,0.316,0.6,0.518,0.997,0.568l0.063,0.008L19,15z" fill="url(#SVGID_3_)"/>
-<path d="M19,14c0.248,0,0.464-0.185,0.495-0.438C19.786,11.249,20.629,11,21.309,11s1.404,0.249,1.695,2.563  c0.034,0.273,0.273,0.466,0.559,0.434c0.273-0.035,0.468-0.285,0.434-0.559C23.657,10.742,22.542,9,21.154,9  s-2.313,1.742-2.651,4.438c-0.034,0.274,0.16,0.524,0.434,0.559C18.958,13.999,18.979,14,19,14L19,14z" fill="#0C3554"/>
+<path d="M19,14c0.248,0,0.464-0.185,0.495-0.438C19.786,11.249,20.629,11,21.309,11s1.404,0.249,1.695,2.563  c0.034,0.273,0.273,0.466,0.559,0.434c0.273-0.035,0.468-0.285,0.434-0.559C23.657,10.742,22.542,9,21.154,9  s-2.313,1.742-2.651,4.438c-0.034,0.274,0.16,0.524,0.434,0.559C18.958,13.999,18.979,14,19,14L19,14z" fill="#22243E"/>
 <path d="M15.075,25c-5.617,0-9.75-2.753-11.056-7.363c-0.075-0.266,0.079-0.543,0.345-0.618  c0.262-0.075,0.542,0.079,0.617,0.345C6.158,21.519,9.856,23,15,23c5.143,0,8.992-1.481,10.17-5.637  c0.074-0.266,0.355-0.42,0.617-0.345c0.266,0.075,0.42,0.353,0.344,0.618C24.826,22.247,20.692,25,15.075,25L15.075,25z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <path d="M27,19.969l-0.942-2.238c0.062-0.307-0.087-0.621-0.347-0.707  c-0.262-0.09-0.542,0.092-0.617,0.408C23.917,22.367,20.145,24.5,15,24.5c-5.143,0-8.917-2.133-10.094-7.068  c-0.075-0.316-0.355-0.498-0.617-0.408c-0.259,0.086-0.408,0.4-0.346,0.707L3,19.969c0.497,0,0.957-0.506,1.293-1.015  C5.888,23.701,9.807,26,15,26c5.189,0,9.107-2.295,10.704-7.039C25.994,19.344,26.407,19.734,27,19.969z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="17.1426" y2="25.0441">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+<stop offset="0" style="stop-color:#31151D"/>
+<stop offset="1" style="stop-color:#76464D"/>
 </linearGradient>
 <path d="M27,19.5l-0.942-1.885c0.062-0.259-0.087-0.523-0.347-0.597c-0.262-0.075-0.542,0.079-0.617,0.345  C23.917,21.519,20.144,24,15,24s-8.917-2.481-10.094-6.637c-0.075-0.266-0.355-0.42-0.617-0.345  c-0.259,0.073-0.408,0.338-0.346,0.597L3,19.5c0.497,0,0.957-0.426,1.293-0.854C5.888,22.644,9.807,25,15,25  c5.189,0,9.107-2.354,10.704-6.348C25.994,18.973,26.407,19.303,27,19.5z" fill="url(#SVGID_4_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_surprised.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_surprised.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_surprised.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,15 +7,15 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28  z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15  c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="7.5415" y2="19.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M8.5,19C5.468,19,3,16.533,3,13.5C3,10.467,5.468,8,8.5,8c3.033,0,5.5,2.467,5.5,5.5  C14,16.533,11.533,19,8.5,19L8.5,19z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.5" x2="8.5" y1="8.625" y2="18.5013">
@@ -25,15 +25,15 @@
 </linearGradient>
 <circle cx="8.5" cy="13.5" fill="url(#SVGID_3_)" r="4.5"/>
 <path d="M8.5,10c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.329,0.05-0.5C13,11.015,10.986,9,8.5,9  C6.016,9,4,11.015,4,13.5c0,0.171,0.032,0.334,0.051,0.5C4.303,11.753,6.187,10,8.5,10z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M8.5,15.5c-1.102,0-2-0.897-2-2s0.898-2,2-2c1.104,0,2,0.897,2,2S9.604,15.5,8.5,15.5L8.5,15.5z" fill="#0C3554"/>
+<path d="M8.5,15.5c-1.102,0-2-0.897-2-2s0.898-2,2-2c1.104,0,2,0.897,2,2S9.604,15.5,8.5,15.5L8.5,15.5z" fill="#22243E"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="8.5" x2="8.5" y1="13.0034" y2="15.1348">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#9BD1FF"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#B9E1D5"/>
 </linearGradient>
 <circle cx="8.5" cy="14" fill="url(#SVGID_4_)" r="1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.5" x2="21.5" y1="7.5415" y2="19.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M21.5,19c-3.032,0-5.5-2.467-5.5-5.5c0-3.033,2.468-5.5,5.5-5.5c3.033,0,5.5,2.467,5.5,5.5  C27,16.533,24.533,19,21.5,19L21.5,19z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="21.5" x2="21.5" y1="8.625" y2="18.5013">
@@ -43,20 +43,20 @@
 </linearGradient>
 <circle cx="21.5" cy="13.5" fill="url(#SVGID_6_)" r="4.5"/>
 <path d="M21.5,10c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.329,0.05-0.5c0-2.485-2.014-4.5-4.5-4.5  c-2.484,0-4.5,2.015-4.5,4.5c0,0.171,0.032,0.334,0.051,0.5C17.303,11.753,19.187,10,21.5,10z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M21.5,15.5c-1.102,0-2-0.897-2-2s0.898-2,2-2c1.104,0,2,0.897,2,2S22.604,15.5,21.5,15.5L21.5,15.5z" fill="#0C3554"/>
+<path d="M21.5,15.5c-1.102,0-2-0.897-2-2s0.898-2,2-2c1.104,0,2,0.897,2,2S22.604,15.5,21.5,15.5L21.5,15.5z" fill="#22243E"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="21.5" x2="21.5" y1="13.0039" y2="15.1352">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#9BD1FF"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#B9E1D5"/>
 </linearGradient>
 <circle cx="21.5" cy="14" fill="url(#SVGID_7_)" r="1"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.9995" x2="14.9995" y1="17.3955" y2="28.2055">
-<stop offset="0" style="stop-color:#D48D00"/>
-<stop offset="1" style="stop-color:#FFF1B8"/>
+<stop offset="0" style="stop-color:#946C40"/>
+<stop offset="1" style="stop-color:#EAE6CD"/>
 </linearGradient>
 <ellipse cx="15" cy="22.5" fill="url(#SVGID_8_)" rx="4.5" ry="5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.9995" x2="14.9995" y1="18.5303" y2="26.9376">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+<stop offset="0" style="stop-color:#31151D"/>
+<stop offset="1" style="stop-color:#76464D"/>
 </linearGradient>
 <ellipse cx="15" cy="22.5" fill="url(#SVGID_9_)" rx="4.5" ry="3.889"/>
 <path d="M15,19.723c2.266,0,4.121,1.451,4.436,3.333C19.467,22.873,19.5,22.69,19.5,22.5  c0-2.147-2.014-3.889-4.5-3.889c-2.484,0-4.5,1.741-4.5,3.889c0,0.19,0.035,0.373,0.064,0.556C10.88,21.174,12.736,19.723,15,19.723  z" fill-opacity="0.4" stroke-opacity="0.4"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_tongue.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_tongue.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_tongue.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,9 +7,9 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28  z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15  c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
@@ -17,29 +17,29 @@
 <path d="M27,18.016l-0.942-1.885c0.062-0.258-0.087-0.522-0.347-0.596c-0.262-0.075-0.398,0.175-0.617,0.345  C23,17.516,20.144,18.058,15,18.058S7,17.516,4.906,15.88c-0.076-0.267-0.355-0.42-0.617-0.345c-0.26,0.074-0.408,0.338-0.347,0.596  L3,18.016c0.497,0,0.957-0.426,1.293-0.854C7,18.516,10,19.516,15,19.516s9-1,10.704-2.348C25.994,17.489,26.407,17.818,27,18.016z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <path d="M9.84,18.578c-1.49,1.831-2.932,6.933,1.082,7.394c4.174,0.479,4.881-5.217,8.221-6.91  C19.304,18.98,9.84,18.578,9.84,18.578z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <radialGradient cx="-109.7007" cy="-18.4487" gradientTransform="matrix(1.1747 0 0 1.1055 140.4372 39.6372)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="4.8868">
-<stop offset="0" style="stop-color:#FF6855"/>
-<stop offset="1" style="stop-color:#CC0E06"/>
+<stop offset="0" style="stop-color:#CC9A88"/>
+<stop offset="1" style="stop-color:#914145"/>
 </radialGradient>
 <path d="M9.145,18.578c-1.489,1.831-1.379,6.046,1.777,6.287c4.191,0.322,4.186-4.11,7.525-5.804  C18.609,18.98,9.145,18.578,9.145,18.578z" fill="url(#SVGID_2_)"/>
 <path d="M13.201,18.758c-0.479-0.021-0.943-0.043-1.385-0.063c-0.565,1.258-0.637,2.821-0.637,2.821  S11.781,19.969,13.201,18.758z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="15.5869" y2="19.5381">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+<stop offset="0" style="stop-color:#31151D"/>
+<stop offset="1" style="stop-color:#76464D"/>
 </linearGradient>
 <path d="M27,18.016l-0.942-1.885c0.062-0.258-0.087-0.522-0.347-0.596c-0.262-0.075-0.398,0.175-0.617,0.345  C23,17.516,20.144,18.516,15,18.516s-8-1-10.094-2.636c-0.076-0.267-0.355-0.42-0.617-0.345c-0.26,0.074-0.408,0.338-0.347,0.596  L3,18.016c0.497,0,0.957-0.426,1.293-0.854C7,18.516,10,19.516,15,19.516s9-1,10.704-2.348C25.994,17.489,26.407,17.818,27,18.016z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="20.5" x2="20.5" y1="8.7856" y2="15.9438">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M20.5,15.834c-1.426,0-2.5-1.505-2.5-3.5s1.074-3.5,2.5-3.5s2.5,1.505,2.5,3.5  S21.926,15.834,20.5,15.834L20.5,15.834z" fill="url(#SVGID_4_)"/>
-<ellipse cx="20.5" cy="12.334" fill="#0C3554" rx="1.5" ry="2.5"/>
+<ellipse cx="20.5" cy="12.334" fill="#22243E" rx="1.5" ry="2.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="20.583" x2="20.583" y1="11.9248" y2="15.1028">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#82969E"/>
 </linearGradient>
 <path d="M19.166,13.457c0.248,0.813,0.749,1.377,1.334,1.377c0.828,0,1.5-1.119,1.5-2.5  c0-0.155-0.012-0.305-0.027-0.452c-0.153-0.03-0.311-0.048-0.473-0.048C20.43,11.834,19.522,12.511,19.166,13.457z" fill="url(#SVGID_5_)"/>
 <path d="M12,14.833c-0.209,0-0.404-0.132-0.475-0.34c-0.041-0.121-0.932-2.159-4.49-2.159  c-0.277,0-0.535-0.724-0.535-1s0.225-0.5,0.5-0.5c4.312,0,5.429,3.205,5.475,3.341c0.087,0.262-0.055,0.545-0.316,0.632  C12.105,14.825,12.053,14.833,12,14.833L12,14.833z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M12,14.021c-0.209,0-0.404-0.132-0.475-0.34c-0.041-0.121-0.992-3.066-4.552-3.066  c-0.276,0-0.474-0.503-0.474-0.78s0.225-0.5,0.5-0.5c4.312,0,5.429,3.892,5.475,4.028c0.087,0.262-0.055,0.545-0.316,0.632  c-0.053,0.018-0.105-0.661-0.158-0.661V14.021z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M12,14.334c-0.209,0-0.404-0.132-0.475-0.34c-0.041-0.121-0.965-2.659-4.525-2.659  c-0.275,0-0.5-0.224-0.5-0.5s0.225-0.5,0.5-0.5c4.312,0,5.429,3.205,5.475,3.341c0.087,0.262-0.055,0.545-0.316,0.632  C12.105,14.326,12.053,14.334,12,14.334L12,14.334z" fill="#0C3554"/>
+<path d="M12,14.334c-0.209,0-0.404-0.132-0.475-0.34c-0.041-0.121-0.965-2.659-4.525-2.659  c-0.275,0-0.5-0.224-0.5-0.5s0.225-0.5,0.5-0.5c4.312,0,5.429,3.205,5.475,3.341c0.087,0.262-0.055,0.545-0.316,0.632  C12.105,14.326,12.053,14.334,12,14.334L12,14.334z" fill="#22243E"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_unhappy.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_unhappy.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_unhappy.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,39 +7,39 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28  z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15  c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="9.917" y2="17.1255">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M8.5,17C7.074,17,6,15.495,6,13.5S7.074,10,8.5,10c1.425,0,2.5,1.505,2.5,3.5S9.925,17,8.5,17L8.5,17  z" fill="url(#SVGID_2_)"/>
-<ellipse cx="8.5" cy="13.5" fill="#0C3554" rx="1.5" ry="2.5"/>
+<ellipse cx="8.5" cy="13.5" fill="#22243E" rx="1.5" ry="2.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.583" x2="8.583" y1="12.9707" y2="16.1465">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#82969E"/>
 </linearGradient>
 <path d="M7.166,14.623C7.414,15.437,7.914,16,8.5,16c0.828,0,1.5-1.119,1.5-2.5  c0-0.155-0.012-0.305-0.027-0.452C9.818,13.018,9.662,13,9.5,13C8.429,13,7.521,13.677,7.166,14.623z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="21.5" x2="21.5" y1="9.9517" y2="17.1103">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M21.5,17c-1.426,0-2.5-1.505-2.5-3.5s1.074-3.5,2.5-3.5c1.425,0,2.5,1.505,2.5,3.5S22.925,17,21.5,17  L21.5,17z" fill="url(#SVGID_4_)"/>
-<ellipse cx="21.5" cy="13.5" fill="#0C3554" rx="1.5" ry="2.5"/>
+<ellipse cx="21.5" cy="13.5" fill="#22243E" rx="1.5" ry="2.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.583" x2="21.583" y1="13.0908" y2="16.2688">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#82969E"/>
 </linearGradient>
 <path d="M20.166,14.623C20.414,15.437,20.914,16,21.5,16c0.828,0,1.5-1.119,1.5-2.5  c0-0.155-0.012-0.305-0.027-0.452C22.818,13.018,22.662,13,22.5,13C21.429,13,20.521,13.677,20.166,14.623z" fill="url(#SVGID_5_)"/>
 <path d="M23.025,24c-0.17,0-0.335-0.086-0.429-0.241C21.216,21.476,18.234,21,15,21  s-6.217,0.476-7.598,2.759c-0.143,0.235-0.45,0.312-0.687,0.169s-0.312-0.45-0.169-0.687C8.129,20.625,11.367,19,15,19  c3.631,0,6.871,1.625,8.453,4.241c0.143,0.236,0.066,0.544-0.17,0.687C23.203,23.977,23.113,24,23.025,24L23.025,24z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M23.025,23c-0.17,0-0.335-0.086-0.429-0.241C21.216,20.476,18.234,19,15,19s-6.217,1.476-7.598,3.759  c-0.143,0.235-0.45,0.312-0.687,0.169s-0.312-0.45-0.169-0.687C8.129,19.625,11.367,18,15,18c3.631,0,6.871,1.625,8.453,4.241  c0.143,0.236,0.066,0.544-0.17,0.687C23.203,22.977,23.113,23,23.025,23L23.025,23z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9995" x2="14.9995" y1="18.5723" y2="23.6656">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+<stop offset="0" style="stop-color:#31151D"/>
+<stop offset="1" style="stop-color:#76464D"/>
 </linearGradient>
 <path d="M23.025,23.5c-0.17,0-0.335-0.086-0.429-0.241C21.216,20.976,18.234,19.5,15,19.5  s-6.217,1.476-7.598,3.759c-0.143,0.235-0.45,0.312-0.687,0.169s-0.312-0.45-0.169-0.687C8.129,20.125,11.367,18.5,15,18.5  c3.631,0,6.871,1.625,8.453,4.241c0.143,0.236,0.066,0.544-0.17,0.687C23.203,23.477,23.113,23.5,23.025,23.5L23.025,23.5z" fill="url(#SVGID_6_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_very_cool.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_very_cool.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_very_cool.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,9 +7,9 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28  z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15  c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
@@ -17,24 +17,24 @@
 <path d="M28.004,8c0-0.552-0.415-1-0.929-1h-0.498H15H4.359H2.932C2.419,7,2.004,7.448,2.004,8c0,0,0,2.501,0,3c0,4,2.785,5,6.498,5  c3.021,0,5.229-3.359,6.165-6h0.667c0.936,2.641,3.143,6,6.164,6c3.714,0,6.506-1,6.506-5C28.004,10.501,28.004,8,28.004,8z"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5781" x2="8.5781" y1="8" y2="14.9378">
 <stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#727475"/>
+<stop offset="1" style="stop-color:#737474"/>
 </linearGradient>
 <path d="M8.502,15c-3.601,0-5.57-0.897-5.57-4c0-1.084,1.259-2.135,1.864-3h9.429  c-0.105,0.908-0.663,2.754-1.867,4.466C11.545,13.622,10.216,15,8.502,15L8.502,15z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -656.8359 0)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-678.2617" x2="-678.2617" y1="8" y2="14.9378">
 <stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#727475"/>
+<stop offset="1" style="stop-color:#737474"/>
 </linearGradient>
 <path d="M21.498,15c3.602,0,5.577-0.897,5.577-4c0-1.084-0.329-2.135-0.936-3H15.776  c0.104,0.908,0.663,2.754,1.866,4.466C18.456,13.622,19.785,15,21.498,15L21.498,15z" fill="url(#SVGID_3_)"/>
 <rect fill="#FFFFFF" fill-opacity="0.6" height="1" stroke-opacity="0.6" width="10.212" x="2.932" y="9"/>
 <rect fill="#FFFFFF" fill-opacity="0.6" height="1" stroke-opacity="0.6" width="10.219" x="16.856" y="9"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9448" x2="14.9448" y1="15.9014" y2="27.1496">
-<stop offset="0" style="stop-color:#D48D00"/>
-<stop offset="1" style="stop-color:#FFF1B8"/>
+<stop offset="0" style="stop-color:#946C40"/>
+<stop offset="1" style="stop-color:#EAE6CD"/>
 </linearGradient>
 <path d="M14.945,16C8.945,16,4,17,4,17c0.506,5.606,5.209,10,10.945,10c5.734,0,10.438-4.394,10.944-10  C25.89,17,20.945,16,14.945,16z" fill="url(#SVGID_4_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9448" x2="14.9448" y1="16.9189" y2="26.1216">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+<stop offset="0" style="stop-color:#31151D"/>
+<stop offset="1" style="stop-color:#76464D"/>
 </linearGradient>
 <path d="M4,17c0.506,5.046,5.209,9,10.945,9c5.734,0,10.438-3.954,10.944-9H4z" fill="url(#SVGID_5_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9448" x2="14.9448" y1="17.9375" y2="25.0951">
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,34 +7,34 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28  z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15  c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="21.5" x2="21.5" y1="8.7856" y2="15.9438">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M21.5,15.834c-1.426,0-2.5-1.505-2.5-3.5s1.074-3.5,2.5-3.5s2.5,1.505,2.5,3.5  S22.926,15.834,21.5,15.834L21.5,15.834z" fill="url(#SVGID_2_)"/>
-<ellipse cx="21.5" cy="12.334" fill="#0C3554" rx="1.5" ry="2.5"/>
+<ellipse cx="21.5" cy="12.334" fill="#22243E" rx="1.5" ry="2.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="21.583" x2="21.583" y1="11.9248" y2="15.1028">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#82969E"/>
 </linearGradient>
 <path d="M20.166,13.457c0.248,0.813,0.749,1.377,1.334,1.377c0.828,0,1.5-1.119,1.5-2.5  c0-0.155-0.012-0.305-0.027-0.452c-0.153-0.03-0.311-0.048-0.473-0.048C21.43,11.834,20.522,12.511,20.166,13.457z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientTransform="matrix(-1 0 0 1 -566.5 0)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-577.7495" x2="-577.7495" y1="8.9351" y2="15.8952">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M9,16c0.754,0,1.394-0.564,1.487-1.313C10.7,13,11.126,13,11.309,13c0.134,0,0.49,0,0.703,1.688  C12.106,15.436,12.746,16,13.5,16h0.057l0.118-0.01c0.41-0.052,0.765-0.253,1.01-0.57c0.246-0.317,0.354-0.71,0.304-1.108  C14.576,11.036,13.107,9,11.154,9c-1.111,0-3.063,0.69-3.644,5.313c-0.05,0.396,0.058,0.79,0.304,1.107  c0.245,0.316,0.6,0.518,0.997,0.568l0.063,0.008L9,16z" fill="url(#SVGID_4_)"/>
-<path d="M9,15c0.248,0,0.464-0.185,0.495-0.438C9.786,12.249,10.629,12,11.309,12s1.404,0.249,1.695,2.563  c0.034,0.273,0.273,0.466,0.559,0.434c0.273-0.035,0.468-0.285,0.434-0.559C13.657,11.742,12.542,10,11.154,10  s-2.313,1.742-2.651,4.438c-0.034,0.274,0.16,0.524,0.434,0.559C8.958,14.999,8.979,15,9,15L9,15z" fill="#0C3554"/>
+<path d="M9,15c0.248,0,0.464-0.185,0.495-0.438C9.786,12.249,10.629,12,11.309,12s1.404,0.249,1.695,2.563  c0.034,0.273,0.273,0.466,0.559,0.434c0.273-0.035,0.468-0.285,0.434-0.559C13.657,11.742,12.542,10,11.154,10  s-2.313,1.742-2.651,4.438c-0.034,0.274,0.16,0.524,0.434,0.559C8.958,14.999,8.979,15,9,15L9,15z" fill="#22243E"/>
 <path d="M16.448,23.924c-0.495,0.051-1.007,0.077-1.523,0.077c-5.144,0-8.917-1.481-10.095-5.636  c-0.074-0.267-0.354-0.423-0.617-0.346c-0.266,0.076-0.42,0.352-0.344,0.617c0.007,0.026,0.018,0.05,0.024,0.076L3,20.5  c0.475,0,0.91-0.389,1.242-0.796c1.609,3.963,5.59,6.827,10.758,6.827c0.551,0,0.34-0.041,0.871-0.025  c1.127,0.033,1.154-1.863,1.126-2.137C16.969,24.094,16.722,23.893,16.448,23.924z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M16.448,22.924c-0.495,0.051-1.007,0.077-1.523,0.077c-5.144,0-8.917-2.481-10.095-6.636  c-0.074-0.267-0.354-0.423-0.617-0.346c-0.266,0.076-0.42,0.352-0.344,0.617c0.007,0.026,0.018,0.05,0.024,0.076L3,19.5  c0.475,0,0.91-1.389,1.242-1.796c1.609,3.963,5.352,6.79,10.52,6.79c0.551,0,1.099-0.027,1.627-0.083  c0.275-0.028,0.608-0.042,0.608-1.042C16.997,23.092,16.722,22.893,16.448,22.924z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="3" x2="17" y1="21" y2="21">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+<stop offset="0" style="stop-color:#31151D"/>
+<stop offset="1" style="stop-color:#76464D"/>
 </linearGradient>
 <path d="M16.448,23.924c-0.495,0.051-1.007,0.077-1.523,0.077c-5.144,0-8.917-2.481-10.095-6.636  c-0.074-0.267-0.354-0.423-0.617-0.346c-0.266,0.076-0.42,0.352-0.344,0.617c0.007,0.026,0.018,0.05,0.024,0.076L3,19.5  c0.475,0,0.91-0.389,1.242-0.796c1.609,3.963,5.515,6.297,10.683,6.297c0.551,0,1.099-0.028,1.627-0.083  c0.274-0.029,0.474-0.275,0.445-0.549C16.969,24.094,16.722,23.893,16.448,23.924z" fill="url(#SVGID_5_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink_grin.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink_grin.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink_grin.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,20 +7,20 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28  z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15  c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientTransform="matrix(0.966 0.2584 -0.2584 0.966 -118.0704 191.8488)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="83.0156" x2="83.0156" y1="-203.2881" y2="-194.0849">
-<stop offset="0" style="stop-color:#D48D00"/>
-<stop offset="1" style="stop-color:#FFF1B8"/>
+<stop offset="0" style="stop-color:#946C40"/>
+<stop offset="1" style="stop-color:#EAE6CD"/>
 </linearGradient>
 <path d="M12.306,25.696c-4.1-1.097-7.131-5.184-8.119-8.915l-0.439-1.656c0,0,7.074,0.857,10.939,1.892  C18.55,18.051,25,20.811,25,20.811l-1.206,1.216C21.073,24.766,16.407,26.793,12.306,25.696L12.306,25.696z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientTransform="matrix(0.966 0.2584 -0.2584 0.966 -118.0704 191.8488)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="83.0156" x2="83.0156" y1="-202.2705" y2="-195.1119">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+<stop offset="0" style="stop-color:#31151D"/>
+<stop offset="1" style="stop-color:#76464D"/>
 </linearGradient>
 <path d="M12.564,24.73c-4.101-1.098-7.39-4.218-8.378-7.949l-0.439-1.656L25,20.811l-1.206,1.216  C21.073,24.766,16.665,25.827,12.564,24.73L12.564,24.73z" fill="url(#SVGID_3_)"/>
 <linearGradient gradientTransform="matrix(0.966 0.2584 -0.2584 0.966 -118.0704 191.8488)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="83.0166" x2="83.0166" y1="-201.252" y2="-196.1404">
@@ -36,18 +36,18 @@
 <path d="M6.688,19.395c0.231,0.352,0.486,0.689,0.765,1.014l0.813-3.039L7.3,17.111L6.688,19.395z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <path d="M7.269,20.358c0.262,0.296,0.541,0.581,0.84,0.852l0.969-3.624L8.081,17.32L7.269,20.358z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="20.5" x2="20.5" y1="8.7856" y2="15.9438">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M20.5,15.834c-1.425,0-2.5-1.505-2.5-3.5s1.075-3.5,2.5-3.5c1.426,0,2.5,1.505,2.5,3.5  S21.926,15.834,20.5,15.834L20.5,15.834z" fill="url(#SVGID_5_)"/>
-<ellipse cx="20.5" cy="12.334" fill="#0C3554" rx="1.5" ry="2.5"/>
+<ellipse cx="20.5" cy="12.334" fill="#22243E" rx="1.5" ry="2.5"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="20.584" x2="20.584" y1="11.9248" y2="15.1028">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+<stop offset="0" style="stop-color:#22243E"/>
+<stop offset="1" style="stop-color:#82969E"/>
 </linearGradient>
 <path d="M19.167,13.457c0.247,0.813,0.749,1.377,1.333,1.377c0.829,0,1.5-1.119,1.5-2.5  c0-0.155-0.011-0.305-0.027-0.452c-0.152-0.03-0.311-0.048-0.473-0.048C20.43,11.834,19.523,12.511,19.167,13.457z" fill="url(#SVGID_6_)"/>
 <path d="M12,14.833c-0.209,0-0.403-0.132-0.474-0.34c-0.042-0.121-0.932-2.159-4.491-2.159  c-0.276,0-0.534-0.724-0.534-1s0.224-0.5,0.5-0.5c4.312,0,5.429,3.205,5.474,3.341c0.088,0.262-0.055,0.545-0.316,0.632  C12.105,14.825,12.053,14.833,12,14.833L12,14.833z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M12,14.021c-0.209,0-0.403-0.132-0.474-0.34c-0.042-0.121-0.993-3.066-4.552-3.066  c-0.277,0-0.474-0.503-0.474-0.78s0.224-0.5,0.5-0.5c4.312,0,5.429,3.892,5.474,4.028c0.088,0.262-0.055,0.545-0.316,0.632  c-0.053,0.018-0.105-0.661-0.158-0.661V14.021z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M12,14.334c-0.209,0-0.403-0.132-0.474-0.34c-0.042-0.121-0.966-2.659-4.525-2.659  c-0.276,0-0.5-0.224-0.5-0.5s0.224-0.5,0.5-0.5c4.312,0,5.429,3.205,5.474,3.341c0.088,0.262-0.055,0.545-0.316,0.632  C12.105,14.326,12.053,14.334,12,14.334L12,14.334z" fill="#0C3554"/>
+<path d="M12,14.334c-0.209,0-0.403-0.132-0.474-0.34c-0.042-0.121-0.966-2.659-4.525-2.659  c-0.276,0-0.5-0.224-0.5-0.5s0.224-0.5,0.5-0.5c4.312,0,5.429,3.205,5.474,3.341c0.088,0.262-0.055,0.545-0.316,0.632  C12.105,14.326,12.053,14.334,12,14.334L12,14.334z" fill="#22243E"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wondering.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wondering.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wondering.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,36 +7,36 @@
 </g>
 <circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
 <radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+<stop offset="0" style="stop-color:#DDD7B2"/>
+<stop offset="0.7818" style="stop-color:#B3964D"/>
+<stop offset="1" style="stop-color:#B39C4D"/>
 </radialGradient>
 <path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28  z" fill="url(#SVGID_1_)"/>
 <path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15  c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
 <path d="M20.797,24.961c-0.095,0.545-0.393,0.946-0.664,0.898l-10.835-1.9  c-0.272-0.048-0.415-0.527-0.319-1.072l0,0c0.096-0.544,0.393-0.945,0.664-0.898l10.836,1.901  C20.75,23.938,20.893,24.416,20.797,24.961L20.797,24.961z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <path d="M20.971,23.977c-0.096,0.544-0.394,0.945-0.666,0.898L9.471,22.974c-0.272-0.048-0.416-0.526-0.32-1.071l0,0  c0.096-0.545,0.394-0.946,0.666-0.898l10.834,1.9C20.923,22.952,21.066,23.432,20.971,23.977L20.971,23.977z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M20.884,24.469c-0.048,0.271-0.307,0.453-0.579,0.406L9.471,22.974c-0.272-0.048-0.454-0.307-0.406-0.579  l0,0c0.048-0.271,0.307-0.453,0.578-0.406l10.836,1.901C20.75,23.938,20.932,24.196,20.884,24.469L20.884,24.469z" fill="#3B2314"/>
+<path d="M20.884,24.469c-0.048,0.271-0.307,0.453-0.579,0.406L9.471,22.974c-0.272-0.048-0.454-0.307-0.406-0.579  l0,0c0.048-0.271,0.307-0.453,0.578-0.406l10.836,1.901C20.75,23.938,20.932,24.196,20.884,24.469L20.884,24.469z" fill="#2F2021"/>
 <path d="M28,14c0,0.553-0.205,1-0.459,1H16.459C16.205,15,16,14.553,16,14l0,0c0-0.553,0.205-1,0.459-1h11.082  C27.795,13,28,13.447,28,14L28,14z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="22.4746" x2="22.4746" y1="8.208" y2="18.834">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M22.475,19c2.863,0,5.221-2.201,5.475-5H17C17.254,16.799,19.611,19,22.475,19z" fill="url(#SVGID_2_)"/>
 <path d="M22.475,18c2.314,0,4.197-1.753,4.449-4h-8.898C18.277,16.247,20.16,18,22.475,18z" fill="#FFFFFF"/>
 <path d="M27.762,15c0.092-0.322,0.156-0.656,0.188-1H17c0.031,0.344,0.096,0.678,0.188,1H27.762z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M23.525,16c1.207,0,2.217-0.86,2.449-2h-4.898C21.309,15.14,22.318,16,23.525,16z" fill="#0C3554"/>
+<path d="M23.525,16c1.207,0,2.217-0.86,2.449-2h-4.898C21.309,15.14,22.318,16,23.525,16z" fill="#22243E"/>
 <path d="M28,13c0,0.553-0.205,1-0.459,1H16.459C16.205,14,16,13.553,16,13l0,0  c0-0.553,0.205-1,0.459-1h11.082C27.795,12,28,12.447,28,13L28,13z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M28,13.5c0,0.276-0.205,0.5-0.459,0.5H16.459C16.205,14,16,13.776,16,13.5l0,0c0-0.276,0.205-0.5,0.459-0.5  h11.082C27.795,13,28,13.224,28,13.5L28,13.5z" fill="#3B2314"/>
+<path d="M28,13.5c0,0.276-0.205,0.5-0.459,0.5H16.459C16.205,14,16,13.776,16,13.5l0,0c0-0.276,0.205-0.5,0.459-0.5  h11.082C27.795,13,28,13.224,28,13.5L28,13.5z" fill="#2F2021"/>
 <path d="M15,14c0,0.553-0.205,1-0.459,1H3.459C3.205,15,3,14.553,3,14l0,0c0-0.553,0.205-1,0.459-1h11.082  C14.795,13,15,13.447,15,14L15,14z" fill-opacity="0.4" stroke-opacity="0.4"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="9.4746" x2="9.4746" y1="8.208" y2="18.834">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+<stop offset="0" style="stop-color:#997642"/>
+<stop offset="1" style="stop-color:#E5E1C3"/>
 </linearGradient>
 <path d="M9.475,19c2.863,0,5.221-2.201,5.475-5H4C4.254,16.799,6.611,19,9.475,19z" fill="url(#SVGID_3_)"/>
 <path d="M9.475,18c2.314,0,4.197-1.753,4.449-4H5.025C5.277,16.247,7.16,18,9.475,18z" fill="#FFFFFF"/>
 <path d="M14.762,15c0.092-0.322,0.156-0.656,0.188-1H4c0.031,0.344,0.096,0.678,0.188,1H14.762z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M10.525,16c1.207,0,2.217-0.86,2.449-2H8.076C8.309,15.14,9.318,16,10.525,16z" fill="#0C3554"/>
+<path d="M10.525,16c1.207,0,2.217-0.86,2.449-2H8.076C8.309,15.14,9.318,16,10.525,16z" fill="#22243E"/>
 <path d="M15,13c0,0.553-0.205,1-0.459,1H3.459C3.205,14,3,13.553,3,13l0,0c0-0.553,0.205-1,0.459-1  h11.082C14.795,12,15,12.447,15,13L15,13z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15,13.5c0,0.276-0.205,0.5-0.459,0.5H3.459C3.205,14,3,13.776,3,13.5l0,0C3,13.224,3.205,13,3.459,13  h11.082C14.795,13,15,13.224,15,13.5L15,13.5z" fill="#3B2314"/>
+<path d="M15,13.5c0,0.276-0.205,0.5-0.459,0.5H3.459C3.205,14,3,13.776,3,13.5l0,0C3,13.224,3.205,13,3.459,13  h11.082C14.795,13,15,13.224,15,13.5L15,13.5z" fill="#2F2021"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sound.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sound.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sound.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -9,8 +9,8 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="5.2617" y2="27.0999">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_speaker.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_speaker.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_speaker.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -26,16 +26,16 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M19.793,20.207l0.529-0.694C21.275,18.261,21.8,16.658,21.8,15s-0.524-3.261-1.478-4.513l-0.529-0.694  l2.267-2.267l0.697,0.881C24.203,10.235,25,12.577,25,15s-0.797,4.765-2.243,6.593l-0.697,0.881L19.793,20.207z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="22.5586" x2="22.5586" y1="20.9727" y2="9.0278">
-<stop offset="0" style="stop-color:#048CC6"/>
-<stop offset="0.5091" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#3E678C"/>
+<stop offset="0.5091" style="stop-color:#83CABF"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <path d="M22.8,15c0,1.959-0.638,3.747-1.682,5.118l0.854,0.854C23.23,19.383,24,17.295,24,15  s-0.77-4.383-2.027-5.973l-0.854,0.854C22.162,11.253,22.8,13.041,22.8,15z" fill="url(#SVGID_4_)"/>
 <path d="M23.554,23.968l0.344-0.652C25.124,20.991,25.8,18.038,25.8,15s-0.676-5.991-1.902-8.315l-0.344-0.652  l2.322-2.322l0.646,1.15C28.12,7.705,29,11.307,29,15s-0.88,7.295-2.478,10.14l-0.646,1.15L23.554,23.968z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="26.3906" x2="26.3906" y1="24.6504" y2="5.3501">
-<stop offset="0" style="stop-color:#048CC6"/>
-<stop offset="0.5091" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<stop offset="0" style="stop-color:#3E678C"/>
+<stop offset="0.5091" style="stop-color:#83CABF"/>
+<stop offset="1" style="stop-color:#3E678C"/>
 </linearGradient>
 <path d="M25.65,24.65C27.115,22.042,28,18.678,28,15s-0.885-7.042-2.35-9.65l-0.868,0.868  C26.042,8.605,26.8,11.666,26.8,15s-0.758,6.395-2.018,8.782L25.65,24.65z" fill="url(#SVGID_5_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_non_favourited.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_non_favourited.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_non_favourited.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,8 +6,8 @@
 </defs>
 <polygon fill-opacity="0.6" points="15,0.734 19.635,10.126 30,11.632 22.5,18.943 24.27,29.266 15,24.393 5.73,29.266 7.5,18.943   0,11.632 10.365,10.126 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="2.9937" y2="27.438">
-	<stop offset="0" style="stop-color:#FFE896"/>
-	<stop offset="1" style="stop-color:#FFB701"/>
+	<stop offset="0" style="stop-color:#E0D9B5"/>
+	<stop offset="1" style="stop-color:#B3964D"/>
 </linearGradient>
 <polygon fill="url(#SVGID_1_)" points="15,23.262 7.058,27.438 8.574,18.594 2.149,12.331 11.029,11.04 15,2.994 18.971,11.04   27.852,12.331 21.426,18.594 22.941,27.438 "/>
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="11.693,11.954 15,5.253 18.307,11.954 26.959,13.201 27.852,12.331   18.971,11.04 15,2.994 11.029,11.04 2.149,12.331 3.042,13.201 "/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_offline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_offline.svg	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<polygon fill-opacity="0.6" points="15,0.734 19.635,10.126 30,11.632 22.5,18.943 24.27,29.266 15,24.393 5.73,29.266 7.5,18.943   0,11.632 10.365,10.126 " stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="2.9937" y2="27.438">
-<stop offset="0" style="stop-color:#FFE896"/>
-<stop offset="1" style="stop-color:#FFB701"/>
-</linearGradient>
-<polygon fill="url(#SVGID_1_)" points="15,23.262 7.058,27.438 8.574,18.594 2.149,12.331 11.029,11.04 15,2.994 18.971,11.04   27.852,12.331 21.426,18.594 22.941,27.438 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="11.693,11.954 15,5.253 18.307,11.954 26.959,13.201 27.852,12.331   18.971,11.04 15,2.994 11.029,11.04 2.149,12.331 3.042,13.201 "/>
-<rect fill="none" height="30" width="30"/>
-</g>
-<g>
-<rect fill-opacity="0.6" height="34.27" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(0.7073 -0.707 0.707 0.7073 -6.2126 14.9968)" width="3.169" x="13.42" y="-2.134"/>
-<polygon fill="url(#SVGID_1__)" points="26,26.99,3.015,4.005,4.006,3.014,26.99,26"/>
-<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="339.8" x2="339.8" y1="-397.3" y2="-425.3">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.2606" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
-</linearGradient>
-</defs>
-</g>
-</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_swype.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_swype.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_swype.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -13,27 +13,27 @@
 <g>
 <polygon fill-opacity="0.6" points="8.547,25.313 7.61,17.813 5.625,17.813 5.625,12.199 24.375,12.199 24.375,17.813 22.391,17.813     21.453,25.313   " stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="12.103" y2="23.9943">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <polygon fill="url(#SVGID_2_)" points="6.563,13.137 6.563,16.875 8.438,16.875 9.375,24.375 20.625,24.375 21.563,16.875     23.438,16.875 23.438,13.137   "/>
 <path d="M13.125,14.063v-2.886c-0.348,0.048-0.692,0.073-1.03,0.073c-0.804,0-1.568-0.139-2.272-0.414    C5.866,9.294,5.955,6.329,5.96,6.204l0.019-0.408l0.312-0.265c0.103-0.088,1.06-0.855,2.881-0.855c0.958,0,1.99,0.212,3.066,0.632    c1.3,0.506,2.174,1.126,2.762,1.716c0.588-0.589,1.462-1.209,2.762-1.716c1.076-0.42,2.108-0.632,3.066-0.632    c1.82,0,2.777,0.767,2.881,0.855l0.313,0.265l0.019,0.408c0.005,0.125,0.094,3.091-3.862,4.632    c-0.704,0.275-1.469,0.414-2.272,0.414c-0.338,0-0.683-0.025-1.03-0.073v2.886H13.125z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <path d="M10.163,9.963c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875V10.02    c1.003,0.289,2.464,0.502,3.899-0.057c3.375-1.316,3.267-3.717,3.267-3.717s-1.627-1.379-5.002-0.064    C16.242,6.907,15.392,7.849,15,8.551c-0.392-0.702-1.242-1.644-3.102-2.369C8.523,4.866,6.896,6.246,6.896,6.246    S6.788,8.647,10.163,9.963z" fill="url(#SVGID_3_)"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="4.9224" y2="12.8702">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 </defs>
 </g>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="12.5542" y2="17.3683">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="3.738" width="16.875" x="6.563" y="13.137"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="16.8408" y2="24.5597">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <polygon fill="url(#SVGID_5_)" points="20.625,24.375 9.375,24.375 8.438,16.875 21.563,16.875  "/>
 <path d="M23.104,6.246c0,0-1.627-1.379-5.002-0.064C16.242,6.907,15.392,7.849,15,8.551   c-0.392-0.702-1.242-1.644-3.102-2.369C8.523,4.866,6.896,6.246,6.896,6.246s-0.109,2.401,3.267,3.717   c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875V10.02c1.003,0.289,2.464,0.502,3.899-0.057   C23.212,8.647,23.104,6.246,23.104,6.246z" fill="url(#SVGID_3_)"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sync.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sync.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sync.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -3,22 +3,22 @@
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
 <rect fill="none" height="30" width="30"/>
-<path d="M19,26.5l-1,1c-5.58,0-13-1.141-13-11v-3H0.131L8,1.697L15.869,13.5H11v3c0,6.655,5.764,9,7,9L19,26.5z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="9.9995" x2="9.9995" y1="3.5" y2="26.5005">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<path d="M19,26.5l-1,1c-5.58,0-13-1.141-13-11v-3H0.131L8,1.697L15.869,13.5H11v3  c0,6.654,5.764,9,7,9L19,26.5z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="588.9609" x2="588.9609" y1="815.5391" y2="838.5391">
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <path d="M10,16.5v-4h4l-6-9l-6,9h4v4c0,8,5,10,12,10C16,26.5,10,23.5,10,16.5z" fill="url(#SVGID_1_)"/>
-<path d="M10,16.5V18c0,3.939,1.9,6.612,3.918,8.195C15.176,26.405,16.541,26.5,18,26.5  C16,26.5,10,23.5,10,16.5z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M10,16.5V18c0,3.939,1.9,6.611,3.918,8.195  C15.176,26.404,16.541,26.5,18,26.5C16,26.5,10,23.5,10,16.5z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="8,5 13,12.5 14,12.5 8,3.5 2,12.5 3,12.5 " stroke-opacity="0.4"/>
-<path d="M14.131,16.5H19v-3c0-6.655-5.764-9-7-9l-1-1l1-1c5.58,0,13,1.141,13,11v3h4.869L22,28.303L14.131,16.5z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="20" x2="20" y1="3.5" y2="26.5005">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<path d="M14.131,16.5H19v-3c0-6.655-5.764-9-7-9l-1-1l1-1c5.58,0,13,1.141,13,11v3h4.869  L22,28.303L14.131,16.5z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="598.9609" x2="598.9609" y1="815.5391" y2="838.5391">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 <path d="M24,17.5v-4c0-8-5-10-12-10c2,0,8,3,8,10v4h-4l6,9l6-9H24z" fill="url(#SVGID_2_)"/>
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="20,17.5 16,17.5 16.666,18.5 20,18.5 " stroke-opacity="0.4"/>
-<path d="M24,14.5v-1c0-8-5-10-12-10c0.707,0,1.914,0.384,3.178,1.177C20.461,5.299,24,7.776,24,14.5z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M24,14.5v-1c0-8-5-10-12-10c0.707,0,1.914,0.384,3.178,1.177  C20.461,5.299,24,7.776,24,14.5z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="24,17.5 24,18.5 27.334,18.5 28,17.5 " stroke-opacity="0.4"/>
 <rect fill="none" height="30" width="30"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tag_inactive.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tag_inactive.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tag_inactive.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,20 +2,18 @@
 <!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
 <svg height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g opacity="0.5">
-<defs>
-</defs>
 <rect fill="none" height="30" width="30"/>
-<path d="M2,12.731V4.094L4.094,2h8.638l15.683,15.683L17.683,28.414L2,12.731z M6.904,5.952  c-0.525,0-0.952,0.427-0.952,0.952s0.427,0.953,0.952,0.953S7.857,7.43,7.857,6.904S7.43,5.952,6.904,5.952L6.904,5.952z" opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="3" y2="27.0005">
-	<stop offset="0" style="stop-color:#4EDEFF"/>
-	<stop offset="1" style="stop-color:#048CC6"/>
+<path d="M2,12.731V4.094L4.094,2h8.638l15.683,15.684l-10.731,10.73L2,12.731z   M6.904,5.952c-0.525,0-0.952,0.427-0.952,0.952c0,0.525,0.427,0.953,0.952,0.953c0.525,0,0.953-0.427,0.953-0.953  C7.857,6.378,7.43,5.952,6.904,5.952L6.904,5.952z" fill-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="593.9609" x2="593.9609" y1="815.0391" y2="839.0391">
+	<stop offset="0" style="stop-color:#6DADC1"/>
+	<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
-<path d="M27,17.683L12.317,3h-7.81L3,4.508v7.81L17.683,27L27,17.683z M6.904,8.857  c-1.078,0-1.952-0.875-1.952-1.953s0.874-1.952,1.952-1.952s1.953,0.874,1.953,1.952S7.982,8.857,6.904,8.857z" fill="url(#SVGID_1_)"/>
-<path d="M6.904,9.857c1.078,0,1.953-0.875,1.953-1.953c0-0.174-0.03-0.34-0.072-0.5  C8.563,8.239,7.809,8.857,6.904,8.857S5.247,8.239,5.025,7.404c-0.043,0.16-0.073,0.326-0.073,0.5  C4.952,8.982,5.826,9.857,6.904,9.857z" fill="#FFFFFF" opacity="0.4"/>
-<polygon fill="#FFFFFF" opacity="0.4" points="12.317,4 26.5,18.183 27,17.683 12.317,3 4.508,3 3,4.508 3,5.508 4.508,4 "/>
-<rect fill="#FFFFFF" height="7.321" transform="matrix(0.7071 0.7071 -0.7071 0.7071 16.0459 -6.6464)" width="11.95" x="10.071" y="12.385"/>
-<polygon fill="#FFFFFF" opacity="0.4" points="17.683,22.859 9.232,14.43 8.662,15 17.683,24 23.43,18.253 22.859,17.683 "/>
-<polygon opacity="0.15" points="14.409,10.373 22.289,18.253 22.859,17.683 14.409,9.232 9.232,14.409 9.803,14.979 "/>
+<path d="M27,17.684L12.317,3h-7.81L3,4.508v7.81L17.684,27L27,17.684z M6.904,8.857  c-1.078,0-1.952-0.875-1.952-1.953c0-1.078,0.874-1.952,1.952-1.952c1.078,0,1.953,0.874,1.953,1.952  C8.857,7.982,7.982,8.857,6.904,8.857z" fill="url(#SVGID_1_)"/>
+<path d="M6.904,9.857c1.078,0,1.953-0.875,1.953-1.953  c0-0.174-0.03-0.34-0.072-0.5C8.563,8.239,7.809,8.857,6.904,8.857c-0.905,0-1.657-0.618-1.879-1.453  c-0.043,0.16-0.073,0.326-0.073,0.5C4.952,8.982,5.826,9.857,6.904,9.857z" enable-background="new    " fill="#FFFFFF" fill-opacity="0.4"/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="12.317,4 26.5,18.184 27,17.684 12.317,3 4.508,3   3,4.508 3,5.508 4.508,4 "/>
+<rect fill="#FFFFFF" height="7.322" transform="matrix(0.7071 0.7071 -0.7071 0.7071 16.0454 -6.6475)" width="11.949" x="10.073" y="12.385"/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="17.684,22.859 9.232,14.43 8.662,15 17.684,24   23.43,18.253 22.859,17.684 "/>
+<polygon fill-opacity="0.15" points="14.409,10.373 22.289,18.253 22.859,17.684 14.409,9.232 9.232,14.409   9.803,14.979 "/>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_telephony_offline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_telephony_offline.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_telephony_offline.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,19 +5,19 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M1,22.653c0-0.762,0.097-1.988,0.553-3.504c0.707-2.346,3.97-7.439,7.274-10.745  c3.348-3.345,7.787-6.116,9.228-6.665c2.32-0.878,4.919-0.822,5.796-0.596c0.122,0.036,0.678,0.226,1.427,0.645l0.269,0.155  c0.457,0.277,0.864,0.562,1.24,0.875c0.144,0.12,0.25,0.199,0.342,0.268c0.207,0.151,0.402,0.294,0.691,0.625  c0.65,0.74,0.876,1.075,0.915,1.134C28.908,5.112,29,5.422,29,5.741c0,0.584-0.294,1.132-0.789,1.469l-7.078,4.819  c-0.4,0.271-0.894,0.374-1.353,0.282c-0.435-0.088-0.803-0.339-1.042-0.708l-1.274-1.993c-1.575,1.008-3.029,2.209-4.648,3.831  c-1.037,1.037-2.093,2.485-2.829,3.622L9.4,17.799L10.156,18l0.813,0.484c0.488,0.286,0.785,0.814,0.785,1.413  c0,0.242-0.049,0.481-0.143,0.707l-0.021,0.054l-1.453,2.543l-2.851,4.91c-0.233,0.408-0.625,0.711-1.071,0.832  c-0.422,0.113-0.86,0.058-1.23-0.158c-0.077-0.049-0.36-0.24-0.998-0.754l-0.056-0.01l-0.173-0.168  c-0.331-0.271-0.432-0.377-0.681-0.652l-0.153-0.168c-1.228-1.344-1.721-2.822-1.742-2.885C1.025,23.706,1,23.02,1,22.653L1,22.653z  " fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(-4.371139e-008 1 1 4.371139e-008 396.0192 -292.4791)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="305.3745" x2="305.3745" y1="-369.2378" y2="-394.3224">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 <path d="M17.757,8.34c-2.193,1.274-3.96,2.8-5.603,4.441c-1.58,1.581-3.231,4.096-3.815,5.221L2.07,23.858  c-0.185-0.516-0.284-2.254,0.374-4.439c0.66-2.188,3.843-7.157,7.042-10.354c3.198-3.196,7.526-5.93,8.897-6.451  c2.161-0.817,4.542-0.744,5.235-0.566c0,0,0.631,0.208,1.449,0.697C25.418,2.955,17.757,8.34,17.757,8.34z" fill="url(#SVGID_1_)"/>
 <radialGradient cx="314.1274" cy="-383.3599" gradientTransform="matrix(-4.371139e-008 1 1 4.371139e-008 396.0192 -292.4791)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="11.9051">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </radialGradient>
 <path d="M6.479,27.641l2.846-4.904l1.426-2.494c0.153-0.363,0.055-0.771-0.259-0.957l-1.207-0.717H9.283  l-0.944-0.566c0.002-0.002,0.008-0.006,0.01-0.008c-2.9-0.369-5.641,1.449-6.255,4.246c-0.08,0.371-0.12,0.738-0.122,1.102  c0.025,0.223,0.061,0.403,0.099,0.517c0,0,0.436,1.332,1.543,2.543c0.369,0.405,0.383,0.444,0.77,0.755  c0.001,0.002,0.003,0.002,0.007,0.004c0.76,0.615,1.062,0.816,1.062,0.816C5.798,28.176,6.259,28.028,6.479,27.641z" fill="url(#SVGID_2_)"/>
 <path d="M9.285,18.569l1.207,0.717c0.313,0.186,0.412,0.594,0.259,0.957  l-1.426,2.494l-2.846,4.904c-0.221,0.387-0.682,0.535-1.028,0.334c0,0-0.304-0.201-1.067-0.82L9.285,18.569z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <radialGradient cx="297.7944" cy="-368.7876" gradientTransform="matrix(-4.371139e-008 1 1 4.371139e-008 396.0192 -292.4791)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="12.0638">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </radialGradient>
 <path d="M20.607,11.257l7.076-4.818c0.373-0.252,0.494-0.738,0.27-1.084c0,0-0.195-0.301-0.832-1.027  c-0.001,0,0-0.002-0.002-0.002c-0.348-0.395-0.478-0.414-0.929-0.789c-0.628-0.521-1.253-0.888-1.733-1.126  C21.432,1.84,18.492,3.688,17.854,6.6c-0.134,0.595-0.152,1.187-0.082,1.762l1.046,1.637l0.707,1.101  C19.746,11.445,20.232,11.513,20.607,11.257z" fill="url(#SVGID_3_)"/>
 <path d="M27.119,4.327c0.639,0.728,0.834,1.029,0.834,1.029  c0.225,0.346,0.104,0.832-0.27,1.084l-7.076,4.818c-0.374,0.255-0.861,0.188-1.082-0.159l-0.707-1.101L27.119,4.327z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
@@ -29,9 +29,9 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="339.8" x2="339.8" y1="-397.3" y2="-425.3">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.2606" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.2606" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tick.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tick.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tick.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -8,8 +8,8 @@
 <polygon fill="#FFFFFF" fill-opacity="0.4" points="5.713,13.103 11.597,18.989 24.289,6.292 27.307,9.31   28.002,8.617 24.289,4.905 11.597,17.601 5.713,11.718 2.001,15.429 2.695,16.12 " stroke-opacity="0.4"/>
 <defs>
 <linearGradient gradientTransform="matrix(0.8824 0 0 0.8824 -227.5791 -1120.5674)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="274.9102" x2="274.9102" y1="1274.2861" y2="1300.495">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<stop offset="0" style="stop-color:#85AE4A"/>
+<stop offset="1" style="stop-color:#2F6F44"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tip.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tip.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tip.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -6,27 +6,27 @@
 <path d="M23.732,4.574C22.354,2.944,19.719,1,15,1c-4.721,0-7.355,1.944-8.734,3.576  C4.393,6.79,3.629,9.895,4.17,13.091c0.518,3.071,1.816,6.16,3.828,8.404v6.013L9.606,29h10.786L22,27.507v-6.005  c2.013-2.244,3.313-5.336,3.832-8.411C26.369,9.894,25.605,6.788,23.732,4.574z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <polygon fill="url(#SVGID_1_)" points="8.998,21.5 8.998,27.071 9.999,28 20,28 21,27.071 21,21.5 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="1.0713" y2="20.5717">
-<stop offset="0" style="stop-color:#FEE06A"/>
-<stop offset="0.503" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#FEAB29"/>
+<stop offset="0" style="stop-color:#D2C896"/>
+<stop offset="0.503" style="stop-color:#B39C4D"/>
+<stop offset="1" style="stop-color:#BEA069"/>
 </linearGradient>
 <path d="M15,2C7.455,2,4.219,7.377,5.156,12.925c0.936,5.544,4.402,10.848,9.826,10.924l0,0  c0.006,0,0.012,0,0.018,0c0.008,0,0.014,0,0.02,0l0,0c5.424-0.076,8.89-5.38,9.824-10.924C25.779,7.377,22.544,2,15,2z" fill="url(#SVGID_2_)"/>
 <polygon fill="url(#SVGID_1_)" points="8.998,21.5 8.998,27.071 9.999,28 20,28 21,27.071 21,21.5 "/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="8.998" x2="21" y1="24.2852" y2="24.2852">
-<stop offset="0" style="stop-color:#A0A8AC"/>
-<stop offset="0.1212" style="stop-color:#BDC3C4"/>
-<stop offset="0.2848" style="stop-color:#E9EFF2"/>
-<stop offset="0.6727" style="stop-color:#949DA1"/>
-<stop offset="0.8182" style="stop-color:#D9DFE1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+<stop offset="0" style="stop-color:#A4A8A8"/>
+<stop offset="0.1212" style="stop-color:#BFC2C1"/>
+<stop offset="0.2848" style="stop-color:#ECEFED"/>
+<stop offset="0.6727" style="stop-color:#989D9D"/>
+<stop offset="0.8182" style="stop-color:#DBDFDD"/>
+<stop offset="0.9636" style="stop-color:#AFB3B2"/>
+<stop offset="1" style="stop-color:#5B5B5D"/>
 </linearGradient>
 <rect fill="url(#SVGID_4_)" height="5.571" width="12.002" x="8.998" y="21.5"/>
 <path d="M8.443,20.5c1.655,1.991,3.857,3.31,6.539,3.349l0,0c0.006,0,0.012,0,0.018,0c0.008,0,0.014,0,0.02,0l0,0  c2.682-0.039,4.884-1.357,6.539-3.349H8.443z" fill-opacity="0.2" stroke-opacity="0.2"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.998" x2="21" y1="24.2852" y2="24.2852">
-<stop offset="0" style="stop-color:#A8B1B3"/>
+<stop offset="0" style="stop-color:#ABB0AF"/>
 <stop offset="0.4" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#686E70"/>
+<stop offset="1" style="stop-color:#6A6C6E"/>
 </linearGradient>
 <rect fill="url(#SVGID_5_)" height="5.571" width="12.002" x="8.998" y="21.5"/>
 <rect fill-opacity="0.25" height="0.929" stroke-opacity="0.25" width="12.002" x="8.998" y="22.633"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -13,8 +13,8 @@
 <path d="M10.5,16v2h-2v-2H10.5 M11.5,15h-4v4h4V15L11.5,15z" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="9" x="13" y="16.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="1.6084" y2="7.4429">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="5" width="10" x="10" y="2"/>
 <rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="10" x="10" y="2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo_done.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo_done.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo_done.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -13,8 +13,8 @@
 <path d="M10.5,16v2h-2v-2H10.5 M11.5,15h-4v4h4V15L11.5,15z" fill-opacity="0.5" stroke-opacity="0.5"/>
 <rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="9" x="13" y="16.25"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="1.6084" y2="7.4429">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+<stop offset="0" style="stop-color:#92603E"/>
+<stop offset="1" style="stop-color:#713631"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="5" width="10" x="10" y="2"/>
 <rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="10" x="10" y="2"/>
@@ -27,8 +27,8 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 417.127 253.8542)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-449" x2="-439.8" y1="111" y2="120.2">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
+<stop offset="0" stop-color="#85AE4A"/>
+<stop offset="1" stop-color="#2F6F44"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unknown.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unknown.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unknown.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,20 +4,20 @@
 <g>
 <rect fill="none" height="30" width="30"/>
 <path d="M13.5,28c-1.93,0-3.5-1.57-3.5-3.5s1.57-3.5,3.5-3.5s3.5,1.57,3.5,3.5S15.43,28,13.5,28L13.5,28z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="13.4995" x2="13.4995" y1="2.917" y2="26.9193">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="592.4609" x2="592.4609" y1="814.957" y2="838.9594">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 <circle cx="13.5" cy="24.5" fill="url(#SVGID_1_)" r="2.5"/>
-<path d="M10.511,20.719v-2.654c0-1.242,0.284-2.343,0.843-3.273c0.512-0.857,1.271-1.766,2.316-2.773  c1.214-1.193,1.579-1.766,1.688-2c0.181-0.392,0.272-0.771,0.272-1.123c0-0.758-0.18-1.287-0.551-1.619  c-0.396-0.353-1.066-0.533-1.987-0.533c-1.044,0-2.324,0.225-3.806,0.667L8,7.793V2.98l0.733-0.203C10.598,2.262,12.299,2,13.791,2  c2.549,0,4.557,0.553,5.969,1.643C21.246,4.793,22,6.484,22,8.674c0,0.926-0.208,1.874-0.617,2.816  c-0.412,0.951-1.313,2.125-2.757,3.588c-0.938,0.947-1.56,1.644-1.85,2.072c-0.221,0.326-0.327,0.696-0.327,1.135v2.434H10.511z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="2.9165" y2="26.9195">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<path d="M10.511,20.719v-2.654c0-1.242,0.284-2.342,0.843-3.271c0.512-0.857,1.271-1.766,2.316-2.773  c1.214-1.193,1.579-1.766,1.688-2c0.181-0.392,0.272-0.771,0.272-1.123c0-0.758-0.18-1.287-0.551-1.619  c-0.396-0.353-1.066-0.533-1.987-0.533c-1.044,0-2.324,0.225-3.806,0.667L8,7.793V2.98l0.733-0.203C10.598,2.262,12.299,2,13.791,2  c2.549,0,4.557,0.553,5.969,1.643C21.246,4.793,22,6.484,22,8.674c0,0.926-0.208,1.874-0.617,2.816  c-0.412,0.951-1.313,2.125-2.757,3.588c-0.938,0.947-1.56,1.645-1.851,2.072c-0.221,0.326-0.326,0.695-0.326,1.135v2.434H10.511z" fill-opacity="0.6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="593.9609" x2="593.9609" y1="814.9561" y2="838.9591">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
-<path d="M19.148,4.434C17.911,3.479,16.126,3,13.791,3C12.384,3,10.787,3.246,9,3.741v2.71  c1.581-0.473,2.945-0.709,4.092-0.709c1.18,0,2.063,0.263,2.654,0.788c0.588,0.526,0.884,1.313,0.884,2.364  c0,0.503-0.123,1.018-0.365,1.544c-0.243,0.524-0.876,1.292-1.901,2.3c-0.971,0.935-1.688,1.791-2.152,2.568  c-0.468,0.777-0.7,1.697-0.7,2.758v1.654h3.938v-1.434c0-0.641,0.167-1.205,0.498-1.693c0.33-0.489,0.986-1.227,1.967-2.215  c1.347-1.366,2.194-2.46,2.552-3.284C20.824,10.268,21,9.461,21,8.674C21,6.805,20.384,5.39,19.148,4.434z" fill="url(#SVGID_2_)"/>
-<path d="M13.5,23c1.209,0,2.218,0.859,2.449,2C15.982,24.838,16,24.672,16,24.5  c0-1.381-1.119-2.5-2.5-2.5S11,23.119,11,24.5c0,0.172,0.018,0.338,0.051,0.5C11.282,23.859,12.291,23,13.5,23z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M16.63,9.895c0-0.22-0.021-0.42-0.046-0.616c-0.047,0.381-0.138,0.767-0.319,1.16  c-0.243,0.524-0.876,1.292-1.901,2.3c-0.971,0.935-1.688,1.791-2.152,2.568c-0.468,0.777-0.7,1.697-0.7,2.758v1  c0-1.061,0.232-1.98,0.7-2.758c0.464-0.777,1.182-1.634,2.152-2.568c1.025-1.008,1.658-1.775,1.901-2.3  C16.507,10.912,16.63,10.397,16.63,9.895z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M19.148,5.434c1.106,0.856,1.712,2.084,1.827,3.672C20.987,8.961,21,8.816,21,8.674  c0-1.869-0.616-3.284-1.852-4.24C17.911,3.479,16.126,3,13.791,3C12.384,3,10.787,3.246,9,3.741v1C10.787,4.246,12.384,4,13.791,4  C16.126,4,17.911,4.479,19.148,5.434z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M19.148,4.434C17.911,3.479,16.126,3,13.791,3C12.384,3,10.787,3.246,9,3.741v2.71  c1.581-0.473,2.945-0.709,4.092-0.709c1.18,0,2.063,0.263,2.654,0.788c0.588,0.526,0.884,1.313,0.884,2.364  c0,0.503-0.123,1.018-0.364,1.544c-0.244,0.524-0.875,1.292-1.902,2.3c-0.971,0.935-1.688,1.791-2.152,2.568  c-0.468,0.777-0.7,1.697-0.7,2.758v1.652h3.938v-1.434c0-0.643,0.167-1.205,0.497-1.693s0.986-1.227,1.968-2.215  c1.347-1.366,2.194-2.46,2.552-3.284C20.824,10.268,21,9.461,21,8.674C21,6.805,20.384,5.39,19.148,4.434z" fill="url(#SVGID_2_)"/>
+<path d="M13.5,23c1.209,0,2.218,0.859,2.449,2  C15.982,24.838,16,24.672,16,24.5c0-1.381-1.119-2.5-2.5-2.5S11,23.119,11,24.5c0,0.172,0.018,0.338,0.051,0.5  C11.282,23.859,12.291,23,13.5,23z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M16.63,9.895c0-0.22-0.021-0.42-0.046-0.616  c-0.047,0.381-0.139,0.767-0.318,1.16c-0.244,0.524-0.875,1.292-1.902,2.3c-0.971,0.935-1.688,1.791-2.152,2.568  c-0.468,0.777-0.7,1.697-0.7,2.757v1c0-1.062,0.232-1.979,0.7-2.758c0.464-0.777,1.182-1.635,2.152-2.569  c1.025-1.008,1.658-1.775,1.902-2.3C16.507,10.912,16.63,10.397,16.63,9.895z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M19.148,5.434c1.104,0.856,1.711,2.084,1.826,3.672  C20.986,8.961,21,8.816,21,8.674c0-1.869-0.616-3.284-1.852-4.24C17.911,3.479,16.126,3,13.791,3C12.384,3,10.787,3.246,9,3.741v1  C10.787,4.246,12.384,4,13.791,4C16.126,4,17.911,4.479,19.148,5.434z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill="none" height="30" width="30"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -9,7 +9,7 @@
 <path d="M0,0v30h30v-30h-30zm29,29h-28v-28h28v28z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <defs>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
-<stop offset="0" stop-color="#E0E1E2"/>
+<stop offset="0" stop-color="#E1E1E1"/>
 <stop offset="1" stop-color="#FFFFFF"/>
 </linearGradient>
 </defs>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_disabled.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_disabled.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<rect fill="#B4B4B4" height="30" width="30"/>
+<polyline fill="#DCDCDC" points="28,11 28,28 2,28 2,2 28,2 28,11 "/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_highlight.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_highlight.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_highlight.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -2,19 +2,19 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g>
-<rect fill-opacity="0.6" height="30" stroke-opacity="0.6" width="30"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#16A0D4"/>
+<rect fill-opacity="0.6" height="30" width="30"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="593.9609" x2="593.9609" y1="813.2588" y2="841.4798">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="3.188" y2="27.38">
-<stop offset="0" stop-color="#E0E1E2"/>
-<stop offset="1" stop-color="#FFFFFF"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="593.9609" x2="593.9609" y1="815.2285" y2="839.4205">
+<stop offset="0" style="stop-color:#E1E1E1"/>
+<stop offset="1" style="stop-color:#FFFFFF"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="24" width="24" x="3" y="3"/>
-<path d="M3,3v24h2v-20c0-0.55,0.45-1,1-1h18c0.55,0,1,0.45,1,1v20h2v-24h-24z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M3,3v24h1v-21c0-0.55,0.45-1,1-1h20c0.55,0,1,0.45,1,1v21h1v-24h-24z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="24" x="3" y="3"/>
+<path d="M3,3v24h2V7c0-0.55,0.45-1,1-1h18c0.55,0,1,0.45,1,1v20h2V3H3z" fill-opacity="0.05"/>
+<path d="M3,3v24h1V6c0-0.55,0.45-1,1-1h20c0.55,0,1,0.45,1,1v21h1V3H3z" fill-opacity="0.1"/>
+<rect fill-opacity="0.1" height="1" width="24" x="3" y="3"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_untrusted.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_untrusted.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_untrusted.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -19,13 +19,13 @@
 </linearGradient>
 <path d="M20,3c-3.859,0-7,3.141-7,7v6h2v-6c0-2.757,2.243-5,5-5s5,1.243,5,4h2C27,5.141,23.859,3,20,3z" fill="url(#SVGID_2_)"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="2" x2="23" y1="21" y2="21">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.24" style="stop-color:#FFE692"/>
-<stop offset="0.75" style="stop-color:#ED8C0D"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+<stop offset="0" style="stop-color:#C2A770"/>
+<stop offset="0.24" style="stop-color:#DED7B3"/>
+<stop offset="0.75" style="stop-color:#AA8250"/>
+<stop offset="1" style="stop-color:#BCA162"/>
 </linearGradient>
 <path d="M23,26c0,1.1-0.9,2-2,2H4c-1.1,0-2-0.9-2-2V16c0-1.1,0.9-2,2-2h17c1.1,0,2,0.9,2,2V26z" fill="url(#SVGID_3_)"/>
-<path d="M21,27H4c-1.1,0-2-0.9-2-2v1c0,1.1,0.9,2,2,2h17c1.1,0,2-0.9,2-2v-1C23,26.1,22.1,27,21,27z" fill="#873900" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M21,27H4c-1.1,0-2-0.9-2-2v1c0,1.1,0.9,2,2,2h17c1.1,0,2-0.9,2-2v-1C23,26.1,22.1,27,21,27z" fill="#5E2D29" fill-opacity="0.2" stroke-opacity="0.2"/>
 <path d="M21,14H4c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h17c1.1,0,2,0.9,2,2v-1C23,14.9,22.1,14,21,14z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <rect fill-opacity="0.2" height="2" stroke-opacity="0.2" width="21" x="2" y="23"/>
 <rect fill-opacity="0.2" height="2" stroke-opacity="0.2" width="21" x="2" y="19"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -12,30 +12,30 @@
 <circle cx="15" cy="14" fill-opacity="0.2" r="8" stroke-opacity="0.2"/>
 <polygon fill="#FFFFFF" points="3,22 9,22 9,28 "/>
 <radialGradient cx="-453.8818" cy="-300.0874" gradientTransform="matrix(0.3502 0 0 0.3502 173.9495 115.3211)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="30.0958">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="13" fill="url(#SVGID_2_)" r="8"/>
 <path d="M22.715,12.562c-0.178-3.125-2.201-5.814-5.157-6.855l-0.36,0.059l-2.09-0.399L12.5,6.919l-0.098,0.654  h-1.512l0.598,1.018l-1.619,1.32l-0.377,1.63l1.336,2.37l1.365-0.279l0.498,0.429l0.39,0.038l0.257,1.005l-0.339,0.882l1.239,3.169  h1.264l1.252-1.012v-0.413l0.331-0.513l0.273-0.14c-0.069,0.105-0.179,0.35-0.179,0.35c-0.012,0.082,0.178,1.695,0.734,1.568  c0.422-0.096,1.929-2.896,1.957-3.161c0.058-0.527-0.229-0.745-0.405-0.827l-0.196-0.092l-0.899,0.902  c-0.097,0.006-0.183,0.023-0.262,0.047v-0.749l0.978-0.954l0.496-1.604l0.758-0.615l-0.166-0.303l0.572-0.551l-0.319-0.582  l0.243,0.03l1.424,3.187l0.291-0.233c-0.01-0.156-0.025-0.31-0.044-0.464L22.715,12.562z M15.096,8.978l-0.119-0.316h0.715  l0.348,0.781h-0.517V8.978H15.096z M17.453,10.554l0.57,0.832l0.039,0.1l-0.584-0.354l-0.141-0.504L17.453,10.554z M18.312,12.008  l0.173,0.173l-0.224,0.049l-0.05-0.061L18.312,12.008z M13.848,6.407l0.363,0.562l-0.413,0.126l-0.161-0.092L13.848,6.407z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="5.0386" y2="21.0813">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M15,5c-4.418,0-8,3.583-8,8c0,4.42,3.582,8,8,8c4.42,0,8-3.58,8-8  C23,8.583,19.42,5,15,5z M15,20.385c-4.072,0-7.385-3.313-7.385-7.385S10.928,5.615,15,5.615S22.385,8.928,22.385,13  S19.072,20.385,15,20.385z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="15.4619" cy="7.1558" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="9.4862">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.335,15.286l-0.833,0.833c0,0-0.503,0-0.526,0.2c-0.011,0.086-0.039,0.457-0.124,0.649  c-0.168,0.116-0.367,0.5-0.367,0.5s-0.104,0.742,0.452,0.616C18.488,17.96,20.189,15.688,19.335,15.286z" fill="url(#SVGID_4_)"/>
 <radialGradient cx="15.4609" cy="7.1538" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="10.9747">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M17.455,5.997c-0.136,0.051-0.229,0.087-0.229,0.087l-2.058-0.395l-1.01,0.632l0.531,0.821  l-0.928,0.286l-0.5-0.286l0.176-0.499l-0.652,0.452l-0.117,0.786h-1.239l0.458,0.78l-1.742,1.421L9.816,11.5l0.646,1.252L10.852,13  l1.365-0.279l0.498,0.429l0.453,0.045l0.492,1.929l-0.328,0.853l0.725,1.603l0.205,0.665h1.263l0.714-0.386l0.539-0.625v-0.757  l1.023-0.522v-1.12l0.404-0.771l0.903-0.813l0.216-0.942l-1.182,0.264l-0.311-0.378l0.222-0.354l-0.839-0.506l-0.357-1.286  l0.619-0.404l0.57,0.833l0.215,0.549l0.428,0.429l0.5,0.261l0.557-0.089l0.617-0.594l-0.435-0.792l-0.547,0.143l-0.495-0.59  l0.471-0.328l1.475,0.179v0.524l1.284,2.646l0.291-0.233C22.234,9.529,20.219,6.969,17.455,5.997z M16.785,9.571L16.111,9.75h-0.896  V9.286h-0.857l-0.679,0.178l-1.036-0.285l-0.285-0.536l1.428-0.321h1.43L15,7.75h0.715l0.396,0.893l0.674,0.237V9.571z   M18.321,8.393l-1.214-0.214V7.75l0.607-0.143l0.178-0.215l0.429,0.357V8.393z" fill="url(#SVGID_5_)"/>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_home.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -12,38 +12,38 @@
 <circle cx="15" cy="14" fill-opacity="0.2" r="8" stroke-opacity="0.2"/>
 <polygon fill="#FFFFFF" points="3,22 9,22 9,28 "/>
 <radialGradient cx="-453.8818" cy="-300.0874" gradientTransform="matrix(0.3502 0 0 0.3502 173.9495 115.3211)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="30.0958">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="13" fill="url(#SVGID_2_)" r="8"/>
 <path d="M22.715,12.562c-0.178-3.125-2.201-5.814-5.157-6.855l-0.36,0.059l-2.09-0.399L12.5,6.919l-0.098,0.654  h-1.512l0.598,1.018l-1.619,1.32l-0.377,1.63l1.336,2.37l1.365-0.279l0.498,0.429l0.39,0.038l0.257,1.005l-0.339,0.882l1.239,3.169  h1.264l1.252-1.012v-0.413l0.331-0.513l0.273-0.14c-0.069,0.105-0.179,0.35-0.179,0.35c-0.012,0.082,0.178,1.695,0.734,1.568  c0.422-0.096,1.929-2.896,1.957-3.161c0.058-0.527-0.229-0.745-0.405-0.827l-0.196-0.092l-0.899,0.902  c-0.097,0.006-0.183,0.023-0.262,0.047v-0.749l0.978-0.954l0.496-1.604l0.758-0.615l-0.166-0.303l0.572-0.551l-0.319-0.582  l0.243,0.03l1.424,3.187l0.291-0.233c-0.01-0.156-0.025-0.31-0.044-0.464L22.715,12.562z M15.096,8.978l-0.119-0.316h0.715  l0.348,0.781h-0.517V8.978H15.096z M17.453,10.554l0.57,0.832l0.039,0.1l-0.584-0.354l-0.141-0.504L17.453,10.554z M18.312,12.008  l0.173,0.173l-0.224,0.049l-0.05-0.061L18.312,12.008z M13.848,6.407l0.363,0.562l-0.413,0.126l-0.161-0.092L13.848,6.407z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="5.0386" y2="21.0813">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M15,5c-4.418,0-8,3.583-8,8c0,4.42,3.582,8,8,8c4.42,0,8-3.58,8-8  C23,8.583,19.42,5,15,5z M15,20.385c-4.072,0-7.385-3.313-7.385-7.385S10.928,5.615,15,5.615S22.385,8.928,22.385,13  S19.072,20.385,15,20.385z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="15.4619" cy="7.1558" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="9.4862">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.335,15.286l-0.833,0.833c0,0-0.503,0-0.526,0.2c-0.011,0.086-0.039,0.457-0.124,0.649  c-0.168,0.116-0.367,0.5-0.367,0.5s-0.104,0.742,0.452,0.616C18.488,17.96,20.189,15.688,19.335,15.286z" fill="url(#SVGID_4_)"/>
 <radialGradient cx="15.4609" cy="7.1538" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="10.9747">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M17.455,5.997c-0.136,0.051-0.229,0.087-0.229,0.087l-2.058-0.395l-1.01,0.632l0.531,0.821  l-0.928,0.286l-0.5-0.286l0.176-0.499l-0.652,0.452l-0.117,0.786h-1.239l0.458,0.78l-1.742,1.421L9.816,11.5l0.646,1.252L10.852,13  l1.365-0.279l0.498,0.429l0.453,0.045l0.492,1.929l-0.328,0.853l0.725,1.603l0.205,0.665h1.263l0.714-0.386l0.539-0.625v-0.757  l1.023-0.522v-1.12l0.404-0.771l0.903-0.813l0.216-0.942l-1.182,0.264l-0.311-0.378l0.222-0.354l-0.839-0.506l-0.357-1.286  l0.619-0.404l0.57,0.833l0.215,0.549l0.428,0.429l0.5,0.261l0.557-0.089l0.617-0.594l-0.435-0.792l-0.547,0.143l-0.495-0.59  l0.471-0.328l1.475,0.179v0.524l1.284,2.646l0.291-0.233C22.234,9.529,20.219,6.969,17.455,5.997z M16.785,9.571L16.111,9.75h-0.896  V9.286h-0.857l-0.679,0.178l-1.036-0.285l-0.285-0.536l1.428-0.321h1.43L15,7.75h0.715l0.396,0.893l0.674,0.237V9.571z   M18.321,8.393l-1.214-0.214V7.75l0.607-0.143l0.178-0.215l0.429,0.357V8.393z" fill="url(#SVGID_5_)"/>
 </g>
 <g>
 <path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="22" x2="22" y1="14.9683" y2="29.1646">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="1" style="stop-color:#EF6902"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="1" style="stop-color:#A86F49"/>
 </linearGradient>
 <circle cx="22" cy="22" fill="url(#SVGID_1__)" r="7"/>
 <polygon fill-opacity="0.2" points="26.34,24 21.999,19.4 17.66,24 17,23.3 21.999,18 27,23.3 26.34,24 " stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_work.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_work.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_work.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -12,30 +12,30 @@
 <circle cx="15" cy="14" fill-opacity="0.2" r="8" stroke-opacity="0.2"/>
 <polygon fill="#FFFFFF" points="3,22 9,22 9,28 "/>
 <radialGradient cx="-453.8818" cy="-300.0874" gradientTransform="matrix(0.3502 0 0 0.3502 173.9495 115.3211)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="30.0958">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="13" fill="url(#SVGID_2_)" r="8"/>
 <path d="M22.715,12.562c-0.178-3.125-2.201-5.814-5.157-6.855l-0.36,0.059l-2.09-0.399L12.5,6.919l-0.098,0.654  h-1.512l0.598,1.018l-1.619,1.32l-0.377,1.63l1.336,2.37l1.365-0.279l0.498,0.429l0.39,0.038l0.257,1.005l-0.339,0.882l1.239,3.169  h1.264l1.252-1.012v-0.413l0.331-0.513l0.273-0.14c-0.069,0.105-0.179,0.35-0.179,0.35c-0.012,0.082,0.178,1.695,0.734,1.568  c0.422-0.096,1.929-2.896,1.957-3.161c0.058-0.527-0.229-0.745-0.405-0.827l-0.196-0.092l-0.899,0.902  c-0.097,0.006-0.183,0.023-0.262,0.047v-0.749l0.978-0.954l0.496-1.604l0.758-0.615l-0.166-0.303l0.572-0.551l-0.319-0.582  l0.243,0.03l1.424,3.187l0.291-0.233c-0.01-0.156-0.025-0.31-0.044-0.464L22.715,12.562z M15.096,8.978l-0.119-0.316h0.715  l0.348,0.781h-0.517V8.978H15.096z M17.453,10.554l0.57,0.832l0.039,0.1l-0.584-0.354l-0.141-0.504L17.453,10.554z M18.312,12.008  l0.173,0.173l-0.224,0.049l-0.05-0.061L18.312,12.008z M13.848,6.407l0.363,0.562l-0.413,0.126l-0.161-0.092L13.848,6.407z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="5.0386" y2="21.0813">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M15,5c-4.418,0-8,3.583-8,8c0,4.42,3.582,8,8,8c4.42,0,8-3.58,8-8  C23,8.583,19.42,5,15,5z M15,20.385c-4.072,0-7.385-3.313-7.385-7.385S10.928,5.615,15,5.615S22.385,8.928,22.385,13  S19.072,20.385,15,20.385z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="15.4619" cy="7.1558" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="9.4862">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.335,15.286l-0.833,0.833c0,0-0.503,0-0.526,0.2c-0.011,0.086-0.039,0.457-0.124,0.649  c-0.168,0.116-0.367,0.5-0.367,0.5s-0.104,0.742,0.452,0.616C18.488,17.96,20.189,15.688,19.335,15.286z" fill="url(#SVGID_4_)"/>
 <radialGradient cx="15.4609" cy="7.1538" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="10.9747">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M17.455,5.997c-0.136,0.051-0.229,0.087-0.229,0.087l-2.058-0.395l-1.01,0.632l0.531,0.821  l-0.928,0.286l-0.5-0.286l0.176-0.499l-0.652,0.452l-0.117,0.786h-1.239l0.458,0.78l-1.742,1.421L9.816,11.5l0.646,1.252L10.852,13  l1.365-0.279l0.498,0.429l0.453,0.045l0.492,1.929l-0.328,0.853l0.725,1.603l0.205,0.665h1.263l0.714-0.386l0.539-0.625v-0.757  l1.023-0.522v-1.12l0.404-0.771l0.903-0.813l0.216-0.942l-1.182,0.264l-0.311-0.378l0.222-0.354l-0.839-0.506l-0.357-1.286  l0.619-0.404l0.57,0.833l0.215,0.549l0.428,0.429l0.5,0.261l0.557-0.089l0.617-0.594l-0.435-0.792l-0.547,0.143l-0.495-0.59  l0.471-0.328l1.475,0.179v0.524l1.284,2.646l0.291-0.233C22.234,9.529,20.219,6.969,17.455,5.997z M16.785,9.571L16.111,9.75h-0.896  V9.286h-0.857l-0.679,0.178l-1.036-0.285l-0.285-0.536l1.428-0.321h1.43L15,7.75h0.715l0.396,0.893l0.674,0.237V9.571z   M18.321,8.393l-1.214-0.214V7.75l0.607-0.143l0.178-0.215l0.429,0.357V8.393z" fill="url(#SVGID_5_)"/>
 </g>
@@ -44,8 +44,8 @@
 <g>
 <path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -549.9609 -796.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="571.9609" x2="571.9609" y1="811.0391" y2="825.0391">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#A2A6A5"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <circle cx="22" cy="22" fill="url(#SVGID_1__)" r="7"/>
 <path d="M22,16c3.697,0,6.717,2.869,6.975,6.5   C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C15.283,18.869,18.303,16,22,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_video.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_video.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_video.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -10,23 +10,23 @@
 </linearGradient>
 <rect fill="url(#SVGID_1_)" height="24" width="26" x="2" y="3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.0005" x2="15.0005" y1="21.125" y2="9.0729">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="12" width="24" x="3" y="9"/>
-<rect fill="#F1F1F2" height="2" width="3" x="3" y="5"/>
-<rect fill="#F1F1F2" height="2" width="3" x="8" y="5"/>
-<rect fill="#F1F1F2" height="2" width="4" x="13" y="5"/>
-<rect fill="#F1F1F2" height="2" width="3" x="19" y="5"/>
-<rect fill="#F1F1F2" height="2" width="3" x="24" y="5"/>
-<rect fill="#F1F1F2" height="2" width="3" x="3" y="23"/>
-<rect fill="#F1F1F2" height="2" width="3" x="8" y="23"/>
-<rect fill="#F1F1F2" height="2" width="4" x="13" y="23"/>
-<rect fill="#F1F1F2" height="2" width="3" x="19" y="23"/>
-<rect fill="#F1F1F2" height="2" width="3" x="24" y="23"/>
+<rect fill="#F1F2F2" height="2" width="3" x="3" y="5"/>
+<rect fill="#F1F2F2" height="2" width="3" x="8" y="5"/>
+<rect fill="#F1F2F2" height="2" width="4" x="13" y="5"/>
+<rect fill="#F1F2F2" height="2" width="3" x="19" y="5"/>
+<rect fill="#F1F2F2" height="2" width="3" x="24" y="5"/>
+<rect fill="#F1F2F2" height="2" width="3" x="3" y="23"/>
+<rect fill="#F1F2F2" height="2" width="3" x="8" y="23"/>
+<rect fill="#F1F2F2" height="2" width="4" x="13" y="23"/>
+<rect fill="#F1F2F2" height="2" width="3" x="19" y="23"/>
+<rect fill="#F1F2F2" height="2" width="3" x="24" y="23"/>
 <rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="26" x="2" y="3"/>
 <rect fill="#FFFFFF" fill-opacity="0.1" height="1" stroke-opacity="0.1" width="26" x="2" y="26"/>
 <rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="24" x="3" y="20"/>
-<rect fill="#00006B" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="24" x="3" y="9"/>
+<rect fill="#2D204B" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="24" x="3" y="9"/>
 </g>
 </svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,54 +5,54 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M16,0C8.28,0,2,6.279,2,14c0,7.719,6.28,14,14,14s14-6.281,14-14C30,6.279,23.72,0,16,0z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <radialGradient cx="-451.0264" cy="-302.1748" gradientTransform="matrix(0.3502 0 0 0.3502 173.9495 115.3211)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="48.9059">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="16" cy="14" fill="url(#SVGID_1_)" r="13"/>
 <path d="M28.536,13.287c-0.288-5.078-3.577-9.449-8.38-11.141l-0.585,0.096l-3.397-0.65l-4.235,2.525l-0.159,1.064  H9.322l0.971,1.652L7.662,8.979l-0.613,2.65l2.173,3.85l2.218-0.453l0.81,0.697l0.633,0.063l0.418,1.633l-0.552,1.432L14.763,24  h2.053l2.035-1.645v-0.67l0.537-0.834l0.444-0.227c-0.113,0.172-0.29,0.566-0.29,0.566c-0.019,0.135,0.289,2.756,1.192,2.551  c0.686-0.156,3.135-4.705,3.182-5.139c0.093-0.855-0.373-1.209-0.659-1.342l-0.318-0.15l-1.462,1.465  c-0.157,0.012-0.298,0.039-0.426,0.076v-1.217l1.588-1.551l0.808-2.604l1.231-1.002l-0.27-0.49l0.929-0.895l-0.519-0.945  l0.395,0.047l2.313,5.178L28,14.795c-0.015-0.254-0.042-0.502-0.071-0.752L28.536,13.287z M16.156,7.463l-0.193-0.516h1.161  l0.565,1.271h-0.841V7.463H16.156z M19.987,10.023l0.927,1.354l0.063,0.162l-0.95-0.574L19.8,10.146L19.987,10.023z M21.381,12.387  l0.28,0.281l-0.362,0.08l-0.082-0.1L21.381,12.387z M14.127,3.285l0.59,0.914l-0.67,0.205l-0.262-0.15L14.127,3.285z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.9995" x2="15.9995" y1="1.0625" y2="27.1316">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M16,1C8.821,1,3,6.82,3,14c0,7.182,5.821,13,13,13c7.182,0,13-5.818,13-13  C29,6.82,23.182,1,16,1z M16,26C9.383,26,4,20.617,4,14S9.383,2,16,2s12,5.383,12,12S22.617,26,16,26z" fill="url(#SVGID_2_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="16.75" cy="4.499" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="15.4173">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M23.044,17.713l-1.353,1.355c0,0-0.818,0-0.856,0.324c-0.018,0.141-0.063,0.744-0.201,1.057  c-0.272,0.188-0.597,0.813-0.597,0.813s-0.169,1.205,0.734,1C21.669,22.059,24.434,18.367,23.044,17.713z" fill="url(#SVGID_3_)"/>
 <radialGradient cx="16.75" cy="4.5005" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="17.8328">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.99,2.619c-0.222,0.084-0.374,0.141-0.374,0.141l-3.344-0.639l-1.64,1.025l0.863,1.336  l-1.509,0.463l-0.813-0.463l0.286-0.811l-1.06,0.734L12.21,5.682h-2.014l0.745,1.268L8.11,9.258l-0.533,2.305l1.051,2.035L9.259,14  l2.218-0.453l0.81,0.695l0.736,0.072l0.801,3.135l-0.533,1.385l1.178,2.605l0.332,1.08h2.053l1.16-0.627l0.875-1.016v-1.23  l1.663-0.848v-1.822l0.658-1.25l1.467-1.32l0.351-1.531l-1.919,0.428l-0.505-0.615l0.359-0.574l-1.363-0.824l-0.581-2.088  l1.007-0.656l0.927,1.352l0.349,0.893l0.696,0.697l0.813,0.424l0.903-0.145l1.003-0.965l-0.706-1.289L23.12,9.744l-0.804-0.957  l0.764-0.533l2.397,0.291v0.852l2.086,4.299l0.474-0.379C27.756,8.359,24.48,4.199,19.99,2.619z M18.901,8.428l-1.095,0.291h-1.458  V7.963h-1.394l-1.103,0.291L12.17,7.789L11.705,6.92l2.321-0.523h2.322L16,5.469h1.161l0.646,1.451l1.095,0.383V8.428z   M21.397,6.514l-1.974-0.35V5.469l0.987-0.232l0.29-0.348l0.696,0.58V6.514z" fill="url(#SVGID_4_)"/>
 <path d="M2.73,8.398C2.449,8.582,1.209,9.846,1.185,9.875c-0.489,0.596-0.786,1.178-0.795,1.197  c-0.308,0.727-0.585,2.615-0.205,4.359c0.282,1.289,1.901,4.789,3.796,7.348c2.016,2.721,5.333,5.609,6.953,6.371  c1.669,0.787,2.914,0.85,3.256,0.85c0.176,0,0.325-0.014,0.459-0.039c0.1-0.018,1.208-0.223,2.326-0.977  c0,0,0.467-0.314,0.729-0.555c0.02-0.018,0.786-0.768,0.799-0.785c0.247-0.311,0.358-0.701,0.312-1.102  c-0.049-0.416-0.27-0.805-0.605-1.068c0,0-4.841-3.844-4.875-3.863c-0.257-0.156-0.547-0.238-0.841-0.238  c-0.458,0-0.881,0.199-1.161,0.549l-0.5,0.611c-0.726-0.627-1.689-1.563-2.338-2.438c-0.884-1.193-1.535-2.25-2.041-3.324  l1.232-0.553c0.369-0.166,0.646-0.467,0.786-0.85c0.146-0.396,0.12-0.852-0.067-1.244L5.742,8.617  c-0.269-0.557-0.83-0.914-1.431-0.914c-0.217,0-0.427,0.045-0.622,0.135L2.73,8.398z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-0.2866" x2="10.2134" y1="8.4424" y2="26.7754">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.5212" style="stop-color:#AAB1B5"/>
-<stop offset="1" style="stop-color:#838F94"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.5212" style="stop-color:#ADB2B1"/>
+<stop offset="1" style="stop-color:#888E8F"/>
 </linearGradient>
 <path d="M5.143,16.264c0.67,1.684,1.561,3.094,2.548,4.428c0.95,1.281,2.554,2.713,3.286,3.242l3.479,5.045  c-0.384,0.076-1.622-0.037-3.097-0.732c-1.477-0.695-4.652-3.467-6.575-6.063c-1.922-2.594-3.398-5.941-3.622-6.965  c-0.352-1.611-0.051-3.287,0.148-3.756c0,0,0.213-0.426,0.646-0.951C2.142,10.285,5.143,16.264,5.143,16.264z" fill="url(#SVGID_5_)"/>
 <radialGradient cx="10.8911" cy="22.9111" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="8.6673">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0424" style="stop-color:#D3D7D5"/>
+<stop offset="0.4" style="stop-color:#BDC0BF"/>
+<stop offset="0.7333" style="stop-color:#82898B"/>
+<stop offset="1" style="stop-color:#ACB2B1"/>
 </radialGradient>
 <path d="M17.592,26.262l-3.165-2.527l-1.612-1.27c-0.241-0.146-0.541-0.119-0.703,0.084l-0.635,0.775v0.002  l-0.5,0.607c0-0.002-0.002-0.006-0.003-0.006c-0.565,2.01,0.43,4.135,2.343,4.865c0.253,0.094,0.509,0.162,0.765,0.201  c0.16,0.004,0.291,0,0.375-0.016c0,0,0.987-0.168,1.959-0.824c0.324-0.217,0.353-0.223,0.614-0.463c0.001-0.002,0-0.004,0.002-0.006  c0.515-0.471,0.689-0.664,0.689-0.664C17.898,26.799,17.842,26.457,17.592,26.262z" fill="url(#SVGID_6_)"/>
 <path d="M11.477,23.324l0.635-0.775c0.162-0.203,0.462-0.23,0.703-0.084l1.612,1.27l3.165,2.527  c0.25,0.195,0.307,0.537,0.129,0.76c0,0-0.176,0.193-0.693,0.668L11.477,23.324z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <radialGradient cx="-162.3672" cy="-37.5952" gradientTransform="matrix(0.9891 0.1471 -0.1471 0.9891 159.0668 70.322)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="8.6173">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0424" style="stop-color:#D3D7D5"/>
+<stop offset="0.4" style="stop-color:#BDC0BF"/>
+<stop offset="0.7333" style="stop-color:#82898B"/>
+<stop offset="1" style="stop-color:#ACB2B1"/>
 </radialGradient>
 <path d="M7.502,14.557l-2.66-5.506C4.701,8.762,4.371,8.625,4.104,8.748c0,0-0.232,0.105-0.813,0.479  c0,0.002-0.001,0-0.002,0.002C2.973,9.432,2.947,9.523,2.634,9.801c-0.434,0.389-0.758,0.793-0.978,1.105  c-0.721,2.08,0.275,4.35,2.266,5.109c0.406,0.154,0.822,0.23,1.236,0.242l1.266-0.57l0.853-0.381  C7.545,15.186,7.643,14.85,7.502,14.557z" fill="url(#SVGID_7_)"/>
 <path d="M3.29,9.229c0.581-0.375,0.813-0.48,0.813-0.48c0.268-0.123,0.598,0.014,0.738,0.303  l2.66,5.506c0.141,0.293,0.043,0.629-0.226,0.75l-0.853,0.381L3.29,9.229z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_home.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_home.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_home.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,54 +5,54 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M16,0C8.28,0,2,6.279,2,14c0,7.719,6.28,14,14,14s14-6.281,14-14C30,6.279,23.72,0,16,0z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <radialGradient cx="-451.0264" cy="-302.1748" gradientTransform="matrix(0.3502 0 0 0.3502 173.9495 115.3211)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="48.9059">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="16" cy="14" fill="url(#SVGID_1_)" r="13"/>
 <path d="M28.536,13.287c-0.288-5.078-3.577-9.449-8.38-11.141l-0.585,0.096l-3.397-0.65l-4.235,2.525l-0.159,1.064  H9.322l0.971,1.652L7.662,8.979l-0.613,2.65l2.173,3.85l2.218-0.453l0.81,0.697l0.633,0.063l0.418,1.633l-0.552,1.432L14.763,24  h2.053l2.035-1.645v-0.67l0.537-0.834l0.444-0.227c-0.113,0.172-0.29,0.566-0.29,0.566c-0.019,0.135,0.289,2.756,1.192,2.551  c0.686-0.156,3.135-4.705,3.182-5.139c0.093-0.855-0.373-1.209-0.659-1.342l-0.318-0.15l-1.462,1.465  c-0.157,0.012-0.298,0.039-0.426,0.076v-1.217l1.588-1.551l0.808-2.604l1.231-1.002l-0.27-0.49l0.929-0.895l-0.519-0.945  l0.395,0.047l2.313,5.178L28,14.795c-0.015-0.254-0.042-0.502-0.071-0.752L28.536,13.287z M16.156,7.463l-0.193-0.516h1.161  l0.565,1.271h-0.841V7.463H16.156z M19.987,10.023l0.927,1.354l0.063,0.162l-0.95-0.574L19.8,10.146L19.987,10.023z M21.381,12.387  l0.28,0.281l-0.362,0.08l-0.082-0.1L21.381,12.387z M14.127,3.285l0.59,0.914l-0.67,0.205l-0.262-0.15L14.127,3.285z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.9995" x2="15.9995" y1="1.0625" y2="27.1316">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M16,1C8.821,1,3,6.82,3,14c0,7.182,5.821,13,13,13c7.182,0,13-5.818,13-13  C29,6.82,23.182,1,16,1z M16,26C9.383,26,4,20.617,4,14S9.383,2,16,2s12,5.383,12,12S22.617,26,16,26z" fill="url(#SVGID_2_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="16.75" cy="4.499" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="15.4173">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M23.044,17.713l-1.353,1.355c0,0-0.818,0-0.856,0.324c-0.018,0.141-0.063,0.744-0.201,1.057  c-0.272,0.188-0.597,0.813-0.597,0.813s-0.169,1.205,0.734,1C21.669,22.059,24.434,18.367,23.044,17.713z" fill="url(#SVGID_3_)"/>
 <radialGradient cx="16.75" cy="4.5005" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="17.8328">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.99,2.619c-0.222,0.084-0.374,0.141-0.374,0.141l-3.344-0.639l-1.64,1.025l0.863,1.336  l-1.509,0.463l-0.813-0.463l0.286-0.811l-1.06,0.734L12.21,5.682h-2.014l0.745,1.268L8.11,9.258l-0.533,2.305l1.051,2.035L9.259,14  l2.218-0.453l0.81,0.695l0.736,0.072l0.801,3.135l-0.533,1.385l1.178,2.605l0.332,1.08h2.053l1.16-0.627l0.875-1.016v-1.23  l1.663-0.848v-1.822l0.658-1.25l1.467-1.32l0.351-1.531l-1.919,0.428l-0.505-0.615l0.359-0.574l-1.363-0.824l-0.581-2.088  l1.007-0.656l0.927,1.352l0.349,0.893l0.696,0.697l0.813,0.424l0.903-0.145l1.003-0.965l-0.706-1.289L23.12,9.744l-0.804-0.957  l0.764-0.533l2.397,0.291v0.852l2.086,4.299l0.474-0.379C27.756,8.359,24.48,4.199,19.99,2.619z M18.901,8.428l-1.095,0.291h-1.458  V7.963h-1.394l-1.103,0.291L12.17,7.789L11.705,6.92l2.321-0.523h2.322L16,5.469h1.161l0.646,1.451l1.095,0.383V8.428z   M21.397,6.514l-1.974-0.35V5.469l0.987-0.232l0.29-0.348l0.696,0.58V6.514z" fill="url(#SVGID_4_)"/>
 <path d="M2.73,8.398C2.449,8.582,1.209,9.846,1.185,9.875c-0.489,0.596-0.786,1.178-0.795,1.197  c-0.308,0.727-0.585,2.615-0.205,4.359c0.282,1.289,1.901,4.789,3.796,7.348c2.016,2.721,5.333,5.609,6.953,6.371  c1.669,0.787,2.914,0.85,3.256,0.85c0.176,0,0.325-0.014,0.459-0.039c0.1-0.018,1.208-0.223,2.326-0.977  c0,0,0.467-0.314,0.729-0.555c0.02-0.018,0.786-0.768,0.799-0.785c0.247-0.311,0.358-0.701,0.312-1.102  c-0.049-0.416-0.27-0.805-0.605-1.068c0,0-4.841-3.844-4.875-3.863c-0.257-0.156-0.547-0.238-0.841-0.238  c-0.458,0-0.881,0.199-1.161,0.549l-0.5,0.611c-0.726-0.627-1.689-1.563-2.338-2.438c-0.884-1.193-1.535-2.25-2.041-3.324  l1.232-0.553c0.369-0.166,0.646-0.467,0.786-0.85c0.146-0.396,0.12-0.852-0.067-1.244L5.742,8.617  c-0.269-0.557-0.83-0.914-1.431-0.914c-0.217,0-0.427,0.045-0.622,0.135L2.73,8.398z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-0.2866" x2="10.2134" y1="8.4424" y2="26.7754">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.5212" style="stop-color:#AAB1B5"/>
-<stop offset="1" style="stop-color:#838F94"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.5212" style="stop-color:#ADB2B1"/>
+<stop offset="1" style="stop-color:#888E8F"/>
 </linearGradient>
 <path d="M5.143,16.264c0.67,1.684,1.561,3.094,2.548,4.428c0.95,1.281,2.554,2.713,3.286,3.242l3.479,5.045  c-0.384,0.076-1.622-0.037-3.097-0.732c-1.477-0.695-4.652-3.467-6.575-6.063c-1.922-2.594-3.398-5.941-3.622-6.965  c-0.352-1.611-0.051-3.287,0.148-3.756c0,0,0.213-0.426,0.646-0.951C2.142,10.285,5.143,16.264,5.143,16.264z" fill="url(#SVGID_5_)"/>
 <radialGradient cx="10.8911" cy="22.9111" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="8.6673">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0424" style="stop-color:#D3D7D5"/>
+<stop offset="0.4" style="stop-color:#BDC0BF"/>
+<stop offset="0.7333" style="stop-color:#82898B"/>
+<stop offset="1" style="stop-color:#ACB2B1"/>
 </radialGradient>
 <path d="M17.592,26.262l-3.165-2.527l-1.612-1.27c-0.241-0.146-0.541-0.119-0.703,0.084l-0.635,0.775v0.002  l-0.5,0.607c0-0.002-0.002-0.006-0.003-0.006c-0.565,2.01,0.43,4.135,2.343,4.865c0.253,0.094,0.509,0.162,0.765,0.201  c0.16,0.004,0.291,0,0.375-0.016c0,0,0.987-0.168,1.959-0.824c0.324-0.217,0.353-0.223,0.614-0.463c0.001-0.002,0-0.004,0.002-0.006  c0.515-0.471,0.689-0.664,0.689-0.664C17.898,26.799,17.842,26.457,17.592,26.262z" fill="url(#SVGID_6_)"/>
 <path d="M11.477,23.324l0.635-0.775c0.162-0.203,0.462-0.23,0.703-0.084l1.612,1.27l3.165,2.527  c0.25,0.195,0.307,0.537,0.129,0.76c0,0-0.176,0.193-0.693,0.668L11.477,23.324z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <radialGradient cx="-162.3672" cy="-37.5952" gradientTransform="matrix(0.9891 0.1471 -0.1471 0.9891 159.0668 70.322)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="8.6173">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0424" style="stop-color:#D3D7D5"/>
+<stop offset="0.4" style="stop-color:#BDC0BF"/>
+<stop offset="0.7333" style="stop-color:#82898B"/>
+<stop offset="1" style="stop-color:#ACB2B1"/>
 </radialGradient>
 <path d="M7.502,14.557l-2.66-5.506C4.701,8.762,4.371,8.625,4.104,8.748c0,0-0.232,0.105-0.813,0.479  c0,0.002-0.001,0-0.002,0.002C2.973,9.432,2.947,9.523,2.634,9.801c-0.434,0.389-0.758,0.793-0.978,1.105  c-0.721,2.08,0.275,4.35,2.266,5.109c0.406,0.154,0.822,0.23,1.236,0.242l1.266-0.57l0.853-0.381  C7.545,15.186,7.643,14.85,7.502,14.557z" fill="url(#SVGID_7_)"/>
 <path d="M3.29,9.229c0.581-0.375,0.813-0.48,0.813-0.48c0.268-0.123,0.598,0.014,0.738,0.303  l2.66,5.506c0.141,0.293,0.043,0.629-0.226,0.75l-0.853,0.381L3.29,9.229z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
@@ -60,8 +60,8 @@
 <g>
 <path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="22" x2="22" y1="14.9683" y2="29.1646">
-<stop offset="0" style="stop-color:#FFC144"/>
-<stop offset="1" style="stop-color:#EF6902"/>
+<stop offset="0" style="stop-color:#C7B17C"/>
+<stop offset="1" style="stop-color:#A86F49"/>
 </linearGradient>
 <circle cx="22" cy="22" fill="url(#SVGID_1__)" r="7"/>
 <polygon fill-opacity="0.2" points="26.34,24 21.999,19.4 17.66,24 17,23.3 21.999,18 27,23.3 26.34,24 " stroke-opacity="0.2"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_work.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_work.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_work.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,54 +5,54 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M16,0C8.28,0,2,6.279,2,14c0,7.719,6.28,14,14,14s14-6.281,14-14C30,6.279,23.72,0,16,0z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <radialGradient cx="-451.0264" cy="-302.1748" gradientTransform="matrix(0.3502 0 0 0.3502 173.9495 115.3211)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="48.9059">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="16" cy="14" fill="url(#SVGID_1_)" r="13"/>
 <path d="M28.536,13.287c-0.288-5.078-3.577-9.449-8.38-11.141l-0.585,0.096l-3.397-0.65l-4.235,2.525l-0.159,1.064  H9.322l0.971,1.652L7.662,8.979l-0.613,2.65l2.173,3.85l2.218-0.453l0.81,0.697l0.633,0.063l0.418,1.633l-0.552,1.432L14.763,24  h2.053l2.035-1.645v-0.67l0.537-0.834l0.444-0.227c-0.113,0.172-0.29,0.566-0.29,0.566c-0.019,0.135,0.289,2.756,1.192,2.551  c0.686-0.156,3.135-4.705,3.182-5.139c0.093-0.855-0.373-1.209-0.659-1.342l-0.318-0.15l-1.462,1.465  c-0.157,0.012-0.298,0.039-0.426,0.076v-1.217l1.588-1.551l0.808-2.604l1.231-1.002l-0.27-0.49l0.929-0.895l-0.519-0.945  l0.395,0.047l2.313,5.178L28,14.795c-0.015-0.254-0.042-0.502-0.071-0.752L28.536,13.287z M16.156,7.463l-0.193-0.516h1.161  l0.565,1.271h-0.841V7.463H16.156z M19.987,10.023l0.927,1.354l0.063,0.162l-0.95-0.574L19.8,10.146L19.987,10.023z M21.381,12.387  l0.28,0.281l-0.362,0.08l-0.082-0.1L21.381,12.387z M14.127,3.285l0.59,0.914l-0.67,0.205l-0.262-0.15L14.127,3.285z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.9995" x2="15.9995" y1="1.0625" y2="27.1316">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M16,1C8.821,1,3,6.82,3,14c0,7.182,5.821,13,13,13c7.182,0,13-5.818,13-13  C29,6.82,23.182,1,16,1z M16,26C9.383,26,4,20.617,4,14S9.383,2,16,2s12,5.383,12,12S22.617,26,16,26z" fill="url(#SVGID_2_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="16.75" cy="4.499" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="15.4173">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M23.044,17.713l-1.353,1.355c0,0-0.818,0-0.856,0.324c-0.018,0.141-0.063,0.744-0.201,1.057  c-0.272,0.188-0.597,0.813-0.597,0.813s-0.169,1.205,0.734,1C21.669,22.059,24.434,18.367,23.044,17.713z" fill="url(#SVGID_3_)"/>
 <radialGradient cx="16.75" cy="4.5005" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="17.8328">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M19.99,2.619c-0.222,0.084-0.374,0.141-0.374,0.141l-3.344-0.639l-1.64,1.025l0.863,1.336  l-1.509,0.463l-0.813-0.463l0.286-0.811l-1.06,0.734L12.21,5.682h-2.014l0.745,1.268L8.11,9.258l-0.533,2.305l1.051,2.035L9.259,14  l2.218-0.453l0.81,0.695l0.736,0.072l0.801,3.135l-0.533,1.385l1.178,2.605l0.332,1.08h2.053l1.16-0.627l0.875-1.016v-1.23  l1.663-0.848v-1.822l0.658-1.25l1.467-1.32l0.351-1.531l-1.919,0.428l-0.505-0.615l0.359-0.574l-1.363-0.824l-0.581-2.088  l1.007-0.656l0.927,1.352l0.349,0.893l0.696,0.697l0.813,0.424l0.903-0.145l1.003-0.965l-0.706-1.289L23.12,9.744l-0.804-0.957  l0.764-0.533l2.397,0.291v0.852l2.086,4.299l0.474-0.379C27.756,8.359,24.48,4.199,19.99,2.619z M18.901,8.428l-1.095,0.291h-1.458  V7.963h-1.394l-1.103,0.291L12.17,7.789L11.705,6.92l2.321-0.523h2.322L16,5.469h1.161l0.646,1.451l1.095,0.383V8.428z   M21.397,6.514l-1.974-0.35V5.469l0.987-0.232l0.29-0.348l0.696,0.58V6.514z" fill="url(#SVGID_4_)"/>
 <path d="M2.73,8.398C2.449,8.582,1.209,9.846,1.185,9.875c-0.489,0.596-0.786,1.178-0.795,1.197  c-0.308,0.727-0.585,2.615-0.205,4.359c0.282,1.289,1.901,4.789,3.796,7.348c2.016,2.721,5.333,5.609,6.953,6.371  c1.669,0.787,2.914,0.85,3.256,0.85c0.176,0,0.325-0.014,0.459-0.039c0.1-0.018,1.208-0.223,2.326-0.977  c0,0,0.467-0.314,0.729-0.555c0.02-0.018,0.786-0.768,0.799-0.785c0.247-0.311,0.358-0.701,0.312-1.102  c-0.049-0.416-0.27-0.805-0.605-1.068c0,0-4.841-3.844-4.875-3.863c-0.257-0.156-0.547-0.238-0.841-0.238  c-0.458,0-0.881,0.199-1.161,0.549l-0.5,0.611c-0.726-0.627-1.689-1.563-2.338-2.438c-0.884-1.193-1.535-2.25-2.041-3.324  l1.232-0.553c0.369-0.166,0.646-0.467,0.786-0.85c0.146-0.396,0.12-0.852-0.067-1.244L5.742,8.617  c-0.269-0.557-0.83-0.914-1.431-0.914c-0.217,0-0.427,0.045-0.622,0.135L2.73,8.398z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-0.2866" x2="10.2134" y1="8.4424" y2="26.7754">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.5212" style="stop-color:#AAB1B5"/>
-<stop offset="1" style="stop-color:#838F94"/>
+<stop offset="0" style="stop-color:#ECEFED"/>
+<stop offset="0.5212" style="stop-color:#ADB2B1"/>
+<stop offset="1" style="stop-color:#888E8F"/>
 </linearGradient>
 <path d="M5.143,16.264c0.67,1.684,1.561,3.094,2.548,4.428c0.95,1.281,2.554,2.713,3.286,3.242l3.479,5.045  c-0.384,0.076-1.622-0.037-3.097-0.732c-1.477-0.695-4.652-3.467-6.575-6.063c-1.922-2.594-3.398-5.941-3.622-6.965  c-0.352-1.611-0.051-3.287,0.148-3.756c0,0,0.213-0.426,0.646-0.951C2.142,10.285,5.143,16.264,5.143,16.264z" fill="url(#SVGID_5_)"/>
 <radialGradient cx="10.8911" cy="22.9111" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="8.6673">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0424" style="stop-color:#D3D7D5"/>
+<stop offset="0.4" style="stop-color:#BDC0BF"/>
+<stop offset="0.7333" style="stop-color:#82898B"/>
+<stop offset="1" style="stop-color:#ACB2B1"/>
 </radialGradient>
 <path d="M17.592,26.262l-3.165-2.527l-1.612-1.27c-0.241-0.146-0.541-0.119-0.703,0.084l-0.635,0.775v0.002  l-0.5,0.607c0-0.002-0.002-0.006-0.003-0.006c-0.565,2.01,0.43,4.135,2.343,4.865c0.253,0.094,0.509,0.162,0.765,0.201  c0.16,0.004,0.291,0,0.375-0.016c0,0,0.987-0.168,1.959-0.824c0.324-0.217,0.353-0.223,0.614-0.463c0.001-0.002,0-0.004,0.002-0.006  c0.515-0.471,0.689-0.664,0.689-0.664C17.898,26.799,17.842,26.457,17.592,26.262z" fill="url(#SVGID_6_)"/>
 <path d="M11.477,23.324l0.635-0.775c0.162-0.203,0.462-0.23,0.703-0.084l1.612,1.27l3.165,2.527  c0.25,0.195,0.307,0.537,0.129,0.76c0,0-0.176,0.193-0.693,0.668L11.477,23.324z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <radialGradient cx="-162.3672" cy="-37.5952" gradientTransform="matrix(0.9891 0.1471 -0.1471 0.9891 159.0668 70.322)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="8.6173">
-<stop offset="0" style="stop-color:#D1D8D9"/>
-<stop offset="0.0424" style="stop-color:#D1D8D9"/>
-<stop offset="0.4" style="stop-color:#BBC0C2"/>
-<stop offset="0.7333" style="stop-color:#7C8C91"/>
-<stop offset="1" style="stop-color:#A7B3B7"/>
+<stop offset="0" style="stop-color:#D3D7D5"/>
+<stop offset="0.0424" style="stop-color:#D3D7D5"/>
+<stop offset="0.4" style="stop-color:#BDC0BF"/>
+<stop offset="0.7333" style="stop-color:#82898B"/>
+<stop offset="1" style="stop-color:#ACB2B1"/>
 </radialGradient>
 <path d="M7.502,14.557l-2.66-5.506C4.701,8.762,4.371,8.625,4.104,8.748c0,0-0.232,0.105-0.813,0.479  c0,0.002-0.001,0-0.002,0.002C2.973,9.432,2.947,9.523,2.634,9.801c-0.434,0.389-0.758,0.793-0.978,1.105  c-0.721,2.08,0.275,4.35,2.266,5.109c0.406,0.154,0.822,0.23,1.236,0.242l1.266-0.57l0.853-0.381  C7.545,15.186,7.643,14.85,7.502,14.557z" fill="url(#SVGID_7_)"/>
 <path d="M3.29,9.229c0.581-0.375,0.813-0.48,0.813-0.48c0.268-0.123,0.598,0.014,0.738,0.303  l2.66,5.506c0.141,0.293,0.043,0.629-0.226,0.75l-0.853,0.381L3.29,9.229z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
@@ -62,8 +62,8 @@
 <g>
 <path d="M22,30c-4.411,0-8-3.589-8-8s3.589-8,8-8s8,3.589,8,8S26.411,30,22,30L22,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
 <linearGradient gradientTransform="matrix(1 0 0 1 -549.9609 -796.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="571.9609" x2="571.9609" y1="811.0391" y2="825.0391">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="1" style="stop-color:#252629"/>
+<stop offset="0" style="stop-color:#A2A6A5"/>
+<stop offset="1" style="stop-color:#262628"/>
 </linearGradient>
 <circle cx="22" cy="22" fill="url(#SVGID_1__)" r="7"/>
 <path d="M22,16c3.697,0,6.717,2.869,6.975,6.5   C28.986,22.334,29,22.169,29,22c0-3.865-3.134-7-7-7s-7,3.135-7,7c0,0.169,0.014,0.334,0.025,0.5C15.283,18.869,18.303,16,22,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_vpn.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_vpn.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_vpn.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,30 +5,30 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1s14,6.28,14,14S22.72,29,15,29L15,29z" fill-opacity="0.6"/>
 <radialGradient cx="-453.8818" cy="-299.3193" gradientTransform="matrix(0.3502 0 0 0.3502 173.9495 115.3211)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="48.9059">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<stop offset="0" style="stop-color:#B4DFC6"/>
+<stop offset="0.5" style="stop-color:#72B9C3"/>
+<stop offset="1" style="stop-color:#546F9F"/>
 </radialGradient>
 <circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
 <path d="M27.536,14.288c-0.288-5.078-3.577-9.45-8.38-11.141l-0.585,0.096l-3.397-0.65l-4.235,2.525l-0.159,1.064  H8.322l0.971,1.651L6.662,9.979l-0.613,2.649l2.173,3.851l2.218-0.453l0.81,0.696l0.633,0.063l0.418,1.634l-0.552,1.432L13.763,25  h2.053l2.035-1.644v-0.671l0.537-0.833l0.444-0.227c-0.113,0.172-0.29,0.566-0.29,0.566c-0.019,0.134,0.289,2.755,1.192,2.55  c0.686-0.155,3.135-4.705,3.182-5.138c0.093-0.855-0.373-1.209-0.659-1.343l-0.318-0.15l-1.462,1.466  c-0.157,0.012-0.298,0.038-0.426,0.076v-1.217l1.588-1.551l0.808-2.604l1.231-1.002l-0.27-0.491l0.929-0.894l-0.519-0.946  l0.395,0.048l2.313,5.178L27,15.796c-0.015-0.254-0.042-0.503-0.071-0.753L27.536,14.288z M15.156,8.464l-0.193-0.516h1.161  l0.565,1.271h-0.841V8.464H15.156z M18.987,11.024l0.927,1.353l0.063,0.162l-0.95-0.574L18.8,11.146L18.987,11.024z M20.381,13.388  l0.28,0.28l-0.362,0.081l-0.082-0.1L20.381,13.388z M13.127,4.286l0.59,0.913l-0.67,0.205l-0.262-0.149L13.127,4.286z" fill-opacity="0.3" stroke-opacity="0.3"/>
 <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="2.0625" y2="28.1316">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+<stop offset="0" style="stop-color:#6DACBC"/>
+<stop offset="0.497" style="stop-color:#5778A3"/>
+<stop offset="1" style="stop-color:#D3E0D8"/>
 </linearGradient>
 <path d="M15,2C7.821,2,2,7.821,2,15c0,7.182,5.821,13,13,13c7.182,0,13-5.818,13-13  C28,7.821,22.182,2,15,2z M15,27C8.383,27,3,21.617,3,15S8.383,3,15,3s12,5.383,12,12S21.617,27,15,27z" fill="url(#SVGID_2_)" fill-opacity="0.3" stroke-opacity="0.3"/>
 <radialGradient cx="15.75" cy="5.5" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="15.4173">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M22.044,18.714l-1.353,1.355c0,0-0.818,0-0.856,0.324c-0.018,0.14-0.063,0.744-0.201,1.056  c-0.272,0.188-0.597,0.813-0.597,0.813s-0.169,1.206,0.734,1.001C20.669,23.06,23.434,19.367,22.044,18.714z" fill="url(#SVGID_3_)"/>
 <radialGradient cx="15.75" cy="5.5005" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="17.8335">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+<stop offset="0" style="stop-color:#96BE67"/>
+<stop offset="0.3152" style="stop-color:#96BE67"/>
+<stop offset="0.7273" style="stop-color:#468D53"/>
+<stop offset="1" style="stop-color:#387463"/>
 </radialGradient>
 <path d="M18.99,3.619c-0.222,0.084-0.374,0.142-0.374,0.142l-3.344-0.64l-1.64,1.026l0.863,1.335  l-1.509,0.464l-0.813-0.464l0.286-0.811l-1.06,0.734L11.21,6.683H9.196L9.941,7.95L7.11,10.259l-0.533,2.304l1.051,2.035L8.259,15  l2.218-0.453l0.81,0.696l0.736,0.072l0.801,3.134l-0.533,1.386l1.178,2.604l0.332,1.081h2.053l1.16-0.628l0.875-1.016v-1.229  l1.663-0.849v-1.821l0.658-1.251l1.467-1.32l0.351-1.53l-1.919,0.428l-0.505-0.615l0.359-0.574l-1.363-0.824l-0.581-2.089  l1.007-0.656l0.927,1.353L20.3,11.79l0.696,0.696l0.813,0.425l0.903-0.146l1.003-0.965l-0.706-1.288l-0.889,0.232l-0.804-0.957  l0.764-0.533l2.397,0.29v0.853l2.086,4.298l0.474-0.379C26.756,9.359,23.48,5.199,18.99,3.619z M17.901,9.429l-1.095,0.29h-1.458  V8.964h-1.394l-1.103,0.291L11.17,8.79l-0.465-0.87l2.321-0.522h2.322L15,6.469h1.161l0.646,1.451l1.095,0.384V9.429z M20.397,7.514  l-1.974-0.349V6.469l0.987-0.232l0.29-0.348l0.696,0.58V7.514z" fill="url(#SVGID_4_)"/>
 </g>
@@ -42,10 +42,10 @@
 <path d="M20.74,23.38v-3.088c0-0.974,0.792-1.766,1.765-1.766,0.974,0,1.765,0.792,1.765,1.766v3.088h1.766v-3.088c0-1.941-1.589-3.53-3.53-3.53s-3.53,1.589-3.53,3.53v3.088h1.765z" fill="url(#SVGID_1__)"/>
 <rect fill-opacity="0.6" height="7.06" stroke-opacity="0.6" style="enable-background:new;" width="11.47" x="16.76" y="21.62"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-73.77" x2="-63.19" y1="91.37" y2="91.37">
-<stop offset="0" stop-color="#FFB533"/>
-<stop offset="0.24" stop-color="#FFE692"/>
-<stop offset="0.75" stop-color="#ED8C0D"/>
-<stop offset="1" stop-color="#FFB81F"/>
+<stop offset="0" stop-color="#C2A770"/>
+<stop offset="0.24" stop-color="#DED7B3"/>
+<stop offset="0.75" stop-color="#AA8250"/>
+<stop offset="1" stop-color="#BCA162"/>
 </linearGradient>
 <rect fill="url(#SVGID_2__)" height="6.178" width="10.59" x="17.21" y="22.06"/>
 <rect fill-opacity="0.5" height="0.882" stroke-opacity="0.5" style="enable-background:new;" width="10.59" x="17.21" y="26.03"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wcdma.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wcdma.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-116.6533" x2="-116.6533" y1="227.5791" y2="208.713">
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
+</linearGradient>
+<path d="M10.375,15.583c1.194-0.924,1.878-2.208,1.878-3.724c0-1.288-0.502-2.469-1.41-3.33  c-0.991-0.944-2.429-1.44-4.139-1.44c-2.08,0-3.882,0.765-4.794,1.42l-0.56,0.396L2.6,12.236l0.951-0.673  c0.585-0.418,1.659-0.907,2.734-0.907c0.894,0,1.962,0.271,1.962,1.558c0,1.525-1.983,1.859-2.743,1.859H3.383v3.436h2.121  c0.545,0,3.286,0.115,3.307,2.371c0.009,0.276-0.041,0.968-0.57,1.511c-0.481,0.48-1.23,0.732-2.213,0.732  c-1.335,0-2.606-0.551-3.141-0.875l-0.936-0.563L0.75,24.054l0.587,0.386c0.873,0.576,2.638,1.247,4.719,1.247  c4.683,0,6.817-2.991,6.817-5.771C12.882,18.061,11.919,16.484,10.375,15.583z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-116.6138" x2="-116.6138" y1="226.7793" y2="208.9541">
+<stop offset="0" style="stop-color:#E2E5C2"/>
+<stop offset="0.7455" style="stop-color:#49794A"/>
+<stop offset="1" style="stop-color:#ACB991"/>
+</linearGradient>
+<path d="M6.055,25.302c-2.003,0-3.678-0.639-4.504-1.185l-0.335-0.22l0.94-2.636l0.531,0.319  c0.572,0.345,1.919,0.93,3.34,0.93c1.087,0,1.924-0.284,2.485-0.844c0.665-0.681,0.692-1.547,0.685-1.797  c-0.019-2.025-2.001-2.745-3.694-2.745H3.77v-2.663h1.734c1.259,0,3.13-0.597,3.13-2.247c0-1.235-0.855-1.944-2.349-1.944  c-1.172,0-2.326,0.526-2.96,0.978l-0.54,0.383L1.817,9.049l0.317-0.224c0.867-0.623,2.583-1.348,4.57-1.348  c1.618,0,2.957,0.461,3.872,1.333c0.832,0.789,1.29,1.872,1.29,3.051c0,1.361-0.598,2.543-1.728,3.418l-0.453,0.35l0.495,0.289  c1.473,0.861,2.313,2.316,2.306,3.996C12.487,22.51,10.474,25.302,6.055,25.302L6.055,25.302z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-116.5737" x2="-116.5737" y1="226.7715" y2="209.4741">
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
+</linearGradient>
+<path d="M6.055,24.914c-1.917,0-3.511-0.603-4.292-1.119l-0.081-0.054l0.68-1.905l0.125,0.076  c0.606,0.365,2.034,0.985,3.54,0.985c1.193,0,2.121-0.322,2.759-0.958c0.774-0.795,0.807-1.794,0.798-2.081  c-0.021-2.302-2.211-3.121-4.08-3.121H4.157v-1.89h1.347c1.414,0,3.517-0.7,3.517-2.633c0-1.46-1.022-2.331-2.735-2.331  c-1.263,0-2.505,0.565-3.185,1.05l-0.129,0.091L2.284,9.192L2.357,9.14C3.18,8.55,4.809,7.862,6.704,7.862  c1.517,0,2.763,0.425,3.605,1.227c0.755,0.715,1.17,1.699,1.17,2.771c0,1.237-0.546,2.313-1.578,3.112l-0.907,0.702l0.99,0.577  c1.35,0.788,2.121,2.122,2.114,3.661C12.1,22.322,10.209,24.914,6.055,24.914L6.055,24.914z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-102.04" x2="-102.04" y1="230.3174" y2="210.1877">
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
+</linearGradient>
+<path d="M21.913,12.493v3.539h3.4V19.5c-0.446,0.12-1.063,0.225-2.011,0.225c-3.517,0-5.611-2.21-5.611-5.912  c0-1.815,0.543-3.315,1.584-4.338c1.025-1.017,2.512-1.548,4.299-1.548c1.361,0,2.422,0.204,3.352,0.64l0.927,0.438l1.08-3.491  l-0.689-0.336c-0.824-0.399-2.526-0.865-4.62-0.865c-5.997,0-10.024,3.859-10.024,9.598c0,2.791,0.959,5.315,2.624,6.924  c1.746,1.666,4.007,2.477,6.926,2.477c2.749,0,4.92-0.755,5.526-0.985l0.575-0.22v-9.614H21.913z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-102.0405" x2="-102.0405" y1="229.6416" y2="211.2637">
+<stop offset="0" style="stop-color:#E2E5C2"/>
+<stop offset="0.7455" style="stop-color:#49794A"/>
+<stop offset="1" style="stop-color:#ACB991"/>
+</linearGradient>
+<path d="M23.149,22.925c-2.809,0-4.987-0.776-6.659-2.37c-1.59-1.536-2.504-3.959-2.504-6.644  c0-5.51,3.874-9.211,9.637-9.211c2.03,0,3.666,0.445,4.451,0.827l0.391,0.189l-0.85,2.75L27.09,8.218  c-0.986-0.462-2.103-0.678-3.517-0.678c-1.896,0-3.477,0.574-4.572,1.66c-1.11,1.091-1.698,2.686-1.698,4.612  c0,3.943,2.242,6.298,5.997,6.298c0.826,0,1.518-0.076,2.111-0.236l0.286-0.077v-4.151h-3.399V12.88h6.563v8.96l-0.326,0.125  C27.776,22.253,25.725,22.925,23.149,22.925L23.149,22.925z" fill="url(#SVGID_5_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-102.0405" x2="-102.0405" y1="229.5146" y2="211.0229">
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
+</linearGradient>
+<path d="M23.149,22.538c-2.705,0-4.796-0.74-6.391-2.263c-1.515-1.463-2.385-3.783-2.385-6.364  c0-5.278,3.718-8.825,9.251-8.825c1.963,0,3.533,0.424,4.282,0.788l0.093,0.045l-0.62,2.006l-0.123-0.058  c-1.039-0.488-2.209-0.715-3.682-0.715c-2,0-3.675,0.613-4.844,1.772c-1.186,1.164-1.813,2.854-1.813,4.887  c0,4.187,2.387,6.685,6.384,6.685c0.862,0,1.585-0.082,2.212-0.25l0.573-0.153v-4.835h-3.4v-1.991h5.79v8.308l-0.078,0.029  C27.658,21.885,25.66,22.538,23.149,22.538L23.149,22.538z" fill="url(#SVGID_6_)"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wcdma_off.svg
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wcdma_off.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-116.6533" x2="-116.6533" y1="227.5791" y2="208.713">
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
+</linearGradient>
+<path d="M10.375,15.583c1.194-0.924,1.878-2.208,1.878-3.724c0-1.288-0.502-2.469-1.41-3.33  c-0.991-0.944-2.429-1.44-4.139-1.44c-2.08,0-3.882,0.765-4.794,1.42l-0.56,0.396L2.6,12.236l0.951-0.673  c0.585-0.418,1.659-0.907,2.734-0.907c0.894,0,1.962,0.271,1.962,1.558c0,1.525-1.983,1.859-2.743,1.859H3.383v3.436h2.121  c0.545,0,3.286,0.115,3.307,2.371c0.009,0.276-0.041,0.968-0.57,1.511c-0.481,0.48-1.23,0.732-2.213,0.732  c-1.335,0-2.606-0.551-3.141-0.875l-0.936-0.563L0.75,24.054l0.587,0.386c0.873,0.576,2.638,1.247,4.719,1.247  c4.683,0,6.817-2.991,6.817-5.771C12.882,18.061,11.919,16.484,10.375,15.583z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-116.6138" x2="-116.6138" y1="226.7793" y2="208.9541">
+<stop offset="0" style="stop-color:#E2E5C2"/>
+<stop offset="0.7455" style="stop-color:#49794A"/>
+<stop offset="1" style="stop-color:#ACB991"/>
+</linearGradient>
+<path d="M6.055,25.302c-2.003,0-3.678-0.639-4.504-1.185l-0.335-0.22l0.94-2.636l0.531,0.319  c0.572,0.345,1.919,0.93,3.34,0.93c1.087,0,1.924-0.284,2.485-0.844c0.665-0.681,0.692-1.547,0.685-1.797  c-0.019-2.025-2.001-2.745-3.694-2.745H3.77v-2.663h1.734c1.259,0,3.13-0.597,3.13-2.247c0-1.235-0.855-1.944-2.349-1.944  c-1.172,0-2.326,0.526-2.96,0.978l-0.54,0.383L1.817,9.049l0.317-0.224c0.867-0.623,2.583-1.348,4.57-1.348  c1.618,0,2.957,0.461,3.872,1.333c0.832,0.789,1.29,1.872,1.29,3.051c0,1.361-0.598,2.543-1.728,3.418l-0.453,0.35l0.495,0.289  c1.473,0.861,2.313,2.316,2.306,3.996C12.487,22.51,10.474,25.302,6.055,25.302L6.055,25.302z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-116.5737" x2="-116.5737" y1="226.7715" y2="209.4741">
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
+</linearGradient>
+<path d="M6.055,24.914c-1.917,0-3.511-0.603-4.292-1.119l-0.081-0.054l0.68-1.905l0.125,0.076  c0.606,0.365,2.034,0.985,3.54,0.985c1.193,0,2.121-0.322,2.759-0.958c0.774-0.795,0.807-1.794,0.798-2.081  c-0.021-2.302-2.211-3.121-4.08-3.121H4.157v-1.89h1.347c1.414,0,3.517-0.7,3.517-2.633c0-1.46-1.022-2.331-2.735-2.331  c-1.263,0-2.505,0.565-3.185,1.05l-0.129,0.091L2.284,9.192L2.357,9.14C3.18,8.55,4.809,7.862,6.704,7.862  c1.517,0,2.763,0.425,3.605,1.227c0.755,0.715,1.17,1.699,1.17,2.771c0,1.237-0.546,2.313-1.578,3.112l-0.907,0.702l0.99,0.577  c1.35,0.788,2.121,2.122,2.114,3.661C12.1,22.322,10.209,24.914,6.055,24.914L6.055,24.914z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-102.04" x2="-102.04" y1="230.3174" y2="210.1877">
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
+</linearGradient>
+<path d="M21.913,12.493v3.539h3.4V19.5c-0.446,0.12-1.063,0.225-2.011,0.225c-3.517,0-5.611-2.21-5.611-5.912  c0-1.815,0.543-3.315,1.584-4.338c1.025-1.017,2.512-1.548,4.299-1.548c1.361,0,2.422,0.204,3.352,0.64l0.927,0.438l1.08-3.491  l-0.689-0.336c-0.824-0.399-2.526-0.865-4.62-0.865c-5.997,0-10.024,3.859-10.024,9.598c0,2.791,0.959,5.315,2.624,6.924  c1.746,1.666,4.007,2.477,6.926,2.477c2.749,0,4.92-0.755,5.526-0.985l0.575-0.22v-9.614H21.913z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-102.0405" x2="-102.0405" y1="229.6416" y2="211.2637">
+<stop offset="0" style="stop-color:#E2E5C2"/>
+<stop offset="0.7455" style="stop-color:#49794A"/>
+<stop offset="1" style="stop-color:#ACB991"/>
+</linearGradient>
+<path d="M23.149,22.925c-2.809,0-4.987-0.776-6.659-2.37c-1.59-1.536-2.504-3.959-2.504-6.644  c0-5.51,3.874-9.211,9.637-9.211c2.03,0,3.666,0.445,4.451,0.827l0.391,0.189l-0.85,2.75L27.09,8.218  c-0.986-0.462-2.103-0.678-3.517-0.678c-1.896,0-3.477,0.574-4.572,1.66c-1.11,1.091-1.698,2.686-1.698,4.612  c0,3.943,2.242,6.298,5.997,6.298c0.826,0,1.518-0.076,2.111-0.236l0.286-0.077v-4.151h-3.399V12.88h6.563v8.96l-0.326,0.125  C27.776,22.253,25.725,22.925,23.149,22.925L23.149,22.925z" fill="url(#SVGID_5_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 123.4648 234.2559)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-102.0405" x2="-102.0405" y1="229.5146" y2="211.0229">
+<stop offset="0" style="stop-color:#98B060"/>
+<stop offset="0.8121" style="stop-color:#326644"/>
+<stop offset="1" style="stop-color:#4E8146"/>
+</linearGradient>
+<path d="M23.149,22.538c-2.705,0-4.796-0.74-6.391-2.263c-1.515-1.463-2.385-3.783-2.385-6.364  c0-5.278,3.718-8.825,9.251-8.825c1.963,0,3.533,0.424,4.282,0.788l0.093,0.045l-0.62,2.006l-0.123-0.058  c-1.039-0.488-2.209-0.715-3.682-0.715c-2,0-3.675,0.613-4.844,1.772c-1.186,1.164-1.813,2.854-1.813,4.887  c0,4.187,2.387,6.685,6.384,6.685c0.862,0,1.585-0.082,2.212-0.25l0.573-0.153v-4.835h-3.4v-1.991h5.79v8.308l-0.078,0.029  C27.658,21.885,25.66,22.538,23.149,22.538L23.149,22.538z" fill="url(#SVGID_6_)"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+<g>
+<rect fill-opacity="0.6" height="34.27" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(0.7073 -0.707 0.707 0.7073 -6.2126 14.9968)" width="3.169" x="13.42" y="-2.134"/>
+<polygon fill="url(#SVGID_1__)" points="26,26.99,3.015,4.005,4.006,3.014,26.99,26"/>
+<rect fill="none" height="30" width="30"/>
+<defs>
+<linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="339.8" x2="339.8" y1="-397.3" y2="-425.3">
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.2606" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
+</linearGradient>
+</defs>
+</g>
+</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wifi.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wifi.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wifi.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -7,18 +7,18 @@
 <circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
 <g fill-opacity="0.2" stroke-opacity="0.2">
 <g>
-<path d="M24.99,12.631c-0.283-0.748-1.309-2.688-2.809-4.158c0.485-2.043-0.762-2.379-1.248-2.457    c-0.865-0.055-2.592-0.715-4.184-0.203c-2.305,0.74-4.67,3.051-6.592,5.797C8.193,14.395,7.414,19.094,7,19.234    c0.57,1.799,2.896,4.215,2.896,4.215s-0.687,2.191,1.361,2.535c1.986,0.205,3.936-1.619,3.936-1.619s9.661-1.873,7.774-11.104    C23.006,13.275,24.684,12.729,24.99,12.631z M14.783,20.25c-0.049,0.412-2.373,3.385-3.342,2.664    c-0.914-0.68-1.818-1.74-2.335-3.156c0.023-0.025,1.533-0.443,1.566-0.422c-1.491-6.658,4.111-7.711,4.111-7.711    c0.015,0.002-2.349,2.613-1.457,6.775c-0.005-0.049,1.341-0.365,1.989-0.572C15.531,18.402,14.892,19.322,14.783,20.25z     M16.575,20.842c-0.015-0.004,3.059-3.283,2.171-7.441c0.003,0.045-1.344,0.363-1.99,0.57c-0.559-1.488,0.066-5.105,1.385-5.938    c0.785-0.236,2.498,0.49,3.758,2.094c0.424,0.539-0.71,1.391-0.742,1.373C22.646,18.154,16.575,20.842,16.575,20.842z"/>
+<path d="M24.99,12.631c-0.283-0.748-1.309-2.688-2.809-4.158c0.483-2.043-0.764-2.379-1.248-2.457    c-0.865-0.055-2.594-0.715-4.186-0.203c-2.305,0.74-4.67,3.051-6.592,5.797C8.193,14.395,7.414,19.094,7,19.234    c0.57,1.799,2.896,4.215,2.896,4.215s-0.687,2.191,1.361,2.535c1.986,0.205,3.936-1.619,3.936-1.619s9.661-1.873,7.774-11.104    C23.006,13.275,24.684,12.729,24.99,12.631z M14.783,20.25c-0.049,0.412-2.373,3.385-3.342,2.664    c-0.914-0.68-1.818-1.74-2.335-3.156c0.023-0.025,1.533-0.443,1.566-0.422c-1.491-6.658,4.111-7.711,4.111-7.711    c0.015,0.002-2.349,2.613-1.457,6.775c-0.005-0.049,1.341-0.365,1.989-0.572C15.531,18.402,14.892,19.322,14.783,20.25z     M16.575,20.842c-0.015-0.004,3.059-3.283,2.171-7.441c0.003,0.045-1.344,0.363-1.99,0.57c-0.559-1.488,0.066-5.105,1.385-5.938    c0.785-0.236,2.498,0.49,3.758,2.094c0.424,0.539-0.709,1.391-0.74,1.373C22.646,18.154,16.575,20.842,16.575,20.842z"/>
 </g>
 </g>
-<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.168,28,15c0-7.18-5.82-13-13-13  S2,7.82,2,15c0,0.168,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5  C27.98,15.332,28,15.168,28,15c0-7.18-5.82-13-13-13C7.82,2,2,7.82,2,15c0,0.168,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
 <g>
-<path d="M23.778,11.643c-0.283-0.749-1.309-2.688-2.809-4.159c0.485-2.042-0.762-2.379-1.248-2.456   c-2.12-0.134-2.895,0.569-3.568,1.059c-1.26,0.916-4.098,0.759-7.208,4.535c-1.964,2.784-1.265,7.074-1.265,7.074   s-1.479,0.41-1.893,0.55c0.57,1.8,2.896,4.216,2.896,4.216s-0.687,2.191,1.361,2.534c1.986,0.205,3.936-1.618,3.936-1.618   s9.661-1.874,7.774-11.104C21.793,12.287,23.471,11.74,23.778,11.643z M12.717,22.778c-1.05,0.314-3.757-1.092-4.824-4.009   c0.023-0.026,1.533-0.443,1.566-0.423c-1.491-6.657,4.822-8.378,4.822-8.378c0.015,0.003-3.06,3.281-2.167,7.443   c-0.005-0.049,1.341-0.366,1.989-0.573C14.662,18.326,14.037,21.945,12.717,22.778z M15.363,19.854   c-0.015-0.004,3.059-3.284,2.17-7.442c0.004,0.046-1.344,0.363-1.99,0.571c-0.558-1.489,0.066-5.106,1.384-5.938   c1.05-0.315,3.758,1.09,4.823,4.009c-0.022,0.024-1.533,0.441-1.565,0.424C21.676,18.131,15.363,19.854,15.363,19.854z" fill="#FFFFFF"/>
+<path d="M23.777,11.643c-0.282-0.749-1.31-2.688-2.81-4.159c0.485-2.042-0.762-2.379-1.247-2.456   c-2.119-0.134-2.896,0.569-3.568,1.059c-1.259,0.916-4.097,0.759-7.208,4.535c-1.964,2.784-1.265,7.073-1.265,7.073   s-1.479,0.41-1.893,0.551c0.57,1.8,2.896,4.216,2.896,4.216s-0.687,2.19,1.361,2.534c1.986,0.205,3.936-1.618,3.936-1.618   s9.662-1.874,7.774-11.104C21.793,12.287,23.471,11.74,23.777,11.643z M12.717,22.777c-1.05,0.313-3.757-1.092-4.824-4.008   c0.023-0.026,1.533-0.443,1.566-0.424c-1.491-6.658,4.822-8.379,4.822-8.379c0.015,0.003-3.06,3.281-2.167,7.443   c-0.005-0.051,1.341-0.366,1.989-0.573C14.662,18.326,14.037,21.945,12.717,22.777z M15.363,19.854   c-0.015-0.004,3.059-3.283,2.17-7.44c0.004,0.046-1.344,0.363-1.99,0.571c-0.558-1.489,0.066-5.106,1.385-5.938   c1.049-0.315,3.758,1.09,4.822,4.009c-0.021,0.024-1.533,0.441-1.564,0.424C21.676,18.131,15.363,19.854,15.363,19.854z" fill="#FFFFFF"/>
 </g>
 <rect fill="none" height="30" width="30"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.2749" y2="32.0078">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="593.9609" x2="593.9609" y1="814.3145" y2="844.0474">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -5,22 +5,22 @@
 <rect fill="none" height="30" width="30"/>
 <path d="M15.491,29c-7.721,0-14-6.281-14-14c0-7.721,6.279-14,14-14c7.719,0,14,6.279,14,14  C29.491,22.719,23.21,29,15.491,29L15.491,29z" fill-opacity="0.6"/>
 <circle cx="15.491" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15.491,3c7.012,0,12.711,5.555,12.975,12.5c0.008-0.168,0.025-0.332,0.025-0.5  c0-7.18-5.82-13-13-13s-13,5.82-13,13c0,0.168,0.02,0.332,0.025,0.5C2.782,8.555,8.481,3,15.491,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M22.513,19.506l1.516,1.303c1.529-1.756,2.463-4.045,2.463-6.559c0-2.512-0.934-4.801-2.463-6.559  l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C24.491,16.266,23.741,18.1,22.513,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M10.47,19.506c-1.229-1.406-1.979-3.24-1.979-5.256c0-2.014,0.75-3.848,1.979-5.254L8.954,7.691  c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L10.47,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M19.474,16.893l1.525,1.311c0.926-1.057,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.525,1.311  c0.627,0.705,1.018,1.623,1.018,2.641S20.101,16.188,19.474,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M13.509,16.893c-0.625-0.705-1.018-1.625-1.018-2.643s0.393-1.936,1.018-2.641l-1.523-1.311  c-0.928,1.055-1.494,2.436-1.494,3.951s0.566,2.896,1.494,3.953L13.509,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="13.38,25.912 16.513,15.025 19.644,25.912 " stroke-opacity="0.2"/>
-<path d="M21.513,18.506l1.516,1.303c1.529-1.756,2.463-4.045,2.463-6.559c0-2.512-0.934-4.801-2.463-6.559  l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C23.491,15.266,22.741,17.1,21.513,18.506z" fill="#FFFFFF"/>
+<path d="M15.491,3c7.012,0,12.711,5.555,12.975,12.5  c0.009-0.168,0.025-0.332,0.025-0.5c0-7.18-5.82-13-13-13c-7.18,0-13,5.82-13,13c0,0.168,0.02,0.332,0.025,0.5  C2.782,8.555,8.481,3,15.491,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M22.514,19.506l1.516,1.303c1.529-1.756,2.464-4.045,2.464-6.559  c0-2.512-0.935-4.801-2.464-6.559l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C24.491,16.266,23.741,18.1,22.514,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M10.47,19.506c-1.229-1.406-1.979-3.24-1.979-5.256  c0-2.014,0.75-3.848,1.979-5.254L8.954,7.691c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L10.47,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M19.475,16.893l1.524,1.313c0.926-1.059,1.492-2.438,1.492-3.953  c0-1.515-0.566-2.896-1.492-3.951l-1.524,1.311c0.627,0.705,1.019,1.623,1.019,2.641S20.102,16.188,19.475,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M13.509,16.893c-0.625-0.705-1.018-1.625-1.018-2.643s0.393-1.936,1.018-2.641  l-1.523-1.311c-0.928,1.055-1.494,2.436-1.494,3.951c0,1.515,0.566,2.896,1.494,3.953L13.509,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<polygon fill-opacity="0.2" points="13.38,25.912 16.514,15.025 19.645,25.912 " stroke-opacity="0.2"/>
+<path d="M21.514,18.506l1.516,1.303c1.529-1.756,2.464-4.045,2.464-6.559c0-2.512-0.935-4.801-2.464-6.559  l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C23.491,15.266,22.741,17.1,21.514,18.506z" fill="#FFFFFF"/>
 <path d="M9.47,18.506c-1.229-1.406-1.979-3.24-1.979-5.256c0-2.014,0.75-3.848,1.979-5.254L7.954,6.691  c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L9.47,18.506z" fill="#FFFFFF"/>
-<path d="M18.474,15.893l1.525,1.311c0.926-1.057,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.525,1.311  c0.627,0.705,1.018,1.623,1.018,2.641S19.101,15.188,18.474,15.893z" fill="#FFFFFF"/>
+<path d="M18.475,15.893l1.524,1.313c0.926-1.059,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.524,1.311  c0.627,0.705,1.019,1.623,1.019,2.641S19.102,15.188,18.475,15.893z" fill="#FFFFFF"/>
 <path d="M12.509,15.893c-0.625-0.705-1.018-1.625-1.018-2.643s0.393-1.936,1.018-2.641l-1.523-1.311  c-0.928,1.055-1.494,2.436-1.494,3.951s0.566,2.896,1.494,3.953L12.509,15.893z" fill="#FFFFFF"/>
-<polygon fill="#FFFFFF" points="12.38,24.912 15.513,14.025 18.644,24.912 "/>
+<polygon fill="#FFFFFF" points="12.38,24.912 15.514,14.025 18.645,24.912 "/>
 <rect fill="none" height="30" width="30" x="0.491"/>
 <defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.4907" x2="15.4907" y1="2.2749" y2="32.0078">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="594.4521" x2="594.4521" y1="814.3145" y2="844.0474">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_offline.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_offline.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_offline.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,22 +4,22 @@
 <g>
 <rect fill="none" height="30" width="30"/>
 <path d="M15.491,29c-7.721,0-14-6.281-14-14c0-7.721,6.279-14,14-14c7.719,0,14,6.279,14,14  C29.491,22.719,23.21,29,15.491,29L15.491,29z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.4907" x2="15.4907" y1="2.2749" y2="32.0078">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="594.4521" x2="594.4521" y1="814.3145" y2="844.0474">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 <circle cx="15.491" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15.491,3c7.012,0,12.711,5.555,12.975,12.5c0.008-0.168,0.025-0.332,0.025-0.5  c0-7.18-5.82-13-13-13s-13,5.82-13,13c0,0.168,0.02,0.332,0.025,0.5C2.782,8.555,8.481,3,15.491,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M22.513,19.506l1.516,1.303c1.529-1.756,2.463-4.045,2.463-6.559c0-2.512-0.934-4.801-2.463-6.559  l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C24.491,16.266,23.741,18.1,22.513,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M10.47,19.506c-1.229-1.406-1.979-3.24-1.979-5.256c0-2.014,0.75-3.848,1.979-5.254L8.954,7.691  c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L10.47,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M19.474,16.893l1.525,1.311c0.926-1.057,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.525,1.311  c0.627,0.705,1.018,1.623,1.018,2.641S20.101,16.188,19.474,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M13.509,16.893c-0.625-0.705-1.018-1.625-1.018-2.643s0.393-1.936,1.018-2.641l-1.523-1.311  c-0.928,1.055-1.494,2.436-1.494,3.951s0.566,2.896,1.494,3.953L13.509,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="13.38,25.912 16.513,15.025 19.644,25.912 " stroke-opacity="0.2"/>
-<path d="M21.513,18.506l1.516,1.303c1.529-1.756,2.463-4.045,2.463-6.559c0-2.512-0.934-4.801-2.463-6.559  l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C23.491,15.266,22.741,17.1,21.513,18.506z" fill="#FFFFFF"/>
+<path d="M15.491,3c7.012,0,12.711,5.555,12.975,12.5  c0.009-0.168,0.025-0.332,0.025-0.5c0-7.18-5.82-13-13-13c-7.18,0-13,5.82-13,13c0,0.168,0.02,0.332,0.025,0.5  C2.782,8.555,8.481,3,15.491,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M22.514,19.506l1.516,1.303c1.529-1.756,2.464-4.045,2.464-6.559  c0-2.512-0.935-4.801-2.464-6.559l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C24.491,16.266,23.741,18.1,22.514,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M10.47,19.506c-1.229-1.406-1.979-3.24-1.979-5.256  c0-2.014,0.75-3.848,1.979-5.254L8.954,7.691c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L10.47,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M19.475,16.893l1.524,1.313c0.926-1.059,1.492-2.438,1.492-3.953  c0-1.515-0.566-2.896-1.492-3.951l-1.524,1.311c0.627,0.705,1.019,1.623,1.019,2.641S20.102,16.188,19.475,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M13.509,16.893c-0.625-0.705-1.018-1.625-1.018-2.643s0.393-1.936,1.018-2.641  l-1.523-1.311c-0.928,1.055-1.494,2.436-1.494,3.951c0,1.515,0.566,2.896,1.494,3.953L13.509,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<polygon fill-opacity="0.2" points="13.38,25.912 16.514,15.025 19.645,25.912 " stroke-opacity="0.2"/>
+<path d="M21.514,18.506l1.516,1.303c1.529-1.756,2.464-4.045,2.464-6.559c0-2.512-0.935-4.801-2.464-6.559  l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C23.491,15.266,22.741,17.1,21.514,18.506z" fill="#FFFFFF"/>
 <path d="M9.47,18.506c-1.229-1.406-1.979-3.24-1.979-5.256c0-2.014,0.75-3.848,1.979-5.254L7.954,6.691  c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L9.47,18.506z" fill="#FFFFFF"/>
-<path d="M18.474,15.893l1.525,1.311c0.926-1.057,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.525,1.311  c0.627,0.705,1.018,1.623,1.018,2.641S19.101,15.188,18.474,15.893z" fill="#FFFFFF"/>
+<path d="M18.475,15.893l1.524,1.313c0.926-1.059,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.524,1.311  c0.627,0.705,1.019,1.623,1.019,2.641S19.102,15.188,18.475,15.893z" fill="#FFFFFF"/>
 <path d="M12.509,15.893c-0.625-0.705-1.018-1.625-1.018-2.643s0.393-1.936,1.018-2.641l-1.523-1.311  c-0.928,1.055-1.494,2.436-1.494,3.951s0.566,2.896,1.494,3.953L12.509,15.893z" fill="#FFFFFF"/>
-<polygon fill="#FFFFFF" points="12.38,24.912 15.513,14.025 18.644,24.912 "/>
+<polygon fill="#FFFFFF" points="12.38,24.912 15.514,14.025 18.645,24.912 "/>
 <rect fill="none" height="30" width="30" x="0.491"/>
 </g>
 <g>
@@ -28,9 +28,9 @@
 <rect fill="none" height="30" width="30"/>
 <defs>
 <linearGradient gradientTransform="matrix(0.8824 0 0 -0.8824 -284.8232 -348.3516)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="339.8" x2="339.8" y1="-397.3" y2="-425.3">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.2606" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+<stop offset="0" stop-color="#A8835F"/>
+<stop offset="0.2606" stop-color="#A86F5F"/>
+<stop offset="1" stop-color="#9A5047"/>
 </linearGradient>
 </defs>
 </g>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_secure.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_secure.svg	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_secure.svg	Tue Jul 06 14:36:53 2010 +0300
@@ -4,22 +4,22 @@
 <g>
 <rect fill="none" height="30" width="30"/>
 <path d="M15.491,29c-7.721,0-14-6.281-14-14c0-7.721,6.279-14,14-14c7.719,0,14,6.279,14,14  C29.491,22.719,23.21,29,15.491,29L15.491,29z" fill-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.4907" x2="15.4907" y1="2.2749" y2="32.0078">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -578.9609 -812.0391)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="594.4521" x2="594.4521" y1="814.3145" y2="844.0474">
+<stop offset="0" style="stop-color:#6DADC1"/>
+<stop offset="1" style="stop-color:#3B518A"/>
 </linearGradient>
 <circle cx="15.491" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15.491,3c7.012,0,12.711,5.555,12.975,12.5c0.008-0.168,0.025-0.332,0.025-0.5  c0-7.18-5.82-13-13-13s-13,5.82-13,13c0,0.168,0.02,0.332,0.025,0.5C2.782,8.555,8.481,3,15.491,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M22.513,19.506l1.516,1.303c1.529-1.756,2.463-4.045,2.463-6.559c0-2.512-0.934-4.801-2.463-6.559  l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C24.491,16.266,23.741,18.1,22.513,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M10.47,19.506c-1.229-1.406-1.979-3.24-1.979-5.256c0-2.014,0.75-3.848,1.979-5.254L8.954,7.691  c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L10.47,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M19.474,16.893l1.525,1.311c0.926-1.057,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.525,1.311  c0.627,0.705,1.018,1.623,1.018,2.641S20.101,16.188,19.474,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M13.509,16.893c-0.625-0.705-1.018-1.625-1.018-2.643s0.393-1.936,1.018-2.641l-1.523-1.311  c-0.928,1.055-1.494,2.436-1.494,3.951s0.566,2.896,1.494,3.953L13.509,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="13.38,25.912 16.513,15.025 19.644,25.912 " stroke-opacity="0.2"/>
-<path d="M21.513,18.506l1.516,1.303c1.529-1.756,2.463-4.045,2.463-6.559c0-2.512-0.934-4.801-2.463-6.559  l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C23.491,15.266,22.741,17.1,21.513,18.506z" fill="#FFFFFF"/>
+<path d="M15.491,3c7.012,0,12.711,5.555,12.975,12.5  c0.009-0.168,0.025-0.332,0.025-0.5c0-7.18-5.82-13-13-13c-7.18,0-13,5.82-13,13c0,0.168,0.02,0.332,0.025,0.5  C2.782,8.555,8.481,3,15.491,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M22.514,19.506l1.516,1.303c1.529-1.756,2.464-4.045,2.464-6.559  c0-2.512-0.935-4.801-2.464-6.559l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C24.491,16.266,23.741,18.1,22.514,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M10.47,19.506c-1.229-1.406-1.979-3.24-1.979-5.256  c0-2.014,0.75-3.848,1.979-5.254L8.954,7.691c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L10.47,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M19.475,16.893l1.524,1.313c0.926-1.059,1.492-2.438,1.492-3.953  c0-1.515-0.566-2.896-1.492-3.951l-1.524,1.311c0.627,0.705,1.019,1.623,1.019,2.641S20.102,16.188,19.475,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M13.509,16.893c-0.625-0.705-1.018-1.625-1.018-2.643s0.393-1.936,1.018-2.641  l-1.523-1.311c-0.928,1.055-1.494,2.436-1.494,3.951c0,1.515,0.566,2.896,1.494,3.953L13.509,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<polygon fill-opacity="0.2" points="13.38,25.912 16.514,15.025 19.645,25.912 " stroke-opacity="0.2"/>
+<path d="M21.514,18.506l1.516,1.303c1.529-1.756,2.464-4.045,2.464-6.559c0-2.512-0.935-4.801-2.464-6.559  l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C23.491,15.266,22.741,17.1,21.514,18.506z" fill="#FFFFFF"/>
 <path d="M9.47,18.506c-1.229-1.406-1.979-3.24-1.979-5.256c0-2.014,0.75-3.848,1.979-5.254L7.954,6.691  c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L9.47,18.506z" fill="#FFFFFF"/>
-<path d="M18.474,15.893l1.525,1.311c0.926-1.057,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.525,1.311  c0.627,0.705,1.018,1.623,1.018,2.641S19.101,15.188,18.474,15.893z" fill="#FFFFFF"/>
+<path d="M18.475,15.893l1.524,1.313c0.926-1.059,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.524,1.311  c0.627,0.705,1.019,1.623,1.019,2.641S19.102,15.188,18.475,15.893z" fill="#FFFFFF"/>
 <path d="M12.509,15.893c-0.625-0.705-1.018-1.625-1.018-2.643s0.393-1.936,1.018-2.641l-1.523-1.311  c-0.928,1.055-1.494,2.436-1.494,3.951s0.566,2.896,1.494,3.953L12.509,15.893z" fill="#FFFFFF"/>
-<polygon fill="#FFFFFF" points="12.38,24.912 15.513,14.025 18.644,24.912 "/>
+<polygon fill="#FFFFFF" points="12.38,24.912 15.514,14.025 18.645,24.912 "/>
 <rect fill="none" height="30" width="30" x="0.491"/>
 </g>
 <g>
@@ -32,10 +32,10 @@
 <path d="M20.74,23.38v-3.088c0-0.974,0.792-1.766,1.765-1.766,0.974,0,1.765,0.792,1.765,1.766v3.088h1.766v-3.088c0-1.941-1.589-3.53-3.53-3.53s-3.53,1.589-3.53,3.53v3.088h1.765z" fill="url(#SVGID_1__)"/>
 <rect fill-opacity="0.6" height="7.06" stroke-opacity="0.6" style="enable-background:new;" width="11.47" x="16.76" y="21.62"/>
 <linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-73.77" x2="-63.19" y1="91.37" y2="91.37">
-<stop offset="0" stop-color="#FFB533"/>
-<stop offset="0.24" stop-color="#FFE692"/>
-<stop offset="0.75" stop-color="#ED8C0D"/>
-<stop offset="1" stop-color="#FFB81F"/>
+<stop offset="0" stop-color="#C2A770"/>
+<stop offset="0.24" stop-color="#DED7B3"/>
+<stop offset="0.75" stop-color="#AA8250"/>
+<stop offset="1" stop-color="#BCA162"/>
 </linearGradient>
 <rect fill="url(#SVGID_2_)" height="6.178" width="10.59" x="17.21" y="22.06"/>
 <rect fill-opacity="0.5" height="0.882" stroke-opacity="0.5" style="enable-background:new;" width="10.59" x="17.21" y="26.03"/>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_work.svg
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_work.svg	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="30" viewBox="0 0 30 30" width="30" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g>
-<g>
-<path d="M0,30V0h30v30H0z M23.599,26.25l-8.732-8.732L6.134,26.25H23.599z M26.25,23.599V6.134l-8.732,8.732   L26.25,23.599z M3.75,23.331l8.465-8.465L3.75,6.401V23.331z M14.866,12.215L23.33,3.75H6.402L14.866,12.215z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="0.9941" y2="29.1902">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="0.6182" style="stop-color:#A8A8A8"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
-</linearGradient>
-<path d="M0.938,0.938v28.125h28.125V0.938H0.938z M13.541,14.866L2.813,25.595V4.138L13.541,14.866z    M4.139,2.813h21.455L14.866,13.541L4.139,2.813z M14.866,16.192l10.995,10.995H3.871L14.866,16.192z M16.192,14.866L27.188,3.871   v21.99L16.192,14.866z" fill="url(#SVGID_1_)"/>
-<g>
-<polygon fill-opacity="0.6" points="8.547,25.313 7.61,17.813 5.625,17.813 5.625,12.199 24.375,12.199 24.375,17.813 22.391,17.813     21.453,25.313   " stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="12.103" y2="23.9943">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2_)" points="6.563,13.137 6.563,16.875 8.438,16.875 9.375,24.375 20.625,24.375 21.563,16.875     23.438,16.875 23.438,13.137   "/>
-<path d="M13.125,14.063v-2.886c-0.348,0.048-0.692,0.073-1.03,0.073c-0.804,0-1.568-0.139-2.272-0.414    C5.866,9.294,5.955,6.329,5.96,6.204l0.019-0.408l0.312-0.265c0.103-0.088,1.06-0.855,2.881-0.855c0.958,0,1.99,0.212,3.066,0.632    c1.3,0.506,2.174,1.126,2.762,1.716c0.588-0.589,1.462-1.209,2.762-1.716c1.076-0.42,2.108-0.632,3.066-0.632    c1.82,0,2.777,0.767,2.881,0.855l0.313,0.265l0.019,0.408c0.005,0.125,0.094,3.091-3.862,4.632    c-0.704,0.275-1.469,0.414-2.272,0.414c-0.338,0-0.683-0.025-1.03-0.073v2.886H13.125z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M10.163,9.963c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875V10.02    c1.003,0.289,2.464,0.502,3.899-0.057c3.375-1.316,3.267-3.717,3.267-3.717s-1.627-1.379-5.002-0.064    C16.242,6.907,15.392,7.849,15,8.551c-0.392-0.702-1.242-1.644-3.102-2.369C8.523,4.866,6.896,6.246,6.896,6.246    S6.788,8.647,10.163,9.963z" fill="url(#SVGID_3_)"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="4.9224" y2="12.8702">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
-</linearGradient>
-</defs>
-</g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="12.5542" y2="17.3683">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
-</linearGradient>
-<rect fill="url(#SVGID_4_)" height="3.738" width="16.875" x="6.563" y="13.137"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="16.8408" y2="24.5597">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
-</linearGradient>
-<polygon fill="url(#SVGID_5_)" points="20.625,24.375 9.375,24.375 8.438,16.875 21.563,16.875  "/>
-<path d="M23.104,6.246c0,0-1.627-1.379-5.002-0.064C16.242,6.907,15.392,7.849,15,8.551   c-0.392-0.702-1.242-1.644-3.102-2.369C8.523,4.866,6.896,6.246,6.896,6.246s-0.109,2.401,3.267,3.717   c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875V10.02c1.003,0.289,2.464,0.502,3.899-0.057   C23.212,8.647,23.104,6.246,23.104,6.246z" fill="url(#SVGID_3_)"/>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<path d="M14.063,9.082c-1.003,0.289-2.464,0.502-3.899-0.057C8.06,8.205,7.31,6.963,7.042,6.144    c-0.094,0.06-0.146,0.102-0.146,0.102s-0.109,2.401,3.267,3.717c1.436,0.559,2.896,0.346,3.899,0.057V9.082z"/>
-<path d="M22.958,6.144c-0.268,0.819-1.018,2.061-3.121,2.881c-1.436,0.559-2.896,0.346-3.899,0.057v0.938    c1.003,0.289,2.464,0.502,3.899-0.057c3.375-1.316,3.267-3.717,3.267-3.717S23.052,6.204,22.958,6.144z"/>
-<rect height="0.938" width="1.875" x="14.063" y="12.188"/>
-</g>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="0.926" stroke-opacity="0.3" width="16.875" x="6.563" y="13.137"/>
-<polygon fill-opacity="0.2" points="21.445,17.813 21.563,16.875 8.438,16.875 8.555,17.813  " stroke-opacity="0.2"/>
-</g>
-</g>
-</svg>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatorbutton/hbindicatorbutton.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatorbutton/hbindicatorbutton.css	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatorbutton/hbindicatorbutton.css	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,9 @@
-HbIndicatorButton[layout="1"]
+HbIndicatorButton[layout_type="1"]
 {
     layout:indicatorbuttonlayout1;
 }
 
-HbIndicatorButton[layout="2"]
+HbIndicatorButton[layout_type="2"]
 {
     layout:indicatorbuttonlayout2;
 }
@@ -21,3 +21,9 @@
     fixed-width:var(hb-param-graphic-size-primary-small);
     fixed-height:var(hb-param-graphic-size-primary-small);
 }
+
+HbIndicatorButton::toucharea
+{   
+    top: expr((1/3)*var(hb-param-widget-chrome-height));
+    fixed-height: var(hb-param-widget-chrome-height);
+}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatorbutton/hbindicatorbutton.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatorbutton/hbindicatorbutton.widgetml	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatorbutton/hbindicatorbutton.widgetml	Tue Jul 06 14:36:53 2010 +0300
@@ -12,6 +12,10 @@
     <meshitem src="handleindication" srcEdge="TOP" dst="" dstEdge="TOP" />
     <meshitem src="handleindication" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
     <meshitem src="handleindication" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    
+    <meshitem src="toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="toucharea" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="toucharea" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
   </layout>
   
   <layout name="indicatorbuttonlayout2" type="mesh">
@@ -29,6 +33,10 @@
     <meshitem src="handleindication" srcEdge="TOP" dst="" dstEdge="TOP" />
     <meshitem src="handleindication" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
     <meshitem src="handleindication" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    
+    <meshitem src="toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="toucharea" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="toucharea" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
   </layout>
 
 </hbwidget>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatorgroup/hbindicatorgroup.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatorgroup/hbindicatorgroup.css	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatorgroup/hbindicatorgroup.css	Tue Jul 06 14:36:53 2010 +0300
@@ -1,9 +1,9 @@
-HbIndicatorGroup[layout="0"]
+HbIndicatorGroup[alignment="0"]
 {
     layout:notificationlayout;
 }
 
-HbIndicatorGroup[layout="1"]
+HbIndicatorGroup[alignment="1"]
 {
     layout:settinglayout;
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbinputsettinglist/hbinputsettinglist.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbinputsettinglist/hbinputsettinglist.css	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,4 @@
+HbInputSettingList {
+        max-width:200un;
+        max-height:200un;        
+}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblineedit/hblineedit.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblineedit/hblineedit.widgetml	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblineedit/hblineedit.widgetml	Tue Jul 06 14:36:53 2010 +0300
@@ -5,6 +5,17 @@
     <meshitem src="text" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
     <meshitem src="text" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="text" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    <meshitem src="autoCompletePopup" srcEdge="BOTTOM" dst="" dstEdge="TOP" />
+    <meshitem src="autoCompletePopup" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />
+  </layout>
+
+  <layout name="bottomCenterPopup" type="mesh">
+    <meshitem src="text" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="text" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    <meshitem src="text" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="text" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    <meshitem src="autoCompletePopup" srcEdge="TOP" dst="" dstEdge="BOTTOM" />
+    <meshitem src="autoCompletePopup" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />
   </layout>
 
 </hbwidget>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem.css	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem.css	Tue Jul 06 14:36:53 2010 +0300
@@ -170,6 +170,7 @@
 	text-line-count-min:1;
 	text-line-count-max:1;
 	text-wrap-mode:no-wrap;
+	size-policy-horizontal: ignored;
 }
 
 HbListViewItem::frame{
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbnavigationbutton/hbnavigationbutton.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbnavigationbutton/hbnavigationbutton.css	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,10 @@
+HbNavigationButton
+{
+    layout:navigationbuttonlayout;
+}
+
+HbNavigationButton::toucharea
+{   
+    top: expr((1/3)*var(hb-param-widget-chrome-height));
+    fixed-height: var(hb-param-widget-chrome-height);
+}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbnavigationbutton/hbnavigationbutton.widgetml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbnavigationbutton/hbnavigationbutton.widgetml	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,17 @@
+<hbwidget version="0.1" type="HbNavigationButton">
+
+  <layout name="navigationbuttonlayout" type="mesh">
+    <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+    
+    <meshitem src="icon" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
+    <meshitem src="icon" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />
+    
+    <meshitem src="toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="toucharea" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="toucharea" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+  </layout>
+
+</hbwidget>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbnotificationdialogcontent/hbnotificationdialogcontent.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbnotificationdialogcontent/hbnotificationdialogcontent.css	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbnotificationdialogcontent/hbnotificationdialogcontent.css	Tue Jul 06 14:36:53 2010 +0300
@@ -1,11 +1,11 @@
 HbNotificationDialogContent[icon="true"][textFields="2"]
 {
-	layout:dialog_notification_window_title_text_icon;
+	  layout:dialog_notification_window_title_text_icon;
 }
 
 HbNotificationDialogContent[icon="false"][textFields="2"]
 {
-        layout:dialog_notification_window_title_text
+    layout:dialog_notification_window_title_text
 }
 
 HbNotificationDialogContent[icon="false"][textFields="1"]
@@ -15,7 +15,7 @@
 
 HbNotificationDialogContent[icon="true"][textFields="1"]
 {
-	layout:dialog_notification_window_title_icon;
+	  layout:dialog_notification_window_title_icon;
 }
 
 HbNotificationDialogContent[textFields="1"]::icon
@@ -45,6 +45,8 @@
     font-variant:primary;
     pref-height: var(hb-param-text-height-primary);
     text-align: left;
+    text-line-count-min: 1;
+    text-line-count-max: 1;
 }
 
 HbNotificationDialogContent[titleWrapping="false"][icon="true"][textFields="1"]::title
@@ -54,6 +56,8 @@
     font-variant:primary;
     pref-height: var(hb-param-text-height-primary);
     text-align: left;
+    text-line-count-min: 1;
+    text-line-count-max: 1;
 }
 
 HbNotificationDialogContent[titleWrapping="true"][icon="false"][textFields="1"]::title
@@ -90,6 +94,8 @@
     font-variant:primary;
     pref-height: var(hb-param-text-height-primary);
     text-align: left;
+    text-line-count-min: 1;
+    text-line-count-max: 1;
 }
 
 HbNotificationDialogContent[icon="true"][textFields="2"]::title
@@ -100,6 +106,8 @@
     font-variant:primary;
     pref-height: var(hb-param-text-height-primary);
     text-align: left;
+    text-line-count-min: 1;
+    text-line-count-max: 1;
 }
 
 HbNotificationDialogContent::text
@@ -109,5 +117,7 @@
     font-variant:secondary;
     pref-height: var(hb-param-text-height-secondary);
     text-align: left;
+    text-line-count-min: 1;
+    text-line-count-max: 1;
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogcontentwidget/hbselectiondialogcontentwidget.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogcontentwidget/hbselectiondialogcontentwidget.css	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogcontentwidget/hbselectiondialogcontentwidget.css	Tue Jul 06 14:36:53 2010 +0300
@@ -7,23 +7,4 @@
 	
 }
 
-HbSelectionDialogContentWidget[multiSelection]::counter
-{
-	fixed-width: 14un;
-	text-align: right;
-	text-height: var(hb-param-text-height-tiny);
-    text-line-count-max: 1;
-    text-line-count-min: 1;
-	font-variant:secondary;
-	right:var(hb-param-margin-gene-popup);	
-}
-
-
-
-HbSelectionDialogContentWidget[multiSelection]::checkbox
-{
-	left:-var(hb-param-margin-gene-popup);	
-	top:-var(hb-param-margin-gene-popup);	
-	bottom:var(hb-param-margin-gene-popup);	
-	right:var(hb-param-margin-gene-popup);	
-}    
\ No newline at end of file
+ 
\ No newline at end of file
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogcontentwidget/hbselectiondialogcontentwidget.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogcontentwidget/hbselectiondialogcontentwidget.widgetml	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogcontentwidget/hbselectiondialogcontentwidget.widgetml	Tue Jul 06 14:36:53 2010 +0300
@@ -9,15 +9,13 @@
 
 
   <layout name="list_with_markall" type="mesh">
-    <meshitem src="checkbox" srcEdge="TOP" dst="" dstEdge="TOP" />
-    <meshitem src="checkbox" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="markwidget" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="markwidget" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="markwidget" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
 
-    <meshitem src="counter" srcEdge="CENTERV" dst="checkbox" dstEdge="CENTERV" />
-    <meshitem src="counter" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-
+    <meshitem src="list" srcEdge="TOP" dst="markwidget" dstEdge="BOTTOM" />
     <meshitem src="list" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="list" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-    <meshitem src="list" srcEdge="TOP" dst="checkbox" dstEdge="BOTTOM" />
     <meshitem src="list" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
   </layout>
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogmarkwidget/hbselectiondialogmarkwidget.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogmarkwidget/hbselectiondialogmarkwidget.css	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,24 @@
+HbSelectionDialogMarkWidget{
+	layout:default;
+}
+
+HbSelectionDialogMarkWidget::counter
+{
+	fixed-width: 14un;
+	text-align: right;
+	text-height: var(hb-param-text-height-tiny);
+    text-line-count-max: 1;
+    text-line-count-min: 1;
+	font-variant:secondary;
+	right:var(hb-param-margin-gene-popup);	
+}
+
+
+
+HbSelectionDialogMarkWidget::checkbox
+{
+	/*left:-var(hb-param-margin-gene-popup);
+	top:-var(hb-param-margin-gene-popup);	
+	bottom:var(hb-param-margin-gene-popup);	
+	right:var(hb-param-margin-gene-popup);	*/
+}    
\ No newline at end of file
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogmarkwidget/hbselectiondialogmarkwidget.widgetml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogmarkwidget/hbselectiondialogmarkwidget.widgetml	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,21 @@
+<hbwidget version="0.1" type="HbSelectionDialogMarkWidget">
+
+  <layout name="default" type="mesh">
+    
+    <meshitem src="checkbox" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="checkbox" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="checkbox" srcEdge="RIGHT" dst="counter" dstEdge="LEFT" />
+    <meshitem src="checkbox" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+
+    <meshitem src="counter" srcEdge="CENTERV" dst="checkbox" dstEdge="CENTERV" />
+    <meshitem src="counter" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+
+    <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="background" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+    <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+
+  </layout>
+
+</hbwidget>
+
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogmarkwidget/hbselectiondialogmarkwidget_color.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbselectiondialogmarkwidget/hbselectiondialogmarkwidget_color.css	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,6 @@
+HbSelectionDialogMarkWidget::counter
+{
+    color: var(qtc_viewtitle_normal);
+}
+
+
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbslider/hbslider.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbslider/hbslider.css	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbslider/hbslider.css	Tue Jul 06 14:36:53 2010 +0300
@@ -10,6 +10,10 @@
     min-width:0.0un;
     size-policy-horizontal:fixed;
     size-policy-vertical:minimum-expanding;
+    top:-var(hb-param-margin-gene-top);
+    bottom:var(hb-param-margin-gene-bottom);
+    left:-var(hb-param-margin-gene-middle-horizontal);
+    right:var(hb-param-margin-gene-middle-horizontal);   
 }
 
 HbZoomSliderPopup > HbSliderPopupContentWidget > HbSlider[orientation="Vertical"]::control:portrait
@@ -18,6 +22,10 @@
     min-width:0.0un;
     size-policy-horizontal:fixed;
     size-policy-vertical:minimum-expanding;
+    top:-var(hb-param-margin-gene-top);
+    bottom:var(hb-param-margin-gene-bottom);
+    left:-var(hb-param-margin-gene-middle-horizontal);
+    right:var(hb-param-margin-gene-middle-horizontal);   
 }
 
 HbSlider[orientation="Vertical"]::control
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbstatusbar/hbstatusbar.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbstatusbar/hbstatusbar.css	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbstatusbar/hbstatusbar.css	Tue Jul 06 14:36:53 2010 +0300
@@ -7,7 +7,11 @@
 HbStatusBar::timetext
 {
     font-variant: secondary;
-    fixed-width: 11un;
+    text-align: center;
+    size-policy-horizontal: ignored;
+    text-line-count-min: 1;
+    text-line-count-max: 1;
+    text-wrap-mode: no-wrap;
     fixed-height: 2.5un;
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbstatusbar/hbstatusbar.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbstatusbar/hbstatusbar.widgetml	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbstatusbar/hbstatusbar.widgetml	Tue Jul 06 14:36:53 2010 +0300
@@ -5,7 +5,8 @@
     <meshitem src="signal" srcEdge="LEFT" dst="" dstEdge="LEFT" />
     <meshitem src="notificationindicators" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
     <meshitem src="notificationindicators" srcEdge="LEFT" dst="signal" dstEdge="RIGHT" />
-    <meshitem src="timetext" srcEdge="CENTERH" dst="" dstEdge="CENTERH" />
+    <meshitem src="timetext" srcEdge="LEFT" dst="notificationindicators" dstEdge="RIGHT" />
+    <meshitem src="timetext" srcEdge="RIGHT" dst="settingsindicators" dstEdge="LEFT" />
     <meshitem src="timetext" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
     <meshitem src="settingsindicators" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
     <meshitem src="settingsindicators" srcEdge="RIGHT" dst="battery" dstEdge="LEFT" />
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtitlebar/hbtitlebar.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtitlebar/hbtitlebar.css	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtitlebar/hbtitlebar.css	Tue Jul 06 14:36:53 2010 +0300
@@ -26,6 +26,7 @@
 
 HbTitleBar::toucharea
 {   
+    top: expr((1/3)*var(hb-param-widget-chrome-height));
     fixed-width: expr(2/3*var(hb-param-widget-chrome-height));
     fixed-height: var(hb-param-widget-chrome-height);
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtitlepane/hbtitlepane.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtitlepane/hbtitlepane.css	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtitlepane/hbtitlepane.css	Tue Jul 06 14:36:53 2010 +0300
@@ -32,3 +32,9 @@
 {
 	layout-direction: right-to-left;
 }
+
+HbTitlePane::toucharea
+{   
+    top: expr((1/3)*var(hb-param-widget-chrome-height));
+    fixed-height: var(hb-param-widget-chrome-height);
+}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtitlepane/hbtitlepane.widgetml
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtitlepane/hbtitlepane.widgetml	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtitlepane/hbtitlepane.widgetml	Tue Jul 06 14:36:53 2010 +0300
@@ -6,6 +6,9 @@
     <meshitem dst="icon" dstEdge="LEFT" src="text" srcEdge="RIGHT"/>
     <meshitem dst="" dstEdge="RIGHT" src="icon" srcEdge="RIGHT"/>
     <meshitem dst="" dstEdge="CENTERV" src="icon" srcEdge="CENTERV"/>
+    <meshitem src="toucharea" srcEdge="TOP" dst="" dstEdge="TOP" />
+    <meshitem src="toucharea" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+    <meshitem src="toucharea" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
   </layout>
  
 </hbwidget>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtumbleviewitem/hbtumbleviewitem.css
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtumbleviewitem/hbtumbleviewitem.css	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtumbleviewitem/hbtumbleviewitem.css	Tue Jul 06 14:36:53 2010 +0300
@@ -1,6 +1,6 @@
 
 
-HbTumbleViewItem[layoutName="default"][modelItemType="StandardItem"][!icon-1][!text-2]{
+HbTumbleViewItem{
     layout:tumble-layout;
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/resources/themes/style/hbdefault/variables/color/hbcolorgroup.css
--- a/src/hbcore/resources/themes/style/hbdefault/variables/color/hbcolorgroup.css	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/variables/color/hbcolorgroup.css	Tue Jul 06 14:36:53 2010 +0300
@@ -34,8 +34,10 @@
 
 /* Application specific - Home screen */ 
 qtc_hs_list_item_title_normal:#505050; /* Added 05.02.2010 */
+qtc_hs_list_title2_normal:#3C3C3C;
 qtc_hs_list_item_content_normal:#519FB9; /* Added 05.02.2010 */
 qtc_hs_list_item_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_list_item_latched:#FFFFFF;
 qtc_hs_list_item_highlight:#FFFFFF; /* Added 05.02.2010 */
 qtc_hs_badge:#FFFFFF; /* Added 01.03.2010 */
 qtc_hs_cal:#3C3C3C; /* Added 18.03.2010 */
@@ -49,7 +51,7 @@
 qtc_radio_tuner_line:#3C3C3C; /* Added 05.02.2010 */
 
 /* Application specific - Multimedia */ 
-qtc_multimedia_trans:#FFFFFF; /* Modified 19.02.2010 */
+qtc_multimedia_trans_normal:#FFFFFF; /* Modified 02.06.2010 */
 qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
 qtc_multimedia_trans_disabled:#787878; /* Added 09.03.2010 */
 
@@ -98,6 +100,7 @@
 qtc_view_link_normal:#33C8FF;
 qtc_view_visited_normal:#B378FF;
 qtc_view_separator_normal:#9B9B9B;
+qtc_view_normal_secondary:#FFFFFF;
 
 /* Main area - View title */
 qtc_viewtitle_normal:#3C3C3C;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/style/hbstyle.cpp
--- a/src/hbcore/style/hbstyle.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/style/hbstyle.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -87,8 +87,6 @@
 #include <hbindicatorleveliconitem_p.h>
 
 #include <hbglobal.h>
-#include <hbpluginloader_p.h>
-#include "hbstyleinterface_p.h"
 #include <hbstyleparameters.h>
 
 #include "hbstyleselector_p.h"
@@ -100,8 +98,7 @@
 
 
 #include "hbanchorlayout.h"
-#include "hbanchorlayoutdebug_p.h"
-#include "hbanchor_p.h"
+#include <hbanchor.h>
 
 #include <QGraphicsWidget>
 #include <hbwidget.h>
@@ -110,6 +107,9 @@
 #include "hbrepeatitem_p.h"
 
 #include <QDebug>
+#include <QMetaClassInfo>
+
+Q_DECLARE_METATYPE(QGraphicsLayout*)
 
 //Uncomment next define(s) in order to get more debug prints.
 //Similar define exists also in the engine side.
@@ -137,6 +137,9 @@
     itself it does not need a paint() method at all since primitives (widget's children) are doing the drawing. 
     Painting for the primitives occurs from the graphics scene.
 
+    HbStyle has some caching functionality and thus it should not be instantiated explicitly, but 
+    accessed only through HbWidget::style() or HbInstance::style() APIs.
+
 */
 
 /*!
@@ -793,22 +796,35 @@
 
 static const QString GLOBAL_PARAMETERS_LOCATION = QLatin1String(":/themes/style/hbdefault/variables/layout/zoom/0/hbglobalparameters.css");
 
+static const char* LAYOUT_PTR_PROPERTY = "HbStyle_layout_ptr";
+static const char* LAYOUT_NAME_PROPERTY = "HbStyle_layout_name";
+
 inline void overrideSpacing( HbAnchorLayout *layout, const QString &name, Hb::Edge edge, qreal val )
 {
     if( name.isNull() ) {
         return;
     }
-    QList<HbAnchor*> list = HbAnchorLayoutDebug::getOriginalAnchors( layout );
+    QList<HbAnchor*> list = layout->anchors();
     for( int i = 0; i < list.size(); i++ ) {
         HbAnchor *anchor = list.at(i);
-        if( ( anchor->mStartId == name ) && ( anchor->mStartEdge == edge ) ) {
-            layout->setAnchor( anchor->mStartId, anchor->mStartEdge, anchor->mEndId, anchor->mEndEdge, val );
+        if( ( anchor->startNodeId() == name ) && ( anchor->startEdge() == edge ) ) {
+            anchor->setDirection( val < 0 ? HbAnchor::Negative : HbAnchor::Positive );
+            anchor->setPreferredLength( qAbs(val) );
+            if (anchor->anchorId().isEmpty()) {
+                // assuming it's a fixed anchor
+                anchor->setSizePolicy( QSizePolicy::Fixed );
+            } else {
+                // assuming it's a "spacer" and we want to override the minimum length
+                anchor->setMinimumLength( qAbs(val) );
+            }
         }
     }
 }
 
 /*!
 Constructor
+
+Should not be called explicitly. Use HbWidget::style() or HbInstance::style() instead.
 */
 HbStyle::HbStyle() :
     d_ptr(new HbStylePrivate)
@@ -825,149 +841,6 @@
     delete d_ptr;
 }
 
-/*!
-
-    \deprecated HbStyle::registerPlugin(const QString&)
-    is deprecated. Style plugins are not supported anymore.
-
-    Registers the style plugin with the Style system. This method can be called by a custom widget
-    or application in order to register the style plugin that implements the custom graphics primitives.
-    This method results in loading of the plugin, if the plugin is registered for the first time.
-    It returns the base ID for the primitives implemented by the style plugin. The custom widget
-    can use the range of integers from (BaseID) to (BaseID+count-1) to refer to the custom
-    primitives, where count is the number of primitives supported by the plugin. The style
-    plugin must return the correct number of primitives when the primitiveCount() method is called.
-    In case of errors the method returns < 0. Note also that for each registerPlugin there must be
-    a unregisterPlugin call, the last unregisterPlugin call for a plugin causes the plugin to be unloaded.
-
-    If the style plugin implementation returns valid path with layout defition files (CSS+WidgetML)
-    from layoutPath() method the layout definitions CSSs gets read when calling registerPlugin().
-
-    \param pluginName, name of the Plugin library to be dynamically loaded
-    \return int the base ID to be used for the primitives implemented by the style plugin
-    \sa unregisterPlugin()
- */
-int HbStyle::registerPlugin(const QString &pluginName)
-{
-    Q_D( const HbStyle );
-
-    // check if the plugin is already registered
-    if (d->registeredPlugins.contains(pluginName)) {
-        // increase the reference count
-        d->registeredPlugins.value(pluginName)->refCount++;
-        // return the base ID of the primitives enumeration
-        return d->registeredPlugins.value(pluginName)->primitiveBaseId;
-    }
-
-    // load the plugin
-    HbPluginLoader* loader = new HbPluginLoader(pluginName);
-    if (!loader)
-        return -1;
-
-    // get the instance pointer
-    QObject* pluginInstance = loader->instance();
-    if (!pluginInstance) {
-
-        // try the additional paths
-        QFileInfo fileInfo(pluginName);
-        foreach (QString additionalPath, hbInstance->libraryPaths()) {
-            const QDir pluginDir(additionalPath);
-            loader->setPluginName(pluginDir.absoluteFilePath(fileInfo.fileName()));
-            pluginInstance = loader->instance();
-            if (pluginInstance) {
-                break;
-            }
-        }
-
-        if (!pluginInstance) {
-            delete loader;
-            return -1;
-        }
-    }
-
-    HbStyleInterface *stylePlugin = qobject_cast<HbStyleInterface *>(pluginInstance);
-
-    int primitiveCount = stylePlugin->primitiveCount();
-    if (primitiveCount <= 0) {
-        delete pluginInstance;
-        delete loader;
-        return -1;
-    }
-
-    HbStyleInterfaceInfo* info = new HbStyleInterfaceInfo();
-    info->loader = loader;
-    info->primitiveBaseId = d->nextAvailableId;
-
-    // make entries for the primitives in the hash table
-    for (int i=d->nextAvailableId; i<(d->nextAvailableId+primitiveCount); i++)
-    {
-        d->customPrimitives.insert(i, info);
-    }
-
-    // make entry for the plugin in the registered plugins hash table
-    HbStylePluginInfo* pluginInfo = new HbStylePluginInfo();
-    pluginInfo->primitiveBaseId = d->nextAvailableId;
-    pluginInfo->primitiveCount = primitiveCount;
-    pluginInfo->refCount = 1;
-
-    d->registeredPlugins.insert(pluginName, pluginInfo);
-    d->nextAvailableId += primitiveCount;
-
-    // register associated style files
-    HbWidgetStyleLoader::instance()->addFilePath(
-        stylePlugin->layoutPath(),
-        HbLayeredStyleLoader::Concern_Layouts,
-        HbLayeredStyleLoader::Priority_Core);
-    d->pluginStylePaths.insert(pluginName, stylePlugin->layoutPath());
-
-    return pluginInfo->primitiveBaseId;
-}
-
-
-/*!
-
-    \deprecated HbStyle::unregisterPlugin(const QString&)
-    is deprecated. Style plugins are not supported anymore.
-
-    Un-registers the style plugin.
-    If the reference count becomes zero, the plugin is unloaded and the primitive IDs are de-registered
-    If a client has called registerPlugin() it must unregister the style plugin with this method.
-
-    \param pluginName, name of the Plugin library
- */
-void HbStyle::unregisterPlugin(const QString &pluginName)
-{
-    Q_D( const HbStyle );
-    if (d->registeredPlugins.contains(pluginName)) {
-        HbStylePluginInfo *info = d->registeredPlugins.value(pluginName);
-        info->refCount--;
-        // unload plugin and remove from list
-        if (info->refCount == 0) {
-            HbStyleInterfaceInfo* styleInfo = d->customPrimitives.value(info->primitiveBaseId);
-            delete styleInfo->loader->instance();
-            delete styleInfo->loader;
-            delete styleInfo;
-            for (int i=info->primitiveBaseId; i< (info->primitiveBaseId+info->primitiveCount); i++) {
-                  d->customPrimitives.remove(i);
-            }
-            d->registeredPlugins.remove(pluginName);
-
-            // unregister associated style files
-            HbWidgetStyleLoader::instance()->removeFilePath(
-                d->pluginStylePaths.value(pluginName),
-                HbLayeredStyleLoader::Concern_Layouts,
-                HbLayeredStyleLoader::Priority_Core);
-            d->pluginStylePaths.remove(pluginName);
-
-            if( d->registeredPlugins.count() == 0 ){
-                // no plugins loaded, can reset the id counter
-                d->nextAvailableId = HbStyle::P_CustomBase;
-            }
-
-        }
-    }
-}
-
 
 /*!
 
@@ -993,15 +866,6 @@
 QGraphicsItem *HbStyle::createPrimitive( HbStyle::Primitive primitive, QGraphicsItem *parent ) const
 {
 
-    Q_D( const HbStyle );
-
-    if (d->customPrimitives.contains(primitive)) {
-        HbStyleInterfaceInfo* info = d->customPrimitives.value(primitive);
-        QObject* pluginInstance = info->loader->instance();
-        HbStyleInterface *stylePlugin = qobject_cast<HbStyleInterface *>(pluginInstance);
-        return stylePlugin->createPrimitive((HbStyle::Primitive)(primitive-info->primitiveBaseId), parent);
-    }
-
         switch (primitive){
             case P_MenuItem_submenuindicator:
                 {
@@ -1117,7 +981,7 @@
                 setItemName(ta, QLatin1String("toucharea"));
                 ta->setZValue(TOUCHAREA_ZVALUE);
                 if(parent){
-                    parent->setHandlesChildEvents(true);
+                    parent->setFiltersChildEvents(true);
                 }
                 return ta;
                 }
@@ -1137,7 +1001,7 @@
                 ta->setFlag(QGraphicsItem::ItemIsFocusable);
                 setItemName(ta, QLatin1String("toucharea"));
                 if(parent){
-                    parent->setHandlesChildEvents(true);
+                    parent->setFiltersChildEvents(true);
                 }
                 return ta;
                 }
@@ -1157,17 +1021,30 @@
                 HbTouchArea *ta = new HbTouchArea(parent);
                 ta->setFlag(QGraphicsItem::ItemIsFocusable);
                 setItemName(ta, QLatin1String("combobox_button_toucharea"));
-                /*if(parent){
-                    parent->setHandlesChildEvents(true);
-                }*/
+                if(parent){
+                    parent->setFiltersChildEvents(true);
+                }
                 return ta;
                 }
-             case P_TitleBar_toucharea: {
+             case P_TitleBar_toucharea: 
+                {
                 HbTouchArea *ta = new HbTouchArea(parent);
                 ta->setFlag(QGraphicsItem::ItemIsFocusable);
                 setItemName(ta, QLatin1String("toucharea"));
                 return ta;
                 }
+             case P_IndicatorButton_toucharea:
+             case P_TitlePane_toucharea:
+             case P_NavigationButton_toucharea:
+                {
+                HbTouchArea *ta = new HbTouchArea(parent);
+                ta->setFlag(QGraphicsItem::ItemIsFocusable);
+                setItemName(ta, QLatin1String("toucharea"));
+                if (parent){
+                    parent->setHandlesChildEvents(true);
+                }
+                return ta;
+                }
              case P_SliderElement_touchdecrease:
              case P_SliderElement_touchincrease:
              case P_SliderElement_touchgroove:
@@ -1175,7 +1052,7 @@
                 HbTouchArea *ta = new HbTouchArea(parent);
                 ta->setFlag(QGraphicsItem::ItemIsFocusable);
                 if(parent){
-                    //parent->setHandlesChildEvents(true);
+                    parent->setFiltersChildEvents(true);
                 }
                 return ta;
                 }
@@ -1575,6 +1452,7 @@
 
             case P_ItemViewItem_background: {
                 HbIconItem *iconItem = q_check_ptr(new HbIconItem(parent));
+                iconItem->setZValue(-3.0);
                 setItemName(iconItem, QLatin1String("background"));
                 return iconItem;
             }
@@ -1637,15 +1515,16 @@
                 return n;
             }
             case P_ItemViewItem_focus: {
-                HbFrameItem *item = q_check_ptr(new HbFrameItem(parent));
-                //setItemName(item, QLatin1String("focus-indicator"));
-                return item;
+                HbFrameItem *frameItem = q_check_ptr(new HbFrameItem(parent));
+                frameItem->setZValue(-1.0);
+                return frameItem;
             }
             case P_ItemHighlight_background:
                 return new HbFrameItem(parent);
 
             case P_ItemViewItem_frame: {
                 HbFrameItem *item = q_check_ptr(new HbFrameItem(parent));
+                item->setZValue(-4.0);
                 setItemName(item,"frame");
                 return item;
             }
@@ -1745,13 +1624,6 @@
 {
     Q_D( const HbStyle );
 
-    if (d->customPrimitives.contains(primitive)) {
-        HbStyleInterfaceInfo* info = d->customPrimitives.value(primitive);
-        QObject* pluginInstance = info->loader->instance();
-        HbStyleInterface *stylePlugin = qobject_cast<HbStyleInterface *>(pluginInstance);
-        return stylePlugin->updatePrimitive(item, (HbStyle::Primitive)(primitive-info->primitiveBaseId), option);
-    }
-
     switch(primitive){
             case P_PushButton_icon:
                 {
@@ -1869,6 +1741,9 @@
             case P_ComboBoxButton_toucharea:
             case P_CheckBox_toucharea:
             case P_TitleBar_toucharea:
+            case P_IndicatorButton_toucharea:
+            case P_TitlePane_toucharea:
+            case P_NavigationButton_toucharea:
             case P_SliderElement_touchdecrease:
             case P_SliderElement_touchincrease:
             case P_SliderElement_touchgroove:
@@ -2399,7 +2274,6 @@
                     HbMarqueeItem *marqueeItem = static_cast<HbMarqueeItem*>( item );
                     if (marqueeItem) {
                         marqueeItem->setText(opt->caption);
-                        marqueeItem->startAnimation();
                     }
                 }
                 break;
@@ -3162,7 +3036,7 @@
                     HbTextItem *textItem = static_cast<HbTextItem*>(item);
                     textItem->setAlignment(opt->textAlignment);
                     textItem->setFontSpec(HbFontSpec(HbFontSpec::Secondary));
-                    textItem->setTextWrapping(opt->wrappingText);
+                    textItem->setTextWrapping(opt->textTextWrapping);
                     textItem->setText(opt->text);
                 }
                 break;
@@ -3170,10 +3044,14 @@
                 if (const HbStyleOptionNotificationDialog *opt =
                         qstyleoption_cast<const HbStyleOptionNotificationDialog *>(option)) {
                     HbTextItem *textItem = static_cast<HbTextItem*>(item);
-
                     textItem->setAlignment(opt->titleAlignment);
                     textItem->setFontSpec(HbFontSpec(HbFontSpec::Primary));
-                    textItem->setTextWrapping(opt->wrappingTitle);
+                    textItem->setTextWrapping(opt->titleTextWrapping);
+                    if (opt->titleTextWrapping == Hb::TextNoWrap) {
+                        textItem->setElideMode(Qt::ElideNone);
+                    } else {
+                        textItem->setElideMode(Qt::ElideRight);
+                    }
                     textItem->setText(opt->title);
                 }
                 break;
@@ -3279,7 +3157,9 @@
                     HbIconItem *iconItem = static_cast<HbIconItem*>(item);
 
                     setItemName(iconItem, QLatin1String("icon-") + QString::number(opt->index + 1));
-                    iconItem->setZValue(opt->index + 1);
+                    if (iconItem->zValue() != opt->index + 1) {
+                        iconItem->setZValue(opt->index + 1);
+                    }
 
                     if (opt->content.canConvert<HbIcon>()){
                         iconItem->setIcon(opt->content.value<HbIcon>());
@@ -3596,7 +3476,6 @@
             case P_ItemViewItem_background:
                 if (const HbStyleOptionAbstractViewItem *opt = qstyleoption_cast<const HbStyleOptionAbstractViewItem *>(option)) {
                     HbIconItem *iconItem = static_cast<HbIconItem*>(item);
-                    iconItem->setZValue(-3.0);
                     iconItem->setGeometry(opt->boundingRect);
                     if (opt->background.canConvert<HbIcon>()){
                         iconItem->setIcon(opt->background.value<HbIcon>());
@@ -3609,7 +3488,6 @@
             case P_ItemViewItem_frame:
                 if (const HbStyleOptionAbstractViewItem *opt = qstyleoption_cast<const HbStyleOptionAbstractViewItem *>(option)) {
                     HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
-                    frameItem->setZValue(-4.0);
                     frameItem->setGeometry(opt->boundingRect);
 
                     if (opt->background.canConvert<HbFrameBackground>()) {
@@ -3653,7 +3531,6 @@
             case P_ItemViewItem_focus:
                 if (const HbStyleOptionAbstractViewItem *opt = qstyleoption_cast<const HbStyleOptionAbstractViewItem *>(option)) {
                     HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
-                    frameItem->setZValue(-1.0);
                     frameItem->setGeometry(opt->boundingRect);
 
                     if (opt->viewItemType == Hb::ItemType_TreeViewItem
@@ -3723,7 +3600,24 @@
             case P_TumbleView_background:
                 if (const HbStyleOption *opt = qstyleoption_cast<const HbStyleOption*>(option)) {
                     if(HbFrameItem *frameItem = qgraphicsitem_cast<HbFrameItem*>(item)) {
-                        frameItem->frameDrawer().setFrameGraphicsName("qtg_fr_tumbler_bg");
+
+                        //Temporary source to avoid introducing new style primitive for selection dialog mark widget background item.
+                        QGraphicsItem *parent = frameItem->parentItem();
+                        const QMetaObject *obj = parent->toGraphicsObject()->metaObject();
+
+                        QString className;
+                        if(obj){
+                            className = obj->className();
+                        }
+                        ///////////////////////////////////////////////////////////
+                        
+                        if( !className.compare("HbTumbleView") ){
+                            frameItem->frameDrawer().setFrameGraphicsName("qtg_fr_tumbler_bg");
+                        }
+                        else if( !className.compare("HbSelectionDialogMarkWidget") )
+                        {
+                            frameItem->frameDrawer().setFrameGraphicsName("qtg_fr_groupbox");
+                        }
                         frameItem->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
                         frameItem->setZValue(-5);
                         //TODO:temp fix, issue with css rule picking in derived class
@@ -3835,6 +3729,7 @@
                     textItem->setText(opt->additionalText);
                 }
                 break;
+
              default:
                 return;
     };
@@ -3895,9 +3790,10 @@
 */
 void HbStylePrivate::polishItem(
     const HbVector<HbCss::StyleRule> &styleRules,
-    HbWidget* widget,
+    HbWidget *widget,
     QGraphicsItem *item,
     const QString &name,
+    HbDeviceProfile &profile,
     bool layoutDefined) const
 {
     if (name.isEmpty() && widget != item) {
@@ -3915,17 +3811,6 @@
     }
 #endif
 
-    QGraphicsLayoutItem* lItem = (item && item->isWidget()) ? (QGraphicsLayoutItem*)static_cast<QGraphicsWidget*>(item) : 0;
-    if ( !lItem ) {
-        lItem = widget->layoutPrimitive(name);
-        if ( lItem && !lItem->graphicsItem() ) {
-            // assume it is spacer
-            static_cast<HbAnchorLayout*>(widget->layout())->setMapping( lItem, name );
-        }
-    }
-
-    HbDeviceProfile profile(HbDeviceProfile::profile(widget));
-
     const HbVector<HbCss::Declaration> decl = declarations(styleRules, name, widget, profile);
 #ifdef HBSTYLE_DEBUG
     qDebug() << "HbStyle::polishItem : -- Number of matching CSS declarations: " << decl.count();
@@ -4104,6 +3989,9 @@
         }
     }
 
+    QGraphicsLayoutItem* lItem = (item && item->isWidget())
+        ? (QGraphicsLayoutItem*)static_cast<QGraphicsWidget*>(item)
+        : 0;
     if ( lItem ) {
         if ( prop.mFlags & HbCss::ExtractedMinW ) {
 #ifdef HBSTYLE_DEBUG
@@ -4200,6 +4088,70 @@
     }
 }
 
+void HbStylePrivate::polishAnchor(
+    const HbVector<HbCss::StyleRule> &styleRules,
+    HbWidget *widget,
+    HbAnchor *anchor,
+    HbDeviceProfile &profile) const
+{
+#ifdef HBSTYLE_DEBUG
+    qDebug() << "HbStyle::polish : -- --";
+    qDebug() << "HbStyle::polishAnchor : -- anchor id: " << anchor->anchorId();
+#endif
+
+    const HbVector<HbCss::Declaration> decl = declarations(styleRules, anchor->anchorId(), widget, profile);
+#ifdef HBSTYLE_DEBUG
+    qDebug() << "HbStyle::polishAnchor : -- Number of matching CSS declarations: " << decl.count();
+#endif
+    HbCss::ValueExtractor extractor(decl, layoutParameters, profile);
+    HbCss::KnownProperties prop;
+
+    if ( !extractor.extractKnownProperties(prop) ) {
+#ifdef HBSTYLE_DEBUG
+        qDebug() << "HbStyle::polishAnchor : -- No polish overrides found";
+#endif
+        return;
+    }
+
+
+    if ( prop.mFlags & HbCss::ExtractedMinH || prop.mFlags & HbCss::ExtractedMinW ) {
+        qreal minLength = prop.mFlags & HbCss::ExtractedMinH ? prop.mMinH : prop.mMinW;
+#ifdef HBSTYLE_DEBUG
+        qDebug() << "HbStyle::polishAnchor : -- Setting minimum length: " << minLength;
+#endif
+        anchor->setMinimumLength( minLength );
+    }
+    if ( prop.mFlags & HbCss::ExtractedPrefH || prop.mFlags & HbCss::ExtractedPrefW ) {
+        qreal prefLength = prop.mFlags & HbCss::ExtractedPrefH ? prop.mPrefH : prop.mPrefW;
+#ifdef HBSTYLE_DEBUG
+        qDebug() << "HbStyle::polishAnchor : -- Setting preferred length: " << prefLength;
+#endif
+        anchor->setPreferredLength( prefLength );
+    }
+    if ( prop.mFlags & HbCss::ExtractedMaxH || prop.mFlags & HbCss::ExtractedMaxW ) {
+        qreal maxLength = prop.mFlags & HbCss::ExtractedMaxH ? prop.mMaxH : prop.mMaxW;
+#ifdef HBSTYLE_DEBUG
+        qDebug() << "HbStyle::polishAnchor : -- Setting maximum length: " << maxLength;
+#endif
+        anchor->setMaximumLength( maxLength );
+    }
+    if ( prop.mFlags & HbCss::ExtractedPolVer || prop.mFlags & HbCss::ExtractedPolHor ) {
+        QSizePolicy::Policy policy = prop.mFlags & HbCss::ExtractedPolVer
+            ? prop.mSizePolicy.verticalPolicy() : prop.mSizePolicy.horizontalPolicy();
+#ifdef HBSTYLE_DEBUG
+        qDebug() << "HbStyle::polishAnchor : -- Setting size policy: " << policy;
+#endif
+        anchor->setSizePolicy( policy );
+    }
+    if ( prop.mFlags & HbCss::ExtractedAnchorDir ) {
+#ifdef HBSTYLE_DEBUG
+        qDebug() << "HbStyle::polishAnchor : -- Setting anchor direction: " << prop.mAnchorDir;
+#endif
+        anchor->setDirection( prop.mAnchorDir );
+    }
+}
+
+
 
 #define NODEPTR_N(x) HbCss::StyleSelector::NodePtr n = {n.ptr = (void *)x};
 /*!
@@ -4289,67 +4241,81 @@
     }
 #endif
 
-    QStringList meshIds;
-    HbAnchorLayout *meshLayout(0);
+    QStringList nodeIds;
+    HbAnchorLayout *anchorLayout(0);
     if (layoutDefined) {
 
-        QString cachedLayoutName = widgetLayoutNames[widget];
-        bool cached = (cachedLayoutName == layoutName );
-        if ( !cached ) {
+        // check that we do not override the user defined layout
+        const QVariant layoutPtrByStyleV = widget->property( LAYOUT_PTR_PROPERTY );
+        const QGraphicsLayout *layoutPtrByStyle = layoutPtrByStyleV.isValid() ? layoutPtrByStyleV.value<QGraphicsLayout*>() : 0;
+        const QGraphicsLayout *existingLayoutPtr = widget->layout();
+
+        if ( existingLayoutPtr && (existingLayoutPtr!=layoutPtrByStyle) ) {
+            // widget has a layout, but it is not created by the style -> we cannot override.
 #ifdef HBSTYLE_DEBUG
-            qDebug() << "LayoutName cache miss.";
+            qDebug() << "HbStyle::polish : layout overridden by user";
+#endif // HBSTYLE_DEBUG
+        } else {
+            const QVariant existingLayoutNameV = widget->property( LAYOUT_NAME_PROPERTY );
+            const QString existingLayoutName = existingLayoutNameV.isValid() ? existingLayoutNameV.toString() : QString();
+            const bool cached = (existingLayoutName == layoutName );
+            if ( !cached ) {
+#ifdef HBSTYLE_DEBUG
+                qDebug() << "LayoutName cache miss.";
 #endif
-            HbWidgetStyleLoader *loader = HbWidgetStyleLoader::instance();
-            if ( !loader->loadWidgetML(widget, layoutName, sectionName)) {
+                HbWidgetStyleLoader *loader = HbWidgetStyleLoader::instance();
+                if ( !loader->loadWidgetML(widget, layoutName, sectionName)) {
 #ifdef HBSTYLE_DEBUG
-                qDebug() << "HbStyle::polish : Failed to load WidgetML";
+                    qDebug() << "HbStyle::polish : Failed to load WidgetML";
 #endif
-                return;
+                    return;
+                }
+                const QVariant ptrVariant = QVariant::fromValue( widget->layout() );
+                widget->setProperty( LAYOUT_PTR_PROPERTY, ptrVariant );
+                widget->setProperty( LAYOUT_NAME_PROPERTY, QVariant( layoutName ) );
             }
-            widgetLayoutNames[widget] = layoutName;
-            if (cachedLayoutName.isNull()) {
-                // Cached for the first time. Connect to destroyed signal.
-                QObject::connect(widget, SIGNAL(destroyed(QObject*)), this, SLOT(widgetDestroyed(QObject*)));
+
+            anchorLayout = static_cast<HbAnchorLayout*>(widget->layout());
+            if (cached) {
 #ifdef HBSTYLE_DEBUG
-                qDebug() << "Cached first time. Connected to destroy signal.";
-            } else {
-                qDebug() << "Cached nth time.";
+                qDebug() << "LayoutName cache hit.";
 #endif
+                anchorLayout->removeMappings();
             }
+
+            anchorLayout->setMapping(anchorLayout, "");
+            nodeIds = anchorLayout->nodeIds();
         }
-        meshLayout = static_cast<HbAnchorLayout*>(widget->layout());
-        if (cached) {
-#ifdef HBSTYLE_DEBUG
-            qDebug() << "LayoutName cache hit.";
-#endif
-            meshLayout->removeMappings();
-        }
-
-        meshLayout->setMapping(meshLayout, "");
-        meshIds = meshLayout->nodeIds();
-
     }
 
     // polish widget and subitems
-    d->polishItem(styleRules, widget, widget, "", false);
+    d->polishItem(styleRules, widget, widget, "", profile, false);
     QList<QGraphicsItem*> list = widget->childItems();
     foreach (QGraphicsItem* item, list) {
         QString name = HbStyle::itemName(item);
-        if ( meshLayout && !name.isEmpty() ) {
+        if ( anchorLayout && !name.isEmpty() ) {
             // Assuming that all items with "itemName" are widgets.
-            meshLayout->setMapping(static_cast<QGraphicsWidget*>(item), name);
-            // Remove from "meshIds" so that we don't call polishItem
+            anchorLayout->setMapping(static_cast<QGraphicsWidget*>(item), name);
+            // Remove from "nodeIds" so that we don't call polishItem
             // twice for this item.
-            meshIds.removeAll(name);
+            nodeIds.removeAll(name);
         }
-        d->polishItem(styleRules, widget, item, name, layoutDefined);
+        d->polishItem(styleRules, widget, item, name, profile, layoutDefined);
     }
-    foreach (QString meshId, meshIds) {
-        // These are the "missing" mesh items. Need to call polishItem
-        // for them, too, for getting the mesh anchor spacings right.
-        // if there are mesh ids, layoutDefined is always true.
-        if ( !meshId.isEmpty() ) {
-            d->polishItem(styleRules, widget, 0, meshId, true);
+    foreach (QString nodeId, nodeIds) {
+        // These are the "missing" anchor items. Need to call polishItem
+        // for them, too, for getting the anchor spacings right.
+        // if there are anchor node ids, layoutDefined is always true.
+        if ( !nodeId.isEmpty() ) {
+            d->polishItem(styleRules, widget, 0, nodeId, profile, true);
+        }
+    }
+    if ( anchorLayout ) {
+        QList<HbAnchor*> anchors = anchorLayout->anchors();
+        foreach (HbAnchor* anchor, anchors) {
+            if ( !anchor->anchorId().isEmpty() ) {
+                d->polishAnchor(styleRules, widget, anchor, profile);
+            }
         }
     }
 }
@@ -4362,8 +4328,10 @@
     \param widget, widget whose themed parameters are supposed to be updated
     \param item, graphics item whose themed parameters are supposed to be updated
 */
-void HbStylePrivate::updateThemedItems( const HbVector<HbCss::StyleRule> &styleRules,
-    QGraphicsItem *item ) const
+void HbStylePrivate::updateThemedItems(
+    const HbVector<HbCss::StyleRule> &styleRules,
+    QGraphicsItem *item,
+    HbDeviceProfile &profile) const
 {
 
     QString name = HbStyle::itemName(item);
@@ -4372,13 +4340,13 @@
     }
 
     HbTextItem* text = qgraphicsitem_cast<HbTextItem*>( item );
+    HbRichTextItem* richtext = qgraphicsitem_cast<HbRichTextItem*>( item );
     HbIconItem* iconItem = qgraphicsitem_cast<HbIconItem*>( item );
     HbMarqueeItem* marqueeItem = qgraphicsitem_cast<HbMarqueeItem*>( item );
-    if(! (text || iconItem || marqueeItem ) ){
+    if(! (text || richtext || iconItem || marqueeItem ) ){
         return;
     }
 
-    HbDeviceProfile profile;
     const HbVector<HbCss::Declaration> decl = declarations(styleRules, name, 0, profile);
 
 #ifdef HBSTYLE_DEBUG
@@ -4405,6 +4373,19 @@
             HbWidgetBasePrivate::d_ptr(text)->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextColor, false);
         }
     }
+
+    if(richtext) {
+#ifdef HBSTYLE_DEBUG
+        if ( !extracted ) {
+            qDebug() << "HbStyle::getColor : -- No color information found";
+        }
+#endif
+        if ( !HbWidgetBasePrivate::d_ptr(richtext)->testApiProtectionFlag(HbWidgetBasePrivate::AC_TextColor ) ){
+            richtext->setTextDefaultColor(col);
+            HbWidgetBasePrivate::d_ptr(richtext)->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextColor, false);
+        }
+    }
+
     if (iconItem) {
         // Applying color to mono-colorised icons from theme. Using setColor()
         // here would be wrong. It would lead to loosing the user-supplied color
@@ -4463,7 +4444,7 @@
     // update themed items
     QList<QGraphicsItem*> list = widget->childItems();
     foreach (QGraphicsItem* item, list) {
-        d->updateThemedItems(styleRules, item);
+        d->updateThemedItems(styleRules, item, profile);
     }
 }
 
@@ -4484,7 +4465,7 @@
 */
 void HbStyle::widgetDestroyed(QObject* obj)
 {
-    widgetLayoutNames.remove((const QGraphicsWidget *)obj);
+    Q_UNUSED( obj );
 }
 
 /*!
@@ -4511,7 +4492,9 @@
         QGraphicsLayoutItem* lItem = (item->isWidget()) ? (QGraphicsLayoutItem*)static_cast<QGraphicsWidget*>(item) : 0;
         if (lItem && parent && parent->isWidget()) {
             QGraphicsWidget* parentW = static_cast<QGraphicsWidget*>(parent);
-            if ( parentW->layout() && widgetLayoutNames.contains(parentW) ) {
+            const QVariant layoutPtrByStyleV = parentW->property( LAYOUT_PTR_PROPERTY );
+            const QGraphicsLayout *layoutPtrByStyle = layoutPtrByStyleV.isValid() ? layoutPtrByStyleV.value<QGraphicsLayout*>() : 0;
+            if ( parentW->layout() && (parentW->layout()==layoutPtrByStyle)) {
                 HbAnchorLayout* layout = static_cast<HbAnchorLayout*>(parentW->layout());
                 if ( layout->indexOf(lItem) != -1 ) {
                     if( name.isEmpty() ) {
@@ -4674,7 +4657,6 @@
 */
 HbStylePrivate::HbStylePrivate()
 {
-    nextAvailableId = HbStyle::P_CustomBase;
     HbWidgetStyleLoader *loader = HbWidgetStyleLoader::instance();
     if(loader){
         loader->addFilePath(STYLE_LOCATION, HbLayeredStyleLoader::Concern_Layouts,
@@ -4768,20 +4750,6 @@
     return icon;
 }
 
-/*!
-\internal
-*/
-HbStyleInterface *HbStylePrivate::stylePluginInterface( HbStyle::Primitive primitive ) const
-{
-
-    if (customPrimitives.contains(primitive)) {
-        HbStyleInterfaceInfo* info = customPrimitives.value(primitive);
-        QObject* pluginInstance = info->loader->instance();
-        HbStyleInterface *stylePlugin = qobject_cast<HbStyleInterface *>(pluginInstance);
-        return stylePlugin;
-    }
-    return 0;
-}
 
 /*!
 \internal
@@ -4855,7 +4823,6 @@
 */
 void HbStylePrivate::clearStyleSheetCaches()
 {
-    widgetLayoutNames.clear();
     styleRulesCache.clear();
 }
 
@@ -4864,5 +4831,4 @@
     return HbWidgetBasePrivate::d_ptr(widgetBase);
 }
 
-
 #include "moc_hbstyle.cpp"
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/style/hbstyle.h
--- a/src/hbcore/style/hbstyle.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/style/hbstyle.h	Tue Jul 06 14:36:53 2010 +0300
@@ -114,6 +114,7 @@
         P_TitlePane_background,
         P_TitlePane_text,
         P_TitlePane_icon,
+        P_TitlePane_toucharea,
         P_TitleBar_toucharea,
         P_SignalIndicator_icon,
         P_SignalLevel_background,
@@ -131,9 +132,11 @@
         P_ProgressBar_mintext,
         P_ProgressBar_maxtext,
         P_NavigationButton_background,
+        P_NavigationButton_toucharea,
         P_IndicatorButton_background,
         P_IndicatorButton_handleindication,
         P_IndicatorButton_eventindication,
+        P_IndicatorButton_toucharea,
         P_ItemViewItem_frame,   
         P_SelectionControl_selectionstart,
         P_SelectionControl_selectionend,
@@ -224,9 +227,6 @@
     virtual QGraphicsItem *createPrimitive( HbStyle::Primitive primitive, QGraphicsItem *parent = 0 ) const;
     virtual void updatePrimitive( QGraphicsItem *item, HbStyle::Primitive primitive, const QStyleOption *option ) const;
 
-    int registerPlugin(const QString &pluginName);
-    void unregisterPlugin(const QString &pluginName);
-
     static void setItemName( QGraphicsItem *item, const QString &name );
     static QString itemName( const QGraphicsItem *item );
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/style/hbstyle_p.h
--- a/src/hbcore/style/hbstyle_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/style/hbstyle_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -44,26 +44,9 @@
 #include "hbcssparser_p.h"
 
 class HbWidget;
-class HbPluginLoader;
-class HbStyleInterface;
 class HbWidgetBasePrivate;
+class HbAnchor;
 
-class HbStylePluginInfo
-{
-public:    
-    int primitiveBaseId;
-    int primitiveCount;
-    int refCount;
-};
-
-class HbStyleInterfaceInfo
-{
-public: 
-    HbPluginLoader* loader;
-    int primitiveBaseId;
-};
-
-static QHash<const QGraphicsWidget*, QString> widgetLayoutNames;
 
 class HbStylePrivate
 {
@@ -75,12 +58,24 @@
     QString logicalName(HbStyle::Primitive primitive, const QStyleOption *option) const;
     QIcon::Mode iconMode(QStyle::State state) const;
     QIcon::State iconState(QStyle::State state) const;
-	HbStyleInterface *stylePluginInterface( HbStyle::Primitive primitive ) const;
+
 
-    void polishItem(const HbVector<HbCss::StyleRule> &styleRules, HbWidget *widget,
-		QGraphicsItem *item, const QString &name, bool layoutDefined) const;
-    void updateThemedItems( const HbVector<HbCss::StyleRule> &styleRules,
-		QGraphicsItem *item ) const;
+    void polishItem(
+        const HbVector<HbCss::StyleRule> &styleRules,
+        HbWidget *widget,
+		QGraphicsItem *item,
+        const QString &name,
+        HbDeviceProfile &profile,
+        bool layoutDefined) const;
+    void polishAnchor(
+        const HbVector<HbCss::StyleRule> &styleRules,
+        HbWidget *widget,
+        HbAnchor *anchor,
+        HbDeviceProfile &profile) const;
+    void updateThemedItems(
+        const HbVector<HbCss::StyleRule> &styleRules,
+		QGraphicsItem *item,
+        HbDeviceProfile &profile) const;
 
     void ensureLayoutParameters(const HbDeviceProfile &profile) const;
 
@@ -90,10 +85,6 @@
 
     HbStyle* q_ptr;
 
-    mutable QHash<int, HbStyleInterfaceInfo*> customPrimitives;
-    mutable QHash<QString, HbStylePluginInfo*> registeredPlugins;
-    mutable QHash<QString, QString> pluginStylePaths;
-    mutable int nextAvailableId;
 
     mutable QHash<QString, HbCss::Declaration> layoutParameters;
     mutable QString layoutParametersProfileName;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/style/hbstyleinterface.cpp
--- a/src/hbcore/style/hbstyleinterface.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-
-#include "hbstyleinterface_p.h"
-
-
-/*!
-    \deprecated HbStyleInterface::deprecated()
-    is deprecated. Style plugins are deprecated, stop using style plugins.  
-*/
-void HbStyleInterface::deprecated()
-{
-}
-
-/*!
-    \fn virtual int primitiveCount() const = 0;
-
-    Return the count of primitives created / supported by this plugin.
-*/
-
-/*!
-    \fn virtual QGraphicsItem *createPrimitive( HbStyle::Primitive primitive, QGraphicsItem *parent = 0 ) const = 0;
-
-    Returns primitives created in this plugin. Note that the primitive parameter range is internal to the plugin. This means that
-	you can define your plugin's primitives in your domain (for example app domain). When calling create/updatePrimitive from your custom
-	widget use plugin's base id + your primitive's id. See also the documentation from HbStyle::createPrimitive.
-*/
-
-/*!
-    \fn virtual void updatePrimitive( QGraphicsItem *item, HbStyle::Primitive primitive, const QStyleOption *option ) const  = 0;
-
-	Updates the primitives defined in this plugin. See more documentation from HbStyle::updatePrimitive.
-    
-*/
-
-/*!
-    \fn virtual QString layoutPath() const = 0;
-
-	Returns the path to layout definition files (CSS/WidgetML). The path can define several CSS and WidgetML files. The directory can contain
-	several widgets' layout definitions. Subdirectories are not supported. The filenames in the directory must match with the widgets' class
-	names. For example class called MyExampleWidget should have myexamplewidget.css and myexamplewidget.widgetml in the directory returned by layoutPath().
-
-    
-*/
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/style/hbstyleoptionnotificationdialog.cpp
--- a/src/hbcore/style/hbstyleoptionnotificationdialog.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionnotificationdialog.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -31,21 +31,19 @@
 */
 
 HbStyleOptionNotificationDialog::HbStyleOptionNotificationDialog() :
-        titleAlignment(Qt::AlignLeft|Qt::AlignVCenter),
-        textAlignment(Qt::AlignLeft|Qt::AlignVCenter),
-        iconAlignment(Qt::AlignCenter),
-        titleWrapping(false),
-        textWrapping(false),
-        isLink(false),
-        wrappingTitle(Hb::TextNoWrap),
-        wrappingText(Hb::TextNoWrap)
+    titleAlignment(Qt::AlignLeft|Qt::AlignVCenter),
+    textAlignment(Qt::AlignLeft|Qt::AlignVCenter),
+    iconAlignment(Qt::AlignCenter),
+    isLink(false),
+    titleTextWrapping(Hb::TextNoWrap),
+    textTextWrapping(Hb::TextNoWrap)
 {
     type = Type;
     version = Version;
 }
 
 HbStyleOptionNotificationDialog::HbStyleOptionNotificationDialog(
-        const HbStyleOptionNotificationDialog &other) :
+    const HbStyleOptionNotificationDialog &other) :
     HbStyleOptionPopup(other),
     title(other.title),
     text(other.text),
@@ -53,11 +51,9 @@
     titleAlignment(other.titleAlignment),
     textAlignment(other.textAlignment),
     iconAlignment(other.iconAlignment),
-    titleWrapping(other.titleWrapping),
-    textWrapping(other.textWrapping),
     isLink(other.isLink),
-    wrappingTitle(other.wrappingTitle),
-    wrappingText(other.wrappingText)
+    titleTextWrapping(other.titleTextWrapping),
+    textTextWrapping(other.textTextWrapping)
 {
     type = Type;
     version = Version;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/style/hbstyleoptionnotificationdialog_p.h
--- a/src/hbcore/style/hbstyleoptionnotificationdialog_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionnotificationdialog_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -49,11 +49,9 @@
     Qt::Alignment titleAlignment;
     Qt::Alignment textAlignment;
     Qt::Alignment iconAlignment;
-    bool titleWrapping;
-    bool textWrapping;
     bool isLink;    
-    Hb::TextWrapping wrappingTitle;
-    Hb::TextWrapping wrappingText;
+    Hb::TextWrapping titleTextWrapping;
+    Hb::TextWrapping textTextWrapping;
 };
 
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/style/style.pri
--- a/src/hbcore/style/style.pri	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/style/style.pri	Tue Jul 06 14:36:53 2010 +0300
@@ -29,7 +29,6 @@
 
 PUBLIC_HEADERS += $$PWD/hbstyle.h
 PUBLIC_HEADERS += $$PWD/hbstyleparameters.h  
-
 PRIVATE_HEADERS += $$PWD/hbstyleoption_p.h
 PRIVATE_HEADERS += $$PWD/hbstyleoptionabstractviewitem_p.h
 PRIVATE_HEADERS += $$PWD/hbstyleoptioncheckbox_p.h
@@ -61,7 +60,6 @@
 PRIVATE_HEADERS += $$PWD/hbstyleoptionratingslider_p.h
 PRIVATE_HEADERS += $$PWD/hbstyleoptioncombobox_p.h
 PRIVATE_HEADERS += $$PWD/hbstyleoptioninputdialog_p.h
-PRIVATE_HEADERS += $$PWD/hbstyleinterface_p.h
 PRIVATE_HEADERS += $$PWD/hbstyle_p.h
 PRIVATE_HEADERS += $$PWD/hbstyleoptionsliderelement_p.h
 PRIVATE_HEADERS += $$PWD/hbstyleoptionprogresssliderhandle_p.h
@@ -102,7 +100,6 @@
 SOURCES += $$PWD/hbstyleoptiontooltip.cpp
 SOURCES += $$PWD/hbstyleoptiontreeviewitem.cpp
 SOURCES += $$PWD/hbstyleparameters.cpp
-SOURCES += $$PWD/hbstyleinterface.cpp
 SOURCES += $$PWD/hbstyleoptiondataform.cpp
 SOURCES += $$PWD/hbstyleoptiondatagroup.cpp
 SOURCES += $$PWD/hbstyleoptiondatagroupheadingwidget.cpp
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/theme/hbtheme.cpp
--- a/src/hbcore/theme/hbtheme.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/theme/hbtheme.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -112,7 +112,6 @@
 HbTheme::HbTheme() : d_ptr(new HbThemePrivate) 
 {
     d_ptr->q_ptr = this;
-    d_ptr->fetchCurrentThemeFromSettings();
     d_ptr->handleThemeChange();
 }
 
@@ -129,12 +128,14 @@
 */
 HbThemePrivate::HbThemePrivate()
 {
+#ifdef Q_OS_SYMBIAN
     // Condition added to check if the client itself is server.
     if(THEME_SERVER_NAME != HbMemoryUtils::getCleanAppName()) {
         if(!HbThemeClient::global()->connectToServer()) {
             qWarning() << "ThemeClient unable to connect to server in HbThemePrivate::HbThemePrivate.";
         }
     }
+#endif
 }
 
 /*!
@@ -142,29 +143,13 @@
 */
 HbThemePrivate::~HbThemePrivate()
 {
+#ifdef Q_OS_SYMBIAN
     HbThemeClient::releaseInstance();
     GET_MEMORY_MANAGER( HbMemoryManager::HeapMemory )
     if (manager) {
         manager->releaseInstance(HbMemoryManager::HeapMemory);
     }
-}
-
-/*!
-    Retrieves the current theme from setting
-*/
-void HbThemePrivate::fetchCurrentThemeFromSettings()
-{
-    HbThemeIndexInfo info = HbThemeUtils::getThemeIndexInfo(ActiveTheme);
-    if (info.address) {
-        currentTheme = info.name;
-        return;
-    }
-    
-    // Fallback to settings
-    currentTheme = HbThemeUtils::getThemeSetting(HbThemeUtils::CurrentThemeSetting);
-    if (currentTheme.trimmed().isEmpty()){
-        currentTheme = HbThemeUtils::defaultTheme().name;
-    }
+#endif
 }
 
 /*!
@@ -190,9 +175,6 @@
     iconTheme.setCurrentTheme(newTheme);
     HbEffectTheme::instance()->setCurrentTheme(newTheme);
     
-    // The server sends the signal only if the theme is changed from the previous theme
-    // Hence here, we need not check whether the theme differs from currentTheme or not.
-    currentTheme = newTheme;
     // This should be used to replace pixmaps from the old theme with the pixmaps from the new theme
     // In application side this is needed only when icon size can be different in different theme.
     iconTheme.emitUpdateIcons();
@@ -203,7 +185,7 @@
 }
 
 /*!
-    Clears the contents to reload new css files
+    Clears the contents to reload new files
 */
 void HbThemePrivate::updateTheme(const QStringList &updatedFiles)
 {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/theme/hbtheme.h
--- a/src/hbcore/theme/hbtheme.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/theme/hbtheme.h	Tue Jul 06 14:36:53 2010 +0300
@@ -64,7 +64,6 @@
     friend class HbWidgetLoader;
     friend class HbEffectController;
     friend class HbDeviceProfile;
-    friend class HbEffectTheme;
     friend class HbThemeIndexResource;
     Q_DECLARE_PRIVATE_D( d_ptr, HbTheme )
     Q_DISABLE_COPY(HbTheme)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/theme/hbtheme_p.h
--- a/src/hbcore/theme/hbtheme_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/theme/hbtheme_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -28,13 +28,13 @@
 #include "hbicontheme_p.h"
 #include "hbthemeindex_p.h"
 #include "hbtheme.h"
+#include "hbthemeutils_p.h"
 
 class HbThemePrivate
 {
     Q_DECLARE_PUBLIC(HbTheme)
 public:
     void handleThemeChange(const QString &str = QString());
-    void fetchCurrentThemeFromSettings();
     void updateTheme(const QStringList &updatedFiles);
     HbThemePrivate();
     ~HbThemePrivate();
@@ -42,9 +42,7 @@
     static HbThemePrivate *instance() { return HbTheme::instance()->d_func(); }
 
 public:
-    QString currentTheme;
     HbIconTheme iconTheme;
     HbTheme *q_ptr;
-
 };
 #endif /* HBTHEME_P_H */
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/theme/hbthemeclient_generic_p.cpp
--- a/src/hbcore/theme/hbthemeclient_generic_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_generic_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -23,92 +23,34 @@
 **
 ****************************************************************************/
 
-#include "hbthemeclient_p_p.h"
-#include <QLocalSocket>
-#include <QProcess>
-#include <QFile>
-#include <QCoreApplication>
-#include <QDebug>
-#include <QDir>
-
 #include <hbinstance.h>
 #include <hbtheme_p.h>
 #include <hbtheme.h>
+#include <hbthemeutils_p.h>
 #include <hbevent.h>
-#include "hbthemecommon_p.h"
-#include "hbmemorymanager_p.h"
 
-static const int WAIT_TIME_TO_CONNECT_TO_SERVER = 500;
-static const int WAIT_TIME_TO_START_SERVER = 5000;
-#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN)
-static const QString SERVERFILENAME = QLatin1String("hbthemeserver.exe");
-#else
-static const QString SERVERFILENAME = QLatin1String("hbthemeserver");
-#endif
-static const QString SERVERFILEPATH = QLatin1String(HB_BIN_DIR)
-                                      + QDir::separator() + SERVERFILENAME;
-static const QStringList SERVERARGUMENTS = QStringList() << QLatin1String("-start");
+#include "hbthemeclient_p_p.h"
+#include "hbthemecommon_p.h"
+
+#include <QDebug>
+#include <QFileSystemWatcher>
+#include <QSettings>
 
 /**
  * Constructor
  */
 HbThemeClientPrivate::HbThemeClientPrivate() :
-        clientConnected(false),
-        localSocket(new QLocalSocket())
+        iniFileWatcher(0),
+        clientConnected(false)
 {
 #ifdef THEME_SERVER_TRACES
     qDebug() << Q_FUNC_INFO ;
 #endif
-}
 
-/**
- * connectToServer
- */
-bool HbThemeClientPrivate::connectToServer()
-{
-    localSocket->connectToServer(THEME_SERVER_NAME);
-
-    // This logic needs to be improved
-    bool success = localSocket->waitForConnected(WAIT_TIME_TO_CONNECT_TO_SERVER);
-
-#ifdef THEME_SERVER_TRACES
-    qDebug() << Q_FUNC_INFO << "Socket Connect status: " << success;
-#endif
-
-    if(!success) {
-        QProcess *newProcess = new QProcess();
-        if (QFile::exists(SERVERFILENAME)) {
-            newProcess->start(SERVERFILENAME, SERVERARGUMENTS);
-            success = newProcess->waitForStarted(WAIT_TIME_TO_START_SERVER);
-        }
-        if (!success) {
-            newProcess->start(SERVERFILEPATH, SERVERARGUMENTS);
-            success = newProcess->waitForStarted(WAIT_TIME_TO_START_SERVER);
-        }
-#ifdef THEME_SERVER_TRACES
-        qDebug() << Q_FUNC_INFO << "Server Start Status: " << success
-                 << "Error = " << newProcess->error();
-#endif
-
-        // If server started
-        if (success) {
-            // ToDo: This is to wait for server to start running. Logic needs to be improved.
-            newProcess->waitForFinished(3000);
-#ifdef THEME_SERVER_TRACES
-            qDebug() << Q_FUNC_INFO << " Server Start Wait is over" ;
-#endif
-            localSocket->connectToServer(THEME_SERVER_NAME);
-            success = localSocket->waitForConnected();
-#ifdef THEME_SERVER_TRACES
-            qDebug() << Q_FUNC_INFO << "socketconnected : " << success;
-#endif
-        }
-    }
-    if (success) {
-        connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    }
-
-    return clientConnected = success;
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));
+    iniFileWatcher = new QFileSystemWatcher(this);
+    iniFileWatcher->addPath(settings.fileName());
+    connect(iniFileWatcher, SIGNAL(fileChanged(QString)), this, SLOT(iniFileChanged(QString)));
 }
 
 /**
@@ -116,1138 +58,48 @@
  */
 HbThemeClientPrivate::~HbThemeClientPrivate()
 {
-    localSocket->disconnectFromServer();
-    delete localSocket;
-}
-
-/**
- * HbThemeClientPrivate::getSharedIconInfo()
- */
-HbSharedIconInfo HbThemeClientPrivate::getSharedIconInfo(const QString &iconPath,
-                                                         const QSizeF &size,
-                                                         Qt::AspectRatioMode aspectRatioMode,
-                                                         QIcon::Mode mode,
-                                                         bool mirrored,
-                                                         HbIconLoader::IconLoaderOptions options,
-                                                         const QColor &color,
-                                                         HbRenderingMode renderMode)
-{
-#ifdef THEME_SERVER_TRACES
-    qDebug() << Q_FUNC_INFO;
-#endif
-    HbSharedIconInfo iconInfo;
-    iconInfo.type = INVALID_FORMAT;
-
-    if ( !clientConnected ) {
-        return iconInfo;
-    }
-
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest requestType;
-    requestType = EIconLookup;
-    outputDataStream << (int)requestType;
-    outputDataStream << iconPath;
-    outputDataStream << size;
-    outputDataStream << aspectRatioMode;
-    outputDataStream << mode;
-    outputDataStream << mirrored;
-    outputDataStream << options;
-    outputDataStream << color;
-    outputDataStream << renderMode;
-
-    //@to do  block the segment upto the connect
-    // changeTheme() slot should not be called for pixmap lookup case. So disconnecting.
-    disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    localSocket->write(outputByteArray);
-    localSocket->flush();
-    localSocket->waitForReadyRead();
-#ifdef THEME_SERVER_TRACES
-    qDebug() << "image req : " << iconPath;
-#endif
-    QByteArray inputByteArray = localSocket->readAll();
-    QDataStream inputDataStream(inputByteArray);
-    HbThemeServerRequest request;
-    int temp;
-    inputDataStream >> temp;
-    request = (HbThemeServerRequest)temp;
-
-    // Need to handle the situation when both themechange
-    // request and pixmap info comes at the same time
-    // Just posting the ThemeChnaged event so that it can be handled
-    // as next event and current pixmap load is not interrupted
-    if (EIconLookup==request) {
-        readIconInfo(inputDataStream, iconInfo);
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EThemeSelection==request) {
-                QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-            }
-        }
-    } else if (EThemeSelection==request){
-        // Asked for pixmap, got theme change request.. clean theme name
-        QString themeName;
-        inputDataStream >> themeName;
-        QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EIconLookup==request) {
-                readIconInfo(inputDataStream, iconInfo);
-            }
-        }
-    }
-    // connecting again to handle theme change request from server
-    connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    return iconInfo;
-}
-
-/*
- * HbThemeClientPrivate::getSharedLayoutDefs()
- *
- * Returns the layout definition for the given file name,layout name,section name
-*/
-HbWidgetLoader::LayoutDefinition *HbThemeClientPrivate::getSharedLayoutDefs(
-        const QString &fileName, const QString &layout, const QString &section)
-{
-    if ( !clientConnected ) {
-        return 0;
-    }
-
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest requestType = EWidgetMLLookup;
-
-    outputDataStream << int(requestType);
-    outputDataStream << fileName;
-    outputDataStream << layout;
-    outputDataStream << section;
-
-    disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-
-    localSocket->write(outputByteArray);
-    localSocket->flush();
-    localSocket->waitForReadyRead();
-
-    QByteArray inputByteArray = localSocket->readAll();
-    QDataStream inputDataStream(&inputByteArray, QIODevice::ReadOnly);
-    HbThemeServerRequest request;
-    int temp;
-    int sharedMLOffset = -1;
-    inputDataStream >> temp;
-    request = static_cast<HbThemeServerRequest>(temp);
-
-     if (EWidgetMLLookup == request) {
-        inputDataStream >> sharedMLOffset;
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = static_cast<HbThemeServerRequest>(temp);
-            if (EThemeSelection == request) {
-                QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-            }
-        }
-    } else if (EThemeSelection == request){
-        QString themeName;
-        inputDataStream >> themeName;
-        QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EWidgetMLLookup==request) {
-                inputDataStream >> sharedMLOffset;
-            }
-        }
-    }
-    // connecting again to handle theme change request from server
-    connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-
-    if (sharedMLOffset >= 0) {
-        return HbMemoryUtils::getAddress<HbWidgetLoader::LayoutDefinition>(
-                HbMemoryManager::SharedMemory, sharedMLOffset);
-    } else {
-        return 0;
-    }
-}
-
-/**
- * HbThemeClientPrivate::getSharedStyleSheet()
- */
-HbCss::StyleSheet *HbThemeClientPrivate::getSharedStyleSheet(
-        const QString &filePath, HbLayeredStyleLoader::LayerPriority priority)
-{
-#ifdef THEME_SERVER_TRACES
-    qDebug() << Q_FUNC_INFO;
-#endif
-
-    if ( !clientConnected ) {
-        return 0;
-    }
-
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest requestType = EStyleSheetLookup;
-
-    outputDataStream << int(requestType);
-    outputDataStream << filePath;
-    outputDataStream << priority;
-
-    disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    localSocket->write(outputByteArray);
-    localSocket->flush();
-    localSocket->waitForReadyRead();
-#ifdef THEME_SERVER_TRACES
-    qDebug() << "stylesheet req : " << fileName;
-#endif
-    QByteArray inputByteArray = localSocket->readAll();
-    QDataStream inputDataStream(inputByteArray);
-    HbThemeServerRequest request;
-    int temp;
-
-    //-1 represents invalid offset
-    int cssOffset = -1;
-    inputDataStream >> temp;
-    request = static_cast<HbThemeServerRequest>(temp);
-
-    // Need to handle the situation when both themechange
-    // request and stylesheet lookup info comes at the same time
-    // Just posting the ThemeChanged event so that it can be handled
-    // as next event and current stylesheet load is not interrupted
-    if (EStyleSheetLookup==request) {
-        inputDataStream >> cssOffset;
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EThemeSelection==request) {
-                QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-            }
-        }
-    } else if (EThemeSelection==request){
-        // Asked for stylesheet, got theme change request.. clean theme name
-        QString themeName;
-        inputDataStream >> themeName;
-        QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EStyleSheetLookup==request) {
-                inputDataStream >> cssOffset;
-            }
-        }
-    }
-
-    // connecting again to handle theme change request from server
-    connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-
-    //if a valid offset is obtained from the server return this offset
-    if (cssOffset >= 0) {
-        return HbMemoryUtils::getAddress<HbCss::StyleSheet>(
-            HbMemoryManager::SharedMemory, cssOffset);
-    } else {
-        return 0;
-    }
-}
-
-/**
- * HbThemeClientPrivate::deviceProfiles()
- */
-HbDeviceProfileList *HbThemeClientPrivate::deviceProfiles()
-{
-#ifdef THEME_SERVER_TRACES
-	qDebug() << Q_FUNC_INFO;
-#endif
-
-    if ( !clientConnected ) {
-        return 0;
-    }
-
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest requestType = EDeviceProfileOffset;
-    outputDataStream << int(requestType);
-
-    disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    localSocket->write(outputByteArray);
-    localSocket->flush();
-    localSocket->waitForReadyRead();
-
-    QByteArray inputByteArray = localSocket->readAll();
-    QDataStream inputDataStream(inputByteArray);
-    HbThemeServerRequest request;
-    int temp;
-
-    //-1 represents invalid offset
-    int deviceProfileOffset = -1;
-    inputDataStream >> temp;
-    request = (HbThemeServerRequest)temp;
-
-    if (EDeviceProfileOffset == request) {
-        inputDataStream >> deviceProfileOffset;
-    	if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EThemeSelection==request) {
-                QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-            }
-        }
-    } else if (EThemeSelection==request){
-        // Asked for DeviceProfiles Offset, got theme change request..
-        // clean theme name
-        QString themeName;
-        inputDataStream >> themeName;
-        QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EDeviceProfileOffset== request) {
-                inputDataStream >> deviceProfileOffset;
-            }
-        }
-    }
-
-    // connecting again to handle theme change request from server
-    connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-
-    //if a valid offset is obtained from the server return this offset
-    if (deviceProfileOffset >= 0) {
-        return HbMemoryUtils::getAddress<HbDeviceProfileList>(
-            HbMemoryManager::SharedMemory, deviceProfileOffset);
-    } else {
-        return 0;
-    }
-}
-
-/**
- * HbThemeClientPrivate::getSharedEffect()
- */
-HbEffectFxmlData *HbThemeClientPrivate::getSharedEffect(const QString &filePath)
-{
-#ifdef THEME_SERVER_TRACES
-    qDebug() << Q_FUNC_INFO;
-#endif
-
-    if ( !clientConnected ) {
-        return 0;
-    }
-
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest requestType = EEffectLookupFilePath;
-
-    outputDataStream << int(requestType);
-    outputDataStream << filePath;
-
-    disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    localSocket->write(outputByteArray);
-    localSocket->flush();
-    localSocket->waitForReadyRead();
-
-#ifdef THEME_SERVER_TRACES
-    qDebug() << "EEffectLookupFilePath req : " << filePath;
-#endif
-
-    QByteArray inputByteArray = localSocket->readAll();
-    QDataStream inputDataStream(inputByteArray);
-    HbThemeServerRequest request;
-    int temp;
-
-    //-1 represents invalid offset
-    int effectOffset = -1;
-    inputDataStream >> temp;
-    request = (HbThemeServerRequest)temp;
-
-    // Need to handle the situation when both themechange
-    // request and effect lookup info comes at the same time
-    // Just posting the ThemeChanged event so that it can be handled
-    // as next event and current effect load is not interrupted
-    if (request == EEffectLookupFilePath) {
-        inputDataStream >> effectOffset;
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EThemeSelection == request) {
-                QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-            }
-        }
-    } else if (EThemeSelection == request){
-        // Asked for effect, got theme change request.. clean theme name
-        QString themeName;
-        inputDataStream >> themeName;
-        QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EEffectLookupFilePath == request) {
-                inputDataStream >> effectOffset;
-            }
-        }
-    }
-
-    // connecting again to handle theme change request from server
-    connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-
-    //if a valid offset is obtained from the server return this offset
-    if (effectOffset >= 0) {
-        return HbMemoryUtils::getAddress<HbEffectFxmlData>(
-            HbMemoryManager::SharedMemory, effectOffset);
-    } else {
-        return 0;
-    }
-}
-
-/**
- * HbThemeClientPrivate::addSharedEffect()
- */
-bool HbThemeClientPrivate::addSharedEffect(const QString &filePath)
-{
-#ifdef THEME_SERVER_TRACES
-    qDebug() << Q_FUNC_INFO;
-#endif
-    if ( !clientConnected ) {
-        return false;
-    }
-
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest requestType = EEffectAdd;
-
-    outputDataStream << int(requestType);
-    outputDataStream << filePath;
-
-    disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    localSocket->write(outputByteArray);
-    localSocket->flush();
-    localSocket->waitForReadyRead();
-
-#ifdef THEME_SERVER_TRACES
-    qDebug() << "effectAdd req : " << filePath;
-#endif
-    QByteArray inputByteArray = localSocket->readAll();
-    QDataStream inputDataStream(inputByteArray);
-    HbThemeServerRequest request;
-    int temp;
-    //-1 represents an error adding file to server
-    int effectAddReply = -1;
-    inputDataStream >> temp;
-    request = static_cast<HbThemeServerRequest>(temp);
-
-
-    //TODO how to really handle situation when adding an effect when theme changes??
-
-    // Need to handle the situation when both themechange
-    // request and effect lookup info comes at the same time
-    // Just posting the ThemeChanged event so that it can be handled
-    // as next event and current effect load is not interrupted
-    if (request == EEffectAdd) {
-        inputDataStream >> effectAddReply;
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EThemeSelection == request) {
-                QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-            }
-        }
-    }
-    else if (EThemeSelection == request){
-        // Asked for effect, got theme change request.. clean theme name
-        QString themeName;
-        inputDataStream >> themeName;
-        QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EEffectAdd == request) {
-                inputDataStream >> effectAddReply;
-            }
-        }
-    }
-
-    // connecting again to handle theme change request from server
-    connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-
-    return (effectAddReply >= 0);
-}
-
-/**
- * HbThemeClientPrivate::changeTheme()
- */
-void HbThemeClientPrivate::changeTheme()
-{
-#ifdef THEME_SERVER_TRACES
-    qDebug() << Q_FUNC_INFO;
-#endif
-
-    QByteArray inputByteArray = localSocket->readAll();
-    QDataStream inputDataStream(inputByteArray);
-    int request;
-    inputDataStream >> request;
-
-#ifdef THEME_SERVER_TRACES
-    qDebug() << Q_FUNC_INFO << "recognizer: " << request;
-#endif
-
-    if(EThemeSelection == request) {
-        QString themeName;
-        inputDataStream >> themeName;
-#ifdef THEME_SERVER_TRACES
-        qDebug() << Q_FUNC_INFO << "themeName is : " << themeName;
-#endif
-        handleThemeChange(themeName);
-    }
-    if(EThemeContentUpdate == request) {
-        QStringList updatedFiles;
-        inputDataStream >> updatedFiles;
-        hbInstance->theme()->d_ptr->updateTheme(updatedFiles);
-    }
-}
-
-
-/**
- * HbThemeClientPrivate::readIconInfo()
- */
-void HbThemeClientPrivate::readIconInfo(QDataStream &dataStream, HbSharedIconInfo &iconInfo)
-{
-    int temp;
-    int tempType;
-    dataStream >> tempType;
-    iconInfo.type = (HbIconFormatType)tempType;
-
-    if( iconInfo.type == OTHER_SUPPORTED_FORMATS || iconInfo.type == SVG  ){
-        dataStream >> iconInfo.pixmapData.offset;
-        dataStream >> iconInfo.pixmapData.width;
-        dataStream >> iconInfo.pixmapData.height;
-        dataStream >> iconInfo.pixmapData.defaultWidth;
-        dataStream >> iconInfo.pixmapData.defaultHeight;
-        dataStream >> temp;
-        iconInfo.pixmapData.format= (QImage::Format)temp;
-    }
-    else if (/*iconInfo.type == SVG ||*/ iconInfo.type == PIC ){
-        dataStream >> iconInfo.picData.offset;
-        dataStream >> iconInfo.picData.dataSize;
-        dataStream >> iconInfo.picData.defaultWidth;
-        dataStream >> iconInfo.picData.defaultHeight;
-
-    }
-    else if(iconInfo.type == NVG ){
-        dataStream >> iconInfo.nvgData.offset;
-        dataStream >> iconInfo.nvgData.dataSize;
-    }
-    else if (iconInfo.type == BLOB) {
-        dataStream >> iconInfo.blobData.offset;
-        dataStream >> iconInfo.blobData.dataSize;
-    }
-}
-
-/**
- * HbThemeClientPrivate::handleThemeChange()
- */
-void HbThemeClientPrivate::handleThemeChange(const QString &themeName)
-{
-#ifdef THEME_SERVER_TRACES
-    qDebug() << Q_FUNC_INFO << "themeChanged(): called";
-#endif
-    hbInstance->theme()->d_ptr->handleThemeChange(themeName);
-}
-
-/**
- * HbThemeClientPrivate::event()
- */
-bool HbThemeClientPrivate::event(QEvent *e)
-{
-    if (e->type() == HbEvent::ThemeChanged) {
-        hbInstance->theme()->d_ptr->handleThemeChange();
-        return true;
-    }
-    return QObject::event(e);
-}
-
-/**
- * HbThemeClientPrivate::unloadIcon()
- */
-void HbThemeClientPrivate::unloadIcon(const QString &iconPath,
-                                      const QSizeF &size,
-                                      Qt::AspectRatioMode aspectRatioMode,
-                                      QIcon::Mode mode,
-                                      bool mirrored,
-                                      const QColor &color,
-                                      HbRenderingMode renderMode)
-{
-    if ( !clientConnected ) {
-        return;
-    }
-
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest requestType;
-    requestType = EUnloadIcon;
-    outputDataStream << int(requestType);
-    outputDataStream << iconPath;
-    outputDataStream << size;
-    outputDataStream << aspectRatioMode;
-    outputDataStream << mode;
-    outputDataStream << mirrored;
-    //outputDataStream << options;
-    outputDataStream << color;
-    outputDataStream << renderMode;
-
-    //@to do  block the segment upto the connect
-    // changeTheme() slot should not be called for pixmap lookup case. So disconnecting.
-    disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    localSocket->write(outputByteArray);
-    localSocket->flush();
-    localSocket->waitForReadyRead();
-
-    QByteArray inputByteArray = localSocket->readAll();
-    QDataStream inputDataStream(inputByteArray);
-    HbThemeServerRequest request;
-    int temp;
-    inputDataStream >> temp;
-    request = (HbThemeServerRequest)temp;
-
-    // Need to handle the situation when both themechange
-    // request and Reference count decrement comes at the same time
-    // Just posting the ThemeChnaged event so that it can be handled
-    // as next event and current pixmap load is not interrupted
-    if (EUnloadIcon == request) {
-
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EThemeSelection == request) {
-                QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-            }
-        }
-    }
-    else if (EThemeSelection == request){
-        // Asked for reference count decrement got theme change request.. clean theme name
-        QString themeName;
-        inputDataStream >> themeName;
-        QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EUnloadIcon == request) {
-
-            }
-        }
-    }
-
-    // connecting again to handle theme change request from server
-    connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
 
 }
 
 /**
- * HbThemeClientPrivate::unLoadMultiIcon()
- *
- * unload multiple icons
-*/
-void HbThemeClientPrivate::unLoadMultiIcon(const QStringList &iconPathList,
-                const QVector<QSizeF> &sizeList,
-                Qt::AspectRatioMode aspectRatioMode,
-                QIcon::Mode mode,
-                bool mirrored,
-                const QColor &color,
-                HbRenderingMode renderMode)
+ * HbThemeClientPrivate::iniFileChanged()
+ */
+void HbThemeClientPrivate::iniFileChanged(QString iniFile)
 {
-    // TODO: this request is currently not implemented in server side.
-
-    if ( !clientConnected ) {
-        return;
-    }
-
-	QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest requestType;
-    requestType = EUnloadMultiIcon;
-    outputDataStream << (int)requestType;
-	for(int i = 0; i < iconPathList.count(); i++) {
-        outputDataStream << iconPathList[i];
-		outputDataStream << sizeList[i];
-	}
-
-    outputDataStream << aspectRatioMode;
-    outputDataStream << mode;
-    outputDataStream << mirrored;
-    //outputDataStream << options;
-    outputDataStream << color;
-    outputDataStream << renderMode;
-
-    //@to do  block the segment upto the connect
-    // changeTheme() slot should not be called for pixmap lookup case. So disconnecting.
-    disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    localSocket->write(outputByteArray);
-    localSocket->flush();
-    localSocket->waitForReadyRead();
-
-    QByteArray inputByteArray = localSocket->readAll();
-    QDataStream inputDataStream(inputByteArray);
-    HbThemeServerRequest request;
-    int temp;
-    inputDataStream >> temp;
-    request = (HbThemeServerRequest)temp;
-
-    // Need to handle the situation when both themechange
-    // request and Reference count decrement comes at the same time
-    // Just posting the ThemeChnaged event so that it can be handled
-    // as next event and current pixmap load is not interrupted
-    if (EUnloadMultiIcon == request) {
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = static_cast<HbThemeServerRequest>(temp);
-            if (EThemeSelection == request) {
-                QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-            }
-        }
-    } else if (EThemeSelection == request){
-        // Asked for reference count decrement got theme change request.. clean theme name
-        QString themeName;
-        inputDataStream >> themeName;
-        QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EUnloadIcon == request) {
-
-            }
-        }
-    }
-    // connecting again to handle theme change request from server
-    connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-}
-
-HbSharedIconInfo HbThemeClientPrivate::getMultiPartIconInfo(
-        const QStringList &multiPartIconList,
-        const HbMultiPartSizeData &multiPartIconData,
-        const QSizeF &size,
-        Qt::AspectRatioMode aspectRatioMode,
-        QIcon::Mode mode,
-        bool mirrored,
-        HbIconLoader::IconLoaderOptions options,
-        const QColor &color,
-        HbRenderingMode renderMode)
-{
-
+    Q_UNUSED(iniFile);
 #ifdef THEME_SERVER_TRACES
     qDebug() << Q_FUNC_INFO;
 #endif
-    HbSharedIconInfo iconInfo;
-    iconInfo.type = INVALID_FORMAT;
-    if ( !clientConnected ) {
-        return iconInfo;
-    }
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));
+    QString newTheme = settings.value("currenttheme").toString();
 
-    int noOfPieces = 1;
-    if (multiPartIconData.multiPartIconId.contains("_3PV", Qt::CaseInsensitive)
-          || multiPartIconData.multiPartIconId.contains("_3PH", Qt::CaseInsensitive)) {
-        noOfPieces = 3;
-    } else if (multiPartIconData.multiPartIconId.contains("_9P", Qt::CaseInsensitive)) {
-        noOfPieces = 9;
+    if (!HbThemeUtils::isThemeValid(newTheme)) {
+        // check if the theme name is logical
+        newTheme = QDir::fromNativeSeparators(qgetenv("HB_THEMES_DIR")) +
+                   '/' + HbThemeUtils::platformHierarchy + '/' +
+                    HbThemeUtils::iconsResourceFolder + '/' + newTheme;
+        if (!HbThemeUtils::isThemeValid(newTheme)) {
+            // use default theme since new theme cannot be resolved
+            newTheme = HbThemeUtils::getThemeSetting(HbThemeUtils::DefaultThemeSetting);
+        }
+        disconnect(iniFileWatcher, SIGNAL(fileChanged(QString)), this, SLOT(iniFileChanged(QString)));
+        HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting, newTheme);
+        connect(iniFileWatcher, SIGNAL(fileChanged(QString)), this, SLOT(iniFileChanged(QString)));
+    } else {
+        HbThemeUtils::updateThemeSetting(HbThemeUtils::CurrentThemeSetting, newTheme);
     }
 
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest requestType;
-    requestType = EMultiPieceIcon;
-    outputDataStream << int(requestType);
-    outputDataStream << multiPartIconList;
-    outputDataStream << multiPartIconData.multiPartIconId;
-
-    for (int i = 0; i< noOfPieces; i++) {
-        outputDataStream << multiPartIconData.sources[i];
-    }
-    for (int i = 0; i < noOfPieces; i++) {
-        outputDataStream << multiPartIconData.targets[i];
-    }
-    for (int i = 0; i < noOfPieces; i++) {
-        outputDataStream << multiPartIconData.pixmapSizes[i];
-    }
-    outputDataStream << size;
-    outputDataStream << aspectRatioMode;
-    outputDataStream << mode;
-    outputDataStream << mirrored;
-    outputDataStream << options;
-    outputDataStream << color;
-    outputDataStream << renderMode;
-    disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    localSocket->write(outputByteArray);
-    localSocket->flush();
-    localSocket->waitForReadyRead();
-#ifdef THEME_SERVER_TRACES
-    qDebug() <<"image req : " <<multiPartIconList;
-#endif
-    QByteArray inputByteArray = localSocket->readAll();
-    QDataStream inputDataStream(inputByteArray);
-    HbThemeServerRequest request;
-    int temp;
-    inputDataStream >> temp;
-    request = (HbThemeServerRequest)temp;
-
-    // Need to handle the situation when both themechange
-    // request and pixmap info comes at the same time
-    // Just posting the ThemeChnaged event so that it can be handled
-    // as next event and current pixmap load is not interrupted
-    if (EMultiPieceIcon == request) {
-        inputDataStream >> temp; // Read the EIconLookup request identifier
-        readIconInfo(inputDataStream, iconInfo);
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EThemeSelection == request) {
-                QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-            }
-        }
-    } else if (EThemeSelection == request) {
-        // Asked for pixmap, got theme change request.. clean theme name
-        QString themeName;
-        inputDataStream >> themeName;
-        QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EMultiPieceIcon == request) {
-                inputDataStream >> temp; // Read the EIconLookup request identifier
-                readIconInfo(inputDataStream, iconInfo);
-            }
-        }
-    }
-
-    // connecting again to handle theme change request from server
-    connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    return iconInfo;
+    HbThemeUtils::loadHeapThemeIndex(ActiveTheme);
+    hbInstance->theme()->d_ptr->handleThemeChange(newTheme);
 }
 
-/**
- * getMultiIconInfo  function returns a list of HbSharedIconInfo
- * for the given list of frameitems.
- */
-HbSharedIconInfoList HbThemeClientPrivate::getMultiIconInfo(
-        const QStringList &multiPartIconList,
-        const QVector<QSizeF> &sizeList,
-        Qt::AspectRatioMode aspectRatioMode,
-        QIcon::Mode mode,
-        bool mirrored,
-        HbIconLoader::IconLoaderOptions options,
-        const QColor &color,
-        HbRenderingMode renderMode)
-{
-    HbSharedIconInfoList sharedIconInfoList;
-
-#ifdef THEME_SERVER_TRACES
-    qDebug() << Q_FUNC_INFO;
-#endif
-    if ( !clientConnected ) {
-        return sharedIconInfoList;
-    }
-
-    int noOfPieces = multiPartIconList.count();
-
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest requestType;
-    requestType = EMultiIcon;
-    outputDataStream << (int)requestType;
-    outputDataStream << multiPartIconList;
-    outputDataStream << sizeList;
-    outputDataStream << aspectRatioMode;
-    outputDataStream << mode;
-    outputDataStream << mirrored;
-    outputDataStream << options;
-    outputDataStream << color;
-    outputDataStream << renderMode;
-
-    disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    localSocket->write(outputByteArray);
-    localSocket->flush();
-    localSocket->waitForReadyRead();
-#ifdef THEME_SERVER_TRACES
-    qDebug() <<"image req : " <<multiPartIconList;
-#endif
-    QByteArray inputByteArray = localSocket->readAll();
-    QDataStream inputDataStream(inputByteArray);
-    HbThemeServerRequest request;
-    int temp;
-    inputDataStream >> temp;
-    request = (HbThemeServerRequest)temp;
-
-    // Need to handle the situation when both themechange
-    // request and pixmap info comes at the same time
-    // Just posting the ThemeChanged event so that it can be handled
-    // as next event and current pixmap load is not interrupted
-    if (EMultiIcon == request) {
-        for (int i = 0; i< noOfPieces; i++) {
-            inputDataStream >> temp; // Read the EIconLookup request identifier
-            readIconInfo(inputDataStream, sharedIconInfoList.icon[i]);
-        }
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EThemeSelection == request) {
-                QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-            }
-        }
-    } else if (EThemeSelection == request) {
-        // Asked for pixmap, got theme change request.. clean theme name
-        QString themeName;
-        inputDataStream >> themeName;
-        QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EMultiIcon == request) {
-                for (int i = 0; i < noOfPieces; i++) {
-                    inputDataStream >> temp; // Read the EIconLookup request identifier
-                    readIconInfo(inputDataStream, sharedIconInfoList.icon[i]);
-                }
-            }
-        }
-    }
-
-    // connecting again to handle theme change request from server
-    connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    return sharedIconInfoList;
-}
 
 /**
  * HbThemeClientPrivate::setTheme() 
  */
 void HbThemeClientPrivate::setTheme(const QString &theme)
 {
-    if ( !clientConnected ) {
-        return;
-    }
-    
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest requestType = EThemeSelection;
-    outputDataStream << (int)requestType;
-    outputDataStream << theme;
-    localSocket->write(outputByteArray);
-    localSocket->flush();
-}
-
-/**
- * HbThemeClientPrivate::notifyForegroundLostToServer()
- */
-void HbThemeClientPrivate::notifyForegroundLostToServer()
-{
-}
-
-/**
- * HbThemeClientPrivate::freeSharedMemory()
- */
-int HbThemeClientPrivate::freeSharedMemory()
-{
-#ifdef THEME_SERVER_TRACES
-        qDebug() << Q_FUNC_INFO;
-#endif
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest requestType = EFreeSharedMem;
-
-    outputDataStream << (int)requestType;
-
-    disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    localSocket->write(outputByteArray);
-    localSocket->flush();
-    localSocket->waitForReadyRead();
-
-    QByteArray inputByteArray = localSocket->readAll();
-    QDataStream inputDataStream(inputByteArray);
-    HbThemeServerRequest request;
-    int temp;
-    int freeSharedMem = 0;
-
-    inputDataStream >> temp;
-    request = (HbThemeServerRequest)temp;
-
-    if (EFreeSharedMem == request) {
-        inputDataStream >> freeSharedMem;
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EThemeSelection == request) {
-                QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-            }
-        }
-    } else if (EThemeSelection == request){
-        QString themeName;
-        inputDataStream >> themeName;
-        QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EFreeSharedMem == request) {
-                inputDataStream >> freeSharedMem;
-            }
-        }
-    }
-    // connecting again to handle theme change request from server
-    connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    return freeSharedMem;
-}
-
-/**
- * HbThemeClientPrivate::allocatedSharedMemory()
- */
-int HbThemeClientPrivate::allocatedSharedMemory()
-{
-#ifdef THEME_SERVER_TRACES
-        qDebug() << Q_FUNC_INFO;
-#endif
-
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest requestType = EAllocatedSharedMem;
-
-    outputDataStream << int(requestType);
-
-    disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    localSocket->write(outputByteArray);
-    localSocket->flush();
-    localSocket->waitForReadyRead();
-
-    QByteArray inputByteArray = localSocket->readAll();
-    QDataStream inputDataStream(inputByteArray);
-    HbThemeServerRequest request;
-    int temp;
-    int allocatedSharedMem = 0;
-
-    inputDataStream >> temp;
-    request = (HbThemeServerRequest)temp;
-
-    if (EAllocatedSharedMem == request) {
-        inputDataStream >> allocatedSharedMem;
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EThemeSelection == request) {
-                QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-            }
-        }
-    }else if (EThemeSelection == request){
-        QString themeName;
-        inputDataStream >> themeName;
-        QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EAllocatedSharedMem == request) {
-                inputDataStream >> allocatedSharedMem;
-            }
-        }
-    }
-    // connecting again to handle theme change request from server
-    connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    return allocatedSharedMem;
-}
-
-/**
- * HbThemeClientPrivate::allocatedHeapMemory()
- */
-int HbThemeClientPrivate::allocatedHeapMemory()
-{
-#ifdef THEME_SERVER_TRACES
-        qDebug() << Q_FUNC_INFO;
-#endif
-    // currently only supported in Symbian
-    return -1;
-}
-
-/**
- * HbThemeClientPrivate::switchRenderingMode()
- */
-bool HbThemeClientPrivate::switchRenderingMode(HbRenderingMode renderMode)
-{
-    Q_UNUSED(renderMode);
-    return true;
-}
-
-#ifdef HB_THEME_SERVER_MEMORY_REPORT
-void HbThemeClientPrivate::createMemoryReport() const
-{
-    if ( !clientConnected ) {
-        return;
-    }
-
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest requestType = ECreateMemoryReport;
-
-    outputDataStream << int(requestType);
-
-    disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    localSocket->write(outputByteArray);
-    localSocket->flush();
-}
-#endif
-
-/**
- * HbThemeClientPrivate::typefaceInfo()
- */
-HbTypefaceInfoVector *HbThemeClientPrivate::typefaceInfo()
-{
-#ifdef THEME_SERVER_TRACES
-    qDebug() << Q_FUNC_INFO;
-#endif
-    if ( !clientConnected ) {
-        return 0;
-    }
-
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest requestType = ETypefaceOffset;
-
-    outputDataStream << int(requestType);
-
-    disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-    localSocket->write(outputByteArray);
-    localSocket->flush();
-    localSocket->waitForReadyRead();
-
-    QByteArray inputByteArray = localSocket->readAll();
-    QDataStream inputDataStream(inputByteArray);
-    HbThemeServerRequest request;
-    int temp;
-
-    //-1 represents invalid offset
-    int typefaceOffset = -1;
-
-    inputDataStream >> temp;
-    request = (HbThemeServerRequest)temp;
-
-    if (ETypefaceOffset == request) {
-        inputDataStream >> typefaceOffset;
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (EThemeSelection == request) {
-                QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-            }
-        }
-    }else if (EThemeSelection == request){
-        // Asked for Typeface Offset, got theme change request..
-        // clean theme name
-        QString themeName;
-        inputDataStream >> themeName;
-        QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
-        if (!inputDataStream.atEnd()) {
-            inputDataStream >> temp;
-            request = (HbThemeServerRequest)temp;
-            if (ETypefaceOffset == request) {
-                inputDataStream >> typefaceOffset;
-            }
-        }
-    }
-
-    // connecting again to handle theme change request from server
-    connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-
-    //if a valid offset is obtained from the server return this offset
-    if (typefaceOffset >= 0) {
-        return HbMemoryUtils::getAddress<HbTypefaceInfoVector>(
-            HbMemoryManager::SharedMemory, typefaceOffset);
-    } else {
-        return 0;
+    if (HbThemeUtils::isThemeValid(theme)) {
+        HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting, theme);
     }
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/theme/hbthemeclient_p.cpp
--- a/src/hbcore/theme/hbthemeclient_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -25,6 +25,7 @@
 
 #include "hbthemeclient_p.h"
 #include "hbthemeclient_p_p.h"
+#include "hbthemeutils_p.h"
 #include "hbsharedmemorymanager_p.h"
 #include "hbmemoryutils_p.h"
 
@@ -35,9 +36,9 @@
 /**
  * Constructor
  */
-HbThemeClient::HbThemeClient():d_ptr(new HbThemeClientPrivate)
+HbThemeClient::HbThemeClient() :
+        d_ptr(new HbThemeClientPrivate)
 {
-
 }
 
 /**
@@ -45,8 +46,12 @@
  */
 bool HbThemeClient::connectToServer()
 {
+#ifdef Q_OS_SYMBIAN
     Q_D(HbThemeClient);
     return d->connectToServer();
+#else
+    return false;
+#endif
 }
 
 /**
@@ -74,6 +79,7 @@
                                                   const QColor &color,
                                                   HbRenderingMode renderMode)
 {
+#ifdef Q_OS_SYMBIAN
     Q_D(HbThemeClient);
     return d->getSharedIconInfo(iconPath,
                                 size,
@@ -83,6 +89,18 @@
                                 options,
                                 color,
                                 renderMode);
+#else
+    Q_UNUSED(iconPath);
+    Q_UNUSED(size);
+    Q_UNUSED(aspectRatioMode);
+    Q_UNUSED(mode);
+    Q_UNUSED(mirrored);
+    Q_UNUSED(options);
+    Q_UNUSED(color);
+    Q_UNUSED(renderMode);
+
+    return HbSharedIconInfo();
+#endif
 }
 
 /**
@@ -92,6 +110,7 @@
  */
 QByteArray HbThemeClient::getSharedBlob(const QString &name)
 {
+#ifdef Q_OS_SYMBIAN
     HbSharedIconInfo info = getSharedIconInfo(
         name,
         QSizeF(),
@@ -107,6 +126,10 @@
                                       info.blobData.offset),
                                   info.blobData.dataSize)
         : QByteArray();
+#else
+    Q_UNUSED(name);
+    return QByteArray();
+#endif
 }
 
 HbSharedIconInfo HbThemeClient::getMultiPartIconInfo(const QStringList &multiPartIconList,
@@ -119,9 +142,23 @@
                         const QColor &color,
                         HbRenderingMode renderMode)
 {
+#ifdef Q_OS_SYMBIAN
     Q_D(HbThemeClient);
     return d->getMultiPartIconInfo(multiPartIconList, multiPartIconData, size,
                                    aspectRatioMode, mode, mirrored, options, color, renderMode);
+#else
+    Q_UNUSED(multiPartIconList);
+    Q_UNUSED(multiPartIconData);
+    Q_UNUSED(size);
+    Q_UNUSED(aspectRatioMode);
+    Q_UNUSED(mode);
+    Q_UNUSED(mirrored);
+    Q_UNUSED(options);
+    Q_UNUSED(color);
+    Q_UNUSED(renderMode);
+
+    return HbSharedIconInfo();
+#endif
 }
 
 /**
@@ -133,9 +170,10 @@
 HbCss::StyleSheet *HbThemeClient::getSharedStyleSheet(const QString &filePath,
                                                       HbLayeredStyleLoader::LayerPriority priority)
 {
+    HbCss::StyleSheet *styleSheet = 0;
+#ifdef Q_OS_SYMBIAN
     const QString filePathFixed = QDir::fromNativeSeparators(filePath);
 
-    HbCss::StyleSheet *styleSheet = 0;
     bool requestFromServer = true;
     if (filePathFixed.startsWith(QLatin1Char(':')) && !filePathFixed.startsWith(ResourceStylePath)) {
         //filePathFixed is located in application resource, parse it on client side.
@@ -155,6 +193,10 @@
             styleSheet = d->getSharedStyleSheet(filePathFixed, priority);
         }
     }
+#else
+    Q_UNUSED(filePath);
+    Q_UNUSED(priority);
+#endif
     return styleSheet;
 }
 
@@ -168,9 +210,10 @@
                                                                      const QString &layout,
                                                                      const QString &section)
 {
+    HbWidgetLoader::LayoutDefinition *layoutDefinition = 0;
+#ifdef Q_OS_SYMBIAN
     const QString filePathFixed = QDir::fromNativeSeparators(filePath);
 
-    HbWidgetLoader::LayoutDefinition *layoutDefinition = 0;
     bool requestFromServer = true;
     if (filePathFixed.startsWith(QLatin1Char(':')) && !filePathFixed.startsWith(ResourceStylePath)) {
         //filePathFixed is located in application resource, parse it on client side.
@@ -187,6 +230,11 @@
             layoutDefinition = d->getSharedLayoutDefs(filePathFixed, layout, section);
         }
     }
+#else
+    Q_UNUSED(filePath);
+    Q_UNUSED(layout);
+    Q_UNUSED(section);
+#endif
     return layoutDefinition;
 }
 /**
@@ -194,8 +242,12 @@
  */
 HbDeviceProfileList *HbThemeClient::deviceProfiles()
 {
+#ifdef Q_OS_SYMBIAN
     Q_D(HbThemeClient);
     return d->deviceProfiles();
+#else
+    return 0;
+#endif
 }
 
 /**
@@ -203,8 +255,12 @@
  */
 HbTypefaceInfoVector *HbThemeClient::typefaceInfo()
 {
+#ifdef Q_OS_SYMBIAN
     Q_D(HbThemeClient);
     return d->typefaceInfo();
+#else
+    return 0;
+#endif
 }
 
 /**
@@ -213,8 +269,10 @@
  */
 void HbThemeClient::notifyForegroundLostToServer()
 {
+#ifdef Q_OS_SYMBIAN
     Q_D(HbThemeClient);
     d->notifyForegroundLostToServer();
+#endif
 }
 
 /**
@@ -224,6 +282,7 @@
  */
 HbEffectFxmlData *HbThemeClient::getSharedEffect(const QString &filePath)
 {
+#ifdef Q_OS_SYMBIAN
     const QString filePathFixed = QDir::fromNativeSeparators(filePath);
 
     int offset = sharedCacheItemOffset(HbSharedCache::Effect, filePathFixed);
@@ -234,6 +293,10 @@
     }
     Q_D(HbThemeClient);
     return d->getSharedEffect(filePathFixed);
+#else
+    Q_UNUSED(filePath);
+    return 0;
+#endif
 }
 
 /**
@@ -243,6 +306,7 @@
  */
 bool HbThemeClient::addSharedEffect(const QString& filePath)
 {
+#ifdef Q_OS_SYMBIAN
     const QString filePathFixed = QDir::fromNativeSeparators(filePath);
 
     int offset = sharedCacheItemOffset(HbSharedCache::Effect, filePathFixed);
@@ -252,6 +316,10 @@
     }
     Q_D(HbThemeClient);
     return d->addSharedEffect(filePathFixed);
+#else
+    Q_UNUSED(filePath);
+    return false;
+#endif
 }
 
 /**
@@ -274,6 +342,7 @@
                                const QColor &color,
                                HbRenderingMode renderMode)
 {
+#ifdef Q_OS_SYMBIAN
     Q_D(HbThemeClient);
     return d->unloadIcon(iconPath,
                          size,
@@ -282,6 +351,15 @@
                          mirrored,
                          color,
                          renderMode);
+#else
+    Q_UNUSED(iconPath);
+    Q_UNUSED(size);
+    Q_UNUSED(aspectRatioMode);
+    Q_UNUSED(mode);
+    Q_UNUSED(mirrored);
+    Q_UNUSED(color);
+    Q_UNUSED(renderMode);
+#endif
 }
 
 /**
@@ -302,6 +380,7 @@
                     const QColor &color,
                     HbRenderingMode renderMode)
 {
+#ifdef Q_OS_SYMBIAN
     Q_D(HbThemeClient);
     return d->unLoadMultiIcon(iconPathList,
                          sizeList,
@@ -310,6 +389,15 @@
                          mirrored,
                          color,
                          renderMode);
+#else
+    Q_UNUSED(iconPathList);
+    Q_UNUSED(sizeList);
+    Q_UNUSED(aspectRatioMode);
+    Q_UNUSED(mode);
+    Q_UNUSED(mirrored);
+    Q_UNUSED(color);
+    Q_UNUSED(renderMode);
+#endif
 }
 
 /**
@@ -317,8 +405,10 @@
  */
 HbThemeClient::~HbThemeClient()
 {
+#ifdef Q_OS_SYMBIAN
     Q_D(HbThemeClient);
     delete d;
+#endif
 }
 
 /**
@@ -326,8 +416,12 @@
  */
 bool HbThemeClient::clientConnected() const
 {
+#ifdef Q_OS_SYMBIAN
     Q_D(const HbThemeClient);
     return d->clientConnected;
+#else
+    return false;
+#endif
 }
 
 /**
@@ -338,6 +432,7 @@
     if ( !clientInst ) {
         clientInst = new HbThemeClient;
     }
+
     return clientInst;
 }
 
@@ -358,10 +453,15 @@
 int HbThemeClient::sharedCacheItemOffset(HbSharedCache::ItemType type, const QString &key)
 {
     int offset = -1;
+#ifdef Q_OS_SYMBIAN
     HbSharedCache *cache = HbSharedCache::instance();
     if (cache) {
         offset = cache->offset(type, key);
     }
+#else
+    Q_UNUSED(type);
+    Q_UNUSED(key);
+#endif
     return offset;
 }
 
@@ -373,10 +473,16 @@
                                          const QString &section)
 {
     int offset = -1;
+#ifdef Q_OS_SYMBIAN
     HbSharedCache *cache = HbSharedCache::instance();
     if (cache) {
         offset = cache->layoutDefinitionOffset(fileName, layout, section);
     }
+#else
+    Q_UNUSED(fileName);
+    Q_UNUSED(layout);
+    Q_UNUSED(section);
+#endif
     return offset;
 }
 
@@ -387,8 +493,10 @@
  */
 void HbThemeClient::createMemoryReport() const
 {
+#ifdef Q_OS_SYMBIAN
     Q_D(const HbThemeClient);
     d->createMemoryReport();
+#endif
 }
 #endif
 
@@ -405,9 +513,22 @@
                         const QColor &color,
                         HbRenderingMode renderMode)
 {
+#ifdef Q_OS_SYMBIAN
     Q_D(HbThemeClient);
     return d->getMultiIconInfo(multiPartIconList, sizeList,aspectRatioMode, mode,
                                mirrored, options, color, renderMode);
+#else
+    Q_UNUSED(multiPartIconList);
+    Q_UNUSED(sizeList);
+    Q_UNUSED(aspectRatioMode);
+    Q_UNUSED(mode);
+    Q_UNUSED(mirrored);
+    Q_UNUSED(options);
+    Q_UNUSED(color);
+    Q_UNUSED(renderMode);
+
+    return HbSharedIconInfoList();
+#endif
 }
 
 /**
@@ -416,8 +537,12 @@
  */
 int HbThemeClient::freeSharedMemory()
 {
+#ifdef Q_OS_SYMBIAN
     Q_D(HbThemeClient);
     return d->freeSharedMemory();
+#else
+     return 0;
+#endif
 }
 
 /**
@@ -426,8 +551,12 @@
  */
 int HbThemeClient::allocatedSharedMemory()
 {
+#ifdef Q_OS_SYMBIAN
     Q_D(HbThemeClient);
     return d->allocatedSharedMemory();
+#else
+    return 0;
+#endif
 }
 
 /**
@@ -436,8 +565,12 @@
  */
 int HbThemeClient::allocatedHeapMemory()
 {
+#ifdef Q_OS_SYMBIAN
     Q_D(HbThemeClient);
     return d->allocatedHeapMemory();
+#else
+    return 0;
+#endif
 }
 
 /**
@@ -446,8 +579,13 @@
  */
 bool HbThemeClient::switchRenderingMode(HbRenderingMode renderMode)
 {
+#ifdef Q_OS_SYMBIAN
     Q_D(HbThemeClient);    
     return d->switchRenderingMode(renderMode);    
+#else
+    Q_UNUSED(renderMode);
+    return true;
+#endif
 }
 
 void HbThemeClient::setTheme(const QString &theme)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/theme/hbthemeclient_p_p.h
--- a/src/hbcore/theme/hbthemeclient_p_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_p_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -43,12 +43,10 @@
 #include <e32base.h>
 #endif
 
+class QFileSystemWatcher;
 class CHbThemeListenerPrivate;
 class QSizeF;
 class HbEffectFxmlData;
-#ifndef Q_OS_SYMBIAN
-class QLocalSocket;
-#endif
 
 class HB_AUTOTEST_EXPORT HbThemeClientPrivate :
 #ifdef Q_OS_SYMBIAN
@@ -62,8 +60,10 @@
     Q_OBJECT
 #endif
 
-    public:
+public:
     HbThemeClientPrivate();
+
+#ifdef Q_OS_SYMBIAN
     bool connectToServer();
 
     HbSharedIconInfo getSharedIconInfo(const QString& iconPath ,
@@ -73,7 +73,7 @@
                                        bool mirrored,
                                        HbIconLoader::IconLoaderOptions options,
                                        const QColor &color,
-                                       HbRenderingMode renderMode);						
+                                       HbRenderingMode renderMode);
 
     HbWidgetLoader::LayoutDefinition *getSharedLayoutDefs(const QString &fileName,
                                                           const QString &layout,
@@ -123,39 +123,33 @@
                                         HbIconLoader::IconLoaderOptions options,
                                         const QColor &color,
                                         HbRenderingMode renderMode);
-    void setTheme(const QString &theme);
+
     void notifyForegroundLostToServer();
     bool switchRenderingMode(HbRenderingMode renderMode);
     int freeSharedMemory();
     int allocatedSharedMemory();
     int allocatedHeapMemory();
-
-    ~HbThemeClientPrivate();
-    bool event(QEvent *e);
-
 #ifdef HB_THEME_SERVER_MEMORY_REPORT
     void createMemoryReport() const;
 #endif
 
-#ifndef Q_OS_SYMBIAN
-public slots:
-    void changeTheme();
-#endif
+private:
+    void handleThemeChange(const QString &themeName);
+
+#endif // Q_OS_SYMBIAN
 
 public:
-    bool clientConnected;
+    void setTheme(const QString &theme);
+
+    ~HbThemeClientPrivate();
+
+#ifdef Q_OS_SYMBIAN
 private:
-    void handleThemeChange(const QString &themeName);
-#ifdef Q_OS_SYMBIAN
     TVersion Version() const;
     TInt StartServer();
     TInt CreateServerProcess();
-#else
-    void readIconInfo(QDataStream &dataStream, HbSharedIconInfo &iconInfo);
-#endif
 
 private:
-#ifdef Q_OS_SYMBIAN
     CHbThemeListenerPrivate *themelistener;
     friend class CHbThemeListenerPrivate;
 #ifdef HB_SGIMAGE_ICON
@@ -164,8 +158,16 @@
 #endif
 
 #else
-    QLocalSocket* localSocket;
-#endif
+
+public slots:
+    void iniFileChanged(QString iniFile);
+
+private:
+    QFileSystemWatcher *iniFileWatcher;
+#endif  // Q_OS_SYMBIAN
+
+public:
+    bool clientConnected;
 };
 
 #endif // HBTHEMECLIENT_P_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/theme/hbthemeclient_symbian_p.cpp
--- a/src/hbcore/theme/hbthemeclient_symbian_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_symbian_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -61,22 +61,21 @@
 bool HbThemeClientPrivate::connectToServer()
 {
     TInt error(KErrNone);
-    for(int tries(0); tries < 3; tries++) {
+    for(int tries = 0;;++tries) {
         error = CreateSession(KThemeServerName, Version(), KDefaultMessageSlots);
-        if(!error) {
-            // connected to existing server - OK
+        if(!error || tries >= 3) {
+            //session created ok or give up trying.
             break;
         }
         if(error != KErrNotFound && error != KErrServerTerminated) {
-            // problem other than server not here - propagate error
+            // problem other than server not here.
             break;
         }
         error = StartServer();
-        if(!error || (error == KErrAlreadyExists)) {
-            // If server launched ok , try again to connect
-            continue;
+        if (error != KErrNone && error != KErrAlreadyExists) {
+            // unexpected error occurred.
+            break;
         }
-        break; // server not launched : don't cycle round again.
     }
 #ifdef HB_SGIMAGE_ICON
     if (!error && !sgDriverInit) {
@@ -86,7 +85,7 @@
         }
     }
 #endif
-    return ( clientConnected = (KErrNone == error) );
+    return (clientConnected = (KErrNone == error));
 }
 
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/theme/hbthemecommon_p.h
--- a/src/hbcore/theme/hbthemecommon_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/theme/hbthemecommon_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -47,8 +47,7 @@
 #define HB_THEME_SHARED_PIXMAP_CHUNK "themeserver_chunk"
 #endif
 #define ORGANIZATION "Nokia"
-#define THEME_COMPONENT "Hb Themes"
-#define CURRENT_THEME_KEY "CurrentTheme"
+#define THEME_COMPONENT "Hb/Themes"
 
 // To enable/disable debug messages for theme server functionality
 // this is master trace switch that enables all theme server related traces
@@ -310,9 +309,9 @@
      EServerAllocReset,
      EFreeGPUMem,
      ETotalGPUMem,
-     EGPULRUSize,
      ERefCount,
 #endif
+     EGPULRUSize,
      EThemeContentUpdate,
      EEffectLookupFilePath,
      EEffectAdd,
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/theme/hbthemeutils_p.cpp
--- a/src/hbcore/theme/hbthemeutils_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/theme/hbthemeutils_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -23,6 +23,19 @@
 **
 ****************************************************************************/
 
+#include "hbthemeutils_p.h"
+#include "hbtheme.h"
+#include "hbiniparser_p.h"
+#include "hbthemecommon_p.h"
+#include "hbthemeclient_p.h"
+#include "hbtheme_p.h"
+
+#ifdef Q_OS_SYMBIAN
+#include "hbthemecommon_symbian_p.h"
+#include <e32std.h>
+#include <centralrepository.h>
+#endif
+
 #include <QLocale>
 #include <QSettings>
 #include <QFile>
@@ -31,19 +44,6 @@
 #include <QMap>
 #include <QVariant>
 
-#ifdef Q_OS_SYMBIAN
-#include "hbthemecommon_symbian_p.h"
-#include <e32std.h>
-#include <centralrepository.h>
-#endif
-
-#include "hbthemeutils_p.h"
-#include "hbtheme.h"
-#include "hbiniparser_p.h"
-#include "hbthemecommon_p.h"
-#include "hbthemeclient_p.h"
-
-
 // Standard folder names
 const char *HbThemeUtils::themeResourceFolder = "theme";
 const char *HbThemeUtils::platformHierarchy = "themes";
@@ -61,7 +61,25 @@
 
 // These are the used setting names corresponding to HbThemeUtils::Setting enumeration.
 static const QString settingNames[6] = {"", "basetheme", "defaulttheme",
-                                        "defaultthemedir", "currenttheme", "operatorbasepath"};
+                                        "", "currenttheme", "operatorbasepath"};
+
+static HbHeapIndexInfo *heapIndex = 0;
+
+QString themesDir()
+{
+#ifdef Q_OS_SYMBIAN
+    static QString mainThemesDir("z:/resource/hb");
+#else
+    static QString mainThemesDir = QDir::fromNativeSeparators(qgetenv("HB_THEMES_DIR"));
+    // Do not call absolutePath if the path is empty,
+    // because it would return current path in that case.
+    if (!mainThemesDir.isEmpty()) {
+        mainThemesDir = QDir(mainThemesDir).absolutePath();
+    }
+#endif
+    return mainThemesDir;
+}
+
 
 /*!
     @proto
@@ -76,40 +94,46 @@
 */
 
 
-class HbThemeUtilsPrivate
+class HbThemeSettings
 {
 public:
-    HbThemeUtilsPrivate() : settingsRetrieved(false), mHeapThemeOffset(0)
+    HbThemeSettings() : settingsRetrieved(false)
     {
     }
 
-    ~HbThemeUtilsPrivate();
+    ~HbThemeSettings();
 
     void readSettings();
-    int heapThemeOffset(const HbThemeIndexInfo &info);
+    void initSettings();
+    QString getThemeFromFile(const QString &variable, const QString &rootDir);
 
 public: // data
     bool settingsRetrieved;
     // Setting values are stored here to avoid overhead of reading from QSettings every time.
     QString currentTheme;
     QString defaultTheme;
-    QString defaultThemeRootDir;
     QString baseTheme;
     QString operatorName;
-
-private:
-    int mHeapThemeOffset;
 };
 
-HbThemeUtilsPrivate::~HbThemeUtilsPrivate()
+HbThemeSettings::~HbThemeSettings()
 {
-    if (mHeapThemeOffset > 0) {
-        GET_MEMORY_MANAGER(HbMemoryManager::HeapMemory);
-        manager->free(mHeapThemeOffset);
+    if (heapIndex) {
+        // Free allocated memory
+        if (heapIndex->baseTheme.address) {
+            delete heapIndex->baseTheme.address;
+        }
+        if (heapIndex->priorityTheme.address) {
+            delete heapIndex->priorityTheme.address;
+        }
+        if (heapIndex->activeTheme.address) {
+            delete heapIndex->activeTheme.address;
+        }
+        delete heapIndex;
     }
 }
 
-void HbThemeUtilsPrivate::readSettings()
+void HbThemeSettings::readSettings()
 {
     // The only changing setting is currentThemeSetting and its value is updated in server side in theme change event.
 
@@ -129,14 +153,6 @@
                 defaultTheme = qvalue.trimmed();
             }
             value.Zero();
-            if (KErrNone == repository->Get(HbThemeUtils::DefaultThemeRootDirSetting, value)) {
-                QString qvalue((QChar*)value.Ptr(), value.Length());
-                defaultThemeRootDir = qvalue.trimmed();
-            } else {
-                // Use the default value
-                defaultThemeRootDir = HbThemeUtils::themesDir();           
-            }
-            value.Zero();
             if (KErrNone == repository->Get(HbThemeUtils::BaseThemeSetting, value)) {
                 QString qvalue((QChar*)value.Ptr(), value.Length());
                 baseTheme = qvalue.trimmed();
@@ -149,106 +165,106 @@
             delete repository;
         }
 #else
-        QSettings settings(QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));
+        QSettings settings(QSettings::IniFormat, QSettings::UserScope, QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));
 
         currentTheme = settings.value(settingNames[HbThemeUtils::CurrentThemeSetting]).toString();
         defaultTheme = settings.value(settingNames[HbThemeUtils::DefaultThemeSetting]).toString();
-        defaultThemeRootDir =
-                settings.value(settingNames[HbThemeUtils::DefaultThemeRootDirSetting]).toString();
         baseTheme = settings.value(settingNames[HbThemeUtils::BaseThemeSetting]).toString();
         operatorName = settings.value(settingNames[HbThemeUtils::OperatorNameSetting]).toString();
 #endif
+        initSettings();
+
         settingsRetrieved = true;
     }
 }
 
-int HbThemeUtilsPrivate::heapThemeOffset(const HbThemeIndexInfo &info)
+void HbThemeSettings::initSettings()
 {
-    if (mHeapThemeOffset == 0) {
-        QString themeindexfile = info.path + "/" + info.name +".themeindex";
-        QFile indexFile(themeindexfile);
-        if (indexFile.open(QIODevice::ReadOnly)) {
-            GET_MEMORY_MANAGER(HbMemoryManager::HeapMemory);
-            qint64 byteSize = indexFile.size();
-            mHeapThemeOffset = manager->alloc(byteSize);
-            if (mHeapThemeOffset >= 0) {
-                char *address = HbMemoryUtils::getAddress<char>(HbMemoryManager::HeapMemory, mHeapThemeOffset);
-                indexFile.read(address, byteSize);
-                indexFile.close();
-            }
+    // Validate base theme
+    bool modified = false;
+    if (baseTheme.isEmpty()) {
+        modified = true;
+        baseTheme = getThemeFromFile(baseThemeVariable, themesDir());
+        if (baseTheme.isEmpty()) {
+            baseTheme = getThemeFromFile(baseThemeVariable, coreResourcesRootDir);
+        }
+    }
+    if (!HbThemeUtils::isThemeValid(baseTheme)) {
+        modified = true;
+        // check if the theme name is logical
+        baseTheme = themesDir() + '/' + HbThemeUtils::platformHierarchy + '/' +
+                    HbThemeUtils::iconsResourceFolder + '/' + baseTheme;
+        if (!HbThemeUtils::isThemeValid(baseTheme)) {
+            baseTheme = getThemeFromFile(baseThemeVariable, coreResourcesRootDir);
         }
     }
-    return mHeapThemeOffset;
+    // Save if needed
+    if (modified) {
+        HbThemeUtils::setThemeSetting(HbThemeUtils::BaseThemeSetting, baseTheme);
+        modified = false;
+    }
+
+    // Validate default theme    
+    if (defaultTheme.isEmpty()) {
+        modified = true;
+        defaultTheme = getThemeFromFile(defaultThemeVariable, themesDir());
+        if (defaultTheme.isEmpty()) {
+            defaultTheme = getThemeFromFile(defaultThemeVariable, coreResourcesRootDir);
+        }
+    }
+    if (!HbThemeUtils::isThemeValid(defaultTheme)) {
+        modified = true;
+        // check if the theme name is logical
+        defaultTheme = themesDir() + '/' + HbThemeUtils::platformHierarchy + '/' +
+                    HbThemeUtils::iconsResourceFolder + '/' + defaultTheme;
+        if (!HbThemeUtils::isThemeValid(defaultTheme)) {
+            defaultTheme = getThemeFromFile(defaultThemeVariable, coreResourcesRootDir);
+        }
+    }
+    if (modified) {
+        HbThemeUtils::setThemeSetting(HbThemeUtils::DefaultThemeSetting, defaultTheme);
+        modified = false;
+    }
+
+    // Validate current theme
+    if (!HbThemeUtils::isThemeValid(currentTheme)) {
+        currentTheme = defaultTheme;
+        HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting, currentTheme);
+    }
 }
 
-static HbThemeUtilsPrivate d;
-
-/* returns information of base theme
+/* reads the theme from theme.theme file
  */
-const HbThemeInfo &HbThemeUtils::baseTheme()
+QString HbThemeSettings::getThemeFromFile(const QString &variable, const QString &rootDir)
 {
-    static HbThemeInfo baseThemeInfo;
-   
-    if (baseThemeInfo.name.isEmpty()) {
-        // basetheme is empty, means it was not yet filled with appropriate values      
-        // Check if its value is stored in settings.
-        baseThemeInfo.name = getThemeSetting(BaseThemeSetting).trimmed();
-        if ( baseThemeInfo.name.isEmpty() ) {
-            // Settings not yet initialized
-            // Check if Base theme is defined in theme.theme
-            baseThemeInfo = getBaseThemeFromFile(HbThemeUtils::themesDir());
-            if (baseThemeInfo.name.isEmpty()) {
-                // Base theme does not exists in rom
-                // Get the base theme info from core resources
-                baseThemeInfo = getBaseThemeFromFile(coreResourcesRootDir);
-            }
-        } else {
-            // So settings are initialized, it will have other value as well
-            baseThemeInfo.rootDir = getThemeSetting(DefaultThemeRootDirSetting).trimmed();
-            // On desktop platforms try the HB_THEMES_DIR environment variable instead of
-            // blindly sticking to the previous stored setting, the theme directory may have been
-            // moved meanwhile and that usually results in a changed HB_THEMES_DIR but nobody will
-            // update the our settings stored via QSettings.
-#ifndef Q_OS_SYMBIAN            
-            QString themesDirFromEnv = HbThemeUtils::themesDir();
-            if (!themesDirFromEnv.isEmpty()) {
-                baseThemeInfo.rootDir = themesDirFromEnv;
-            }
-#endif
-        }
+    QFile themeSetting(rootDir + '/' + HbThemeUtils::platformHierarchy + '/' + themeSettingFile);
+    QString theme;
+    HbIniParser iniParser;
+
+    if (themeSetting.open(QIODevice::ReadOnly) && iniParser.read(&themeSetting)){
+        theme = rootDir + '/' + HbThemeUtils::platformHierarchy + '/' +
+                HbThemeUtils::iconsResourceFolder + '/' +
+                iniParser.value("Default", variable).trimmed();
     }
-    
-    return baseThemeInfo;
+    return theme;
 }
 
-/* returns name of default theme
- */
-HbThemeInfo HbThemeUtils::defaultTheme()
-{
-    // getting base theme makes sure that default theme was added in
-    // QSettings, if it was not already done
-    const HbThemeInfo &themeInfo = baseTheme(); 
-
-    // Assuming the path of default theme and base theme are same
-    return HbThemeInfo(getThemeSetting(DefaultThemeSetting), themeInfo.rootDir);    
-}
+Q_GLOBAL_STATIC(HbThemeSettings, themeSettings);
 
 QString HbThemeUtils::getThemeSetting(Setting setting)
 {
     // Make sure settings are read from QSettings.
-    d.readSettings();
+    themeSettings()->readSettings();
 
     switch (setting) {
         case CurrentThemeSetting:
-            return d.currentTheme;
+            return themeSettings()->currentTheme;
         case DefaultThemeSetting:
-            return d.defaultTheme;
-        case DefaultThemeRootDirSetting:
-            return d.defaultThemeRootDir;
+            return themeSettings()->defaultTheme;
         case BaseThemeSetting:
-            return d.baseTheme;
+            return themeSettings()->baseTheme;
         case OperatorNameSetting:
-            return d.operatorName;
+            return themeSettings()->operatorName;
         default:
             return QString();
     }
@@ -268,93 +284,47 @@
         delete repository;
     }
 #else
-    QSettings settings(QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));
+    QSettings settings(QSettings::IniFormat, QSettings::UserScope, QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));
     settings.setValue(settingNames[setting], QVariant(value));
     // Destructor of QSettings flushes the changed setting in the INI file.
 #endif
+    updateThemeSetting(setting, value);
 }   
 
 /**
 * Updates the setting's value in stored member variables.
 * Normally the settings are loaded from QSettings when method getThemeSetting() is called for the first time.
-* When there is a change in settings, this method can be used to sync the setting value stored in HbThemeUtilsPrivate.
+* When there is a change in settings, this method can be used to sync the setting value stored in HbThemeSettings.
 * E.g. theme change event updates the current theme setting, currently no other settings are changing their values.
 */
 void HbThemeUtils::updateThemeSetting(Setting setting, const QString &value)
 {
     switch (setting) {
         case CurrentThemeSetting:
-            d.currentTheme = value;
+            themeSettings()->currentTheme = value;
             break;
         case DefaultThemeSetting:
-            d.defaultTheme = value;
-            break;
-        case DefaultThemeRootDirSetting:
-            d.defaultThemeRootDir = value;
+            themeSettings()->defaultTheme = value;
             break;
         case BaseThemeSetting:
-            d.baseTheme = value;
+            themeSettings()->baseTheme = value;
             break;
         case OperatorNameSetting:
-            d.operatorName = value;
+            themeSettings()->operatorName = value;
             break;
         default:
             break;
     }
 }   
- 
-/* reads the theme name from theme.theme file, stores the same in theme settings,
-   returns the pair of theme name and its root directory
- */
-HbThemeInfo HbThemeUtils::getBaseThemeFromFile(const QString &rootDir)
-{
-    QFile themeSetting(rootDir + '/' + platformHierarchy + '/' + themeSettingFile);
-    HbThemeInfo themeInfo;
-    HbIniParser iniParser;
-
-    if (themeSetting.open(QIODevice::ReadOnly) && iniParser.read(&themeSetting)){
-        themeInfo.name = iniParser.value("Default", baseThemeVariable).trimmed();
-        
-        QString defaultTheme = iniParser.value("Default", defaultThemeVariable).trimmed();
-
-        // default theme name may not exist, in which case using base theme as default theme
-        if (defaultTheme.isEmpty()) {
-            defaultTheme = themeInfo.name;
-        }
-
-        // Save theme names in settings
-        saveBaseThemeSettings(themeInfo, defaultTheme, rootDir);
-    }
-    return themeInfo;
-}
-
-void HbThemeUtils::saveBaseThemeSettings(HbThemeInfo &baseThemeInfo,
-                                                const QString &defaultTheme,
-                                                const QString &rootDir)
-{
-    // If there is any base theme
-    if ((!baseThemeInfo.name.isEmpty()) && isThemeValid(HbThemeInfo(baseThemeInfo.name, rootDir))) {
-        // Save these theme names in settings
-        setThemeSetting(BaseThemeSetting, baseThemeInfo.name);
-        setThemeSetting(DefaultThemeRootDirSetting, rootDir);
-
-        // Store default theme also in settings, only if it is valid
-        if (baseThemeInfo.name == defaultTheme || isThemeValid(HbThemeInfo(defaultTheme, rootDir))) {
-            setThemeSetting(DefaultThemeSetting, defaultTheme);
-        }
-        baseThemeInfo.rootDir = rootDir;
-        d.settingsRetrieved = false;
-    }
-}
 
 /* checks whether the theme is valid
  */
-bool HbThemeUtils::isThemeValid(const HbThemeInfo &themeInfo)
+bool HbThemeUtils::isThemeValid(const QString &themePath)
 {
-    // If the theme contains index.theme in icons resources
+    // If the theme contains .themeindex and index.theme files
     // it will be assumed valid
-    return QFile::exists(themeInfo.rootDir + '/' + platformHierarchy + '/' +
-                         iconsResourceFolder + '/' + themeInfo.name + "/index.theme");
+    QString indexFile = QString(themePath).replace("/icons/", QString('/')) + ".themeindex";
+    return (QFile::exists(themePath + "/index.theme") && QFile::exists(indexFile));
 }
 
 HbThemeIndexInfo HbThemeUtils::getThemeIndexInfo(const HbThemeType &type)
@@ -362,23 +332,27 @@
     HbThemeIndexInfo info;
 
 #ifndef Q_OS_SYMBIAN
-    // If there is no themeserver connection load theme to client's heap
-    if (!HbThemeClient::global()->clientConnected()) {
-        HbThemeInfo baseinfo = baseTheme();
-        if (baseinfo.name.isEmpty() || baseinfo.name == "hbdefault") {
-            info.name = "hbdefault";
-            info.path = ":/themes";
-        } else {
-            info.name = baseinfo.name;
-            info.path = baseinfo.rootDir + "/themes";
+    if (!heapIndex) {
+        heapIndex = new HbHeapIndexInfo();
+        HbThemeUtils::loadHeapThemeIndexes();
+    }
+
+    if (heapIndex) {
+        switch(type) {
+        case BaseTheme:
+            info = heapIndex->baseTheme;
+            break;
+        case OperatorC:
+            info = heapIndex->priorityTheme;
+            break;
+        case ActiveTheme:
+            info = heapIndex->activeTheme;
+            break;
+        default:
+            break;
         }
-
-        info.address = HbMemoryUtils::getAddress<char>(HbMemoryManager::HeapMemory,
-                                                       d.heapThemeOffset(info));
-        return info;
     }
-#endif // Q_OS_SYMBIAN
-
+#else
     GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
     if (manager) { 
         HbSharedChunkHeader *chunkHeader = (HbSharedChunkHeader*)(manager->base());
@@ -428,25 +402,112 @@
             break;
         }
     }
+#endif // Q_OS_SYMBIAN
     return info;
 }
 
 bool HbThemeUtils::isLogicalName(const QString &fileName)
 {
-    return !(fileName.contains(QChar('/'), Qt::CaseSensitive) || fileName.contains(QChar('\\'), Qt::CaseSensitive));
+    return !(fileName.contains(QChar(':'), Qt::CaseSensitive) ||
+             fileName.contains(QChar('/'), Qt::CaseSensitive) ||
+             fileName.contains(QChar('\\'), Qt::CaseSensitive));
+}
+
+char *HbThemeUtils::createHeapThemeIndex(const HbThemeInfo &theme)
+{
+    char *address = 0;
+
+    QString path = QDir::toNativeSeparators(theme.rootDir);
+    QString filename;
+
+    filename.append(path);
+    filename.append('/');
+    filename.append(theme.name);
+    filename.append(".themeindex");
+
+    QFile indexFile(filename);
+    if (indexFile.open(QIODevice::ReadOnly)) {
+        GET_MEMORY_MANAGER(HbMemoryManager::HeapMemory);
+        qint64 byteSize = indexFile.size();
+        int indexOffset = manager->alloc(byteSize);
+        if (indexOffset != -1) {
+            address = HbMemoryUtils::getAddress<char>(HbMemoryManager::HeapMemory, indexOffset);
+            indexFile.read(address, byteSize);
+            indexFile.close();
+        }
+    }
+
+    return address;
 }
 
-QString HbThemeUtils::themesDir()
+void HbThemeUtils::loadHeapThemeIndex(HbThemeType type)
 {
-#ifdef Q_OS_SYMBIAN
-    static QString mainThemesDir("Z:/resource/hb");
-#else
-    static QString mainThemesDir = QDir::fromNativeSeparators(qgetenv("HB_THEMES_DIR"));
-    // Do not call absolutePath if the path is empty,
-    // because it would return current path in that case.
-    if (!mainThemesDir.isEmpty()) {
-        mainThemesDir = QDir(mainThemesDir).absolutePath();
+    if (heapIndex) {
+        switch(type) {
+        case BaseTheme: {
+            if (heapIndex->baseTheme.address) {
+                delete heapIndex->baseTheme.address;
+            }
+            QString baseThemeName = getThemeSetting(BaseThemeSetting);
+            HbThemeInfo baseInfo;
+            QDir path(baseThemeName);
+            baseInfo.name = path.dirName();
+            QString absolutePath = path.absolutePath();
+            baseInfo.rootDir = absolutePath.left(absolutePath.indexOf("/icons/"));
+
+            heapIndex->baseTheme.address = createHeapThemeIndex(baseInfo);
+            if (heapIndex->baseTheme.address) {
+                heapIndex->baseTheme.name = baseInfo.name;
+                heapIndex->baseTheme.path = baseInfo.rootDir;
+            }
+            break;
+        }
+        case OperatorC: {
+            if (heapIndex->priorityTheme.address) {
+                delete heapIndex->priorityTheme.address;
+            }
+            HbThemeInfo operatorInfo;
+            operatorInfo.name = getThemeSetting(OperatorNameSetting);
+            if (!operatorInfo.name.isEmpty()) {
+                operatorInfo.rootDir.append(themesDir() + '/' + QLatin1String(operatorHierarchy));
+                heapIndex->priorityTheme.address =  createHeapThemeIndex(operatorInfo);
+                if (heapIndex->priorityTheme.address) {
+                    heapIndex->priorityTheme.name = operatorInfo.name;
+                    heapIndex->priorityTheme.path = operatorInfo.rootDir;
+                }
+            }
+            break;
+        }
+        case ActiveTheme: {
+            if (heapIndex->activeTheme.address) {
+                delete heapIndex->activeTheme.address;
+            }
+            QString currentThemeName = getThemeSetting(CurrentThemeSetting);
+            QDir path(currentThemeName);
+            HbThemeInfo activeInfo;
+            activeInfo.name = path.dirName();
+            QString absolutePath = path.absolutePath();
+            activeInfo.rootDir = absolutePath.left(absolutePath.indexOf("/icons/"));
+
+            heapIndex->activeTheme.address = createHeapThemeIndex(activeInfo);
+            if (heapIndex->activeTheme.address) {
+                heapIndex->activeTheme.name = activeInfo.name;
+                heapIndex->activeTheme.path = activeInfo.rootDir;
+            }
+            break;
+        }
+        default:
+            break;
+        }
     }
-#endif
-    return mainThemesDir;
 }
+
+void HbThemeUtils::loadHeapThemeIndexes()
+{
+    // Process base theme index, it is used as parent index also when the current theme is something else
+    loadHeapThemeIndex(BaseTheme);
+    // Process operator theme indexes
+    loadHeapThemeIndex(OperatorC);
+    // Process current theme index
+    loadHeapThemeIndex(ActiveTheme);
+}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/theme/hbthemeutils_p.h
--- a/src/hbcore/theme/hbthemeutils_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/theme/hbthemeutils_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -64,13 +64,18 @@
     char *address;
 };
 
+struct HbHeapIndexInfo {
+    HbThemeIndexInfo baseTheme;
+    HbThemeIndexInfo priorityTheme;
+    HbThemeIndexInfo activeTheme;
+};
+
 class HB_CORE_PRIVATE_EXPORT HbThemeUtils
 {
 public:
     enum Setting {
         BaseThemeSetting = 0x1,
         DefaultThemeSetting = 0x2,
-        DefaultThemeRootDirSetting = 0x3,
         CurrentThemeSetting = 0x4,
         OperatorNameSetting = 0x5
     };
@@ -78,14 +83,14 @@
     static QString getThemeSetting(Setting setting);
     static void setThemeSetting(Setting setting, const QString &value);
     static void updateThemeSetting(Setting setting, const QString &value);
-    static const HbThemeInfo &baseTheme();
-    static HbThemeInfo defaultTheme();
-    static bool isThemeValid(const HbThemeInfo &themeInfo);
+    static bool isThemeValid(const QString &themePath);
 
     static HbThemeIndexInfo getThemeIndexInfo(const HbThemeType& type);
 
     static bool isLogicalName(const QString &fileName);
-    static QString themesDir();
+    static char *createHeapThemeIndex(const HbThemeInfo &theme);
+    static void loadHeapThemeIndexes();
+    static void loadHeapThemeIndex(HbThemeType type);
 
     static const char *themeResourceFolder;
     static const char *platformHierarchy;
@@ -93,12 +98,6 @@
     static const char *iconsResourceFolder;
     static const char *effectsResourceFolder;
     static const char *styleResourceFolder;
-
-private:
-    static HbThemeInfo getBaseThemeFromFile(const QString &rootDir);
-    static void saveBaseThemeSettings(HbThemeInfo &baseThemeInfo,
-                                      const QString &defaultTheme,
-                                      const QString &rootDir);
 };
 
 #endif //HBTHEMEUTILS_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/theme/theme.pri
--- a/src/hbcore/theme/theme.pri	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/theme/theme.pri	Tue Jul 06 14:36:53 2010 +0300
@@ -57,4 +57,4 @@
 symbian: {
 LIBS += -lws32
 LIBS += -lcone
-}
\ No newline at end of file
+}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbdeviceprofile.cpp
--- a/src/hbcore/utils/hbdeviceprofile.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbdeviceprofile.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -307,7 +307,6 @@
     if (!deviceProfilesList) {
         // This is fall back.Create/Get the HbDeviceProfileDatabase Instance at
         // the client side and read the deviceProfilesList.
-        qDebug() << "DeviceProfile offset not returned by themeserver .. working in fallback mode";
         HbDeviceProfileDatabase *deviceProfileDataBase =
             HbDeviceProfileDatabase::instance(HbMemoryManager::HeapMemory);
         deviceProfilesList = HbMemoryUtils::getAddress<HbDeviceProfileList>(HbMemoryManager::HeapMemory,
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbfontspec.cpp
--- a/src/hbcore/utils/hbfontspec.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbfontspec.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -108,11 +108,12 @@
     ~HbFontSpecPrivate();
 
     qreal textHeight() const;
-    QFont font() const;
+    QFont font();
 
 public: // data
     HbFontSpec::Role mRole;
     mutable qreal mTextHeight;
+    QString mFontName;
 };
 
 /*!
@@ -120,7 +121,8 @@
 */
 HbFontSpecPrivate::HbFontSpecPrivate() :
     mRole(HbFontSpec::Undefined),
-    mTextHeight(-1.0f)
+    mTextHeight(-1.0f),
+    mFontName("")
 {
 }
 
@@ -173,20 +175,30 @@
 /*!
 \internal
 */
-QFont HbFontSpecPrivate::font() const
+QFont HbFontSpecPrivate::font()
 {
 #ifdef HB_BOOTSTRAPPED
     return QFont();
 #else
-    if (mRole == HbFontSpec::Undefined) {
+    if (mRole == HbFontSpec::Undefined && mFontName.isEmpty()) {
         return QFont();
     }
-    QString typefaceFamily;
-    int weight;
+    QString typefaceFamily(mFontName);
+    int weight(QFont::Normal);
 
     HbTypefaceInfo *tInfo = HbInstancePrivate::d_ptr()->typefaceInfo(); // Non-owning pointer
 
+    if (mRole != HbFontSpec::Undefined) {
     tInfo->roleToTypeface(mRole, typefaceFamily, weight);
+		mFontName = typefaceFamily;
+	} else if (!tInfo->containsFamily(typefaceFamily)) {
+		QString aliasFamily;
+		if (tInfo->tryGetFamilyFromAliasName(typefaceFamily, aliasFamily, weight)) {
+			typefaceFamily = aliasFamily;
+		}
+	} else {
+		weight = tInfo->getWeight(typefaceFamily);
+	}
     QFont font(typefaceFamily);
 
     font.setWeight(weight);
@@ -217,6 +229,11 @@
 {
     d->mRole = role;
 }
+HbFontSpec::HbFontSpec(const QString fontName) 
+    : d(new HbFontSpecPrivate())
+{
+    d->mFontName = fontName;
+}
 
 /*!
     Copy constructs a new font spec using the \a other font spec.
@@ -351,4 +368,13 @@
     d->mTextHeight = textHeight;
 }
 
+void HbFontSpec::setTypefaceFamily(QString fontName)
+{
+    d->mFontName = fontName;
+}
+
+QString HbFontSpec::typefaceFamily() const
+{
+   return d->mFontName;
+}
 // End of File
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbfontspec.h
--- a/src/hbcore/utils/hbfontspec.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbfontspec.h	Tue Jul 06 14:36:53 2010 +0300
@@ -53,6 +53,7 @@
     explicit HbFontSpec(HbFontSpec::Role role);
 
     HbFontSpec(const HbFontSpec &other);
+	HbFontSpec(const QString fontName); 
     HbFontSpec &operator=(const HbFontSpec &other);
 
     ~HbFontSpec();
@@ -71,6 +72,8 @@
     bool operator==(const HbFontSpec &other) const;
     bool operator!=(const HbFontSpec &other) const;
 
+	QString typefaceFamily() const;
+	void setTypefaceFamily(QString fontName);
 private:
     HbFontSpecPrivate *d;
 };
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbforegroundwatcher.cpp
--- a/src/hbcore/utils/hbforegroundwatcher.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbforegroundwatcher.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -87,17 +87,9 @@
     : QObject(parent), mForeground(true), mLights(true), mSensorListener(0)
 {
     connect(QApplication::instance(), SIGNAL(aboutToQuit()), SLOT(handleAboutToQuit()));
-#ifdef Q_OS_SYMBIAN
-    mStaticEnv = CCoeEnv::Static();
-    if (mStaticEnv) {
-        TRAP_IGNORE(mStaticEnv->AddForegroundObserverL(*this));
-    } else {
-        qWarning("HbForegroundWatcher: CoeEnv not available");
-    }
-
-#endif
     QApplication::instance()->installEventFilter(this);
     HbSleepModeListener::instance(); // make sure the instance is created
+    mSleepModeTimer.setSingleShot(true);
     connect(&mSleepModeTimer, SIGNAL(timeout()), this, SLOT(handleSensors()));
 }
 
@@ -214,13 +206,9 @@
         mLights = true;
         handleSensors();
     } else if (event->type() == QEvent::ApplicationActivate && !mForeground) {
-#ifndef Q_OS_SYMBIAN
         HandleGainingForeground();
-#endif
     } else if (event->type() == QEvent::ApplicationDeactivate && mForeground) {
-#ifndef Q_OS_SYMBIAN
         HandleLosingForeground();
-#endif
     }
     return QObject::eventFilter(obj, event);
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbsleepmodelistener_p.cpp
--- a/src/hbcore/utils/hbsleepmodelistener_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbsleepmodelistener_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -32,7 +32,7 @@
 
 #include <hwrmlight.h>
 #include <hwrmextendedlight.h>
-#include "hbcorepskeys_p.h"
+#include "hbcorepskeys_r.h"
 
 // app uid of sleepmode application
 const TUid KSleepModeProperty = {0x101F7A01};
@@ -51,7 +51,7 @@
 }
 
 CSleepModeListenerPrivate::CSleepModeListenerPrivate()
-    : CActive(EPriorityNormal)
+    : CActive(EPriorityNormal), lastStatus(0), lastStatusValid(false)
 {
     User::LeaveIfError(sleepModeState.Attach(KSleepModeProperty, KSleepModeOn));
     CActiveScheduler::Add(this);
@@ -75,20 +75,24 @@
             TInt index = currentStatus.FindInOrder(KHWRMLightFirstTarget, FindByTarget);
             if (index >= 0 && index < KHWRMLightMaxTargets) {
                 status = static_cast<CHWRMLight::TLightStatus>(currentStatus[index].iStatus);
-                RProcess process;
-                //If prosess is something else than themeserver
-                if (process.SecureId().iId != KHbPsHardwareCoarseOrientationCategoryUid.iUid) {
-                    QList<HbMainWindow *> mainWindowList = hbInstance->allMainWindows();
-                    for (int i = 0; i < mainWindowList.count(); ++i) {
-                        if (status == CHWRMLight::ELightOff) {
-                            mainWindowList[i]->broadcastEvent(HbEvent::SleepModeEnter);
-                        } else {
-                            mainWindowList[i]->broadcastEvent(HbEvent::SleepModeExit);
+                if (!lastStatusValid || lastStatus != status) {
+                    lastStatusValid = true;
+                    lastStatus = status;
+                    RProcess process;
+                    // If process is something else than themeserver
+                    if (process.SecureId().iId != KHbPsHardwareCoarseOrientationCategoryUid.iUid) {
+                        QList<HbMainWindow *> mainWindowList = hbInstance->allMainWindows();
+                        for (int i = 0; i < mainWindowList.count(); ++i) {
+                            if (status == CHWRMLight::ELightOff) {
+                                mainWindowList[i]->broadcastEvent(HbEvent::SleepModeEnter);
+                            } else {
+                                mainWindowList[i]->broadcastEvent(HbEvent::SleepModeExit);
+                            }
                         }
+                    } else {
+                        HbEvent event(status == CHWRMLight::ELightOff ? HbEvent::SleepModeEnter : HbEvent::SleepModeExit);
+                        QCoreApplication::sendEvent(qApp, &event);
                     }
-                } else {
-                    HbEvent event(status == CHWRMLight::ELightOff ? HbEvent::SleepModeEnter : HbEvent::SleepModeExit);
-                    QCoreApplication::sendEvent(qApp, &event);
                 }
             }
         }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbsleepmodelistener_p_p.h
--- a/src/hbcore/utils/hbsleepmodelistener_p_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbsleepmodelistener_p_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -61,7 +61,10 @@
     TInt InitializeStatusArray(RLightStatusArray &aArray) const;
 
     static TInt FindByTarget(const TInt *aTarget, const THWRMStatusInfo &aItem);
+
 private:
+    TInt lastStatus;
+    bool lastStatusValid;
     RProperty sleepModeState;
 };
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbtextmeasurementutility_p.cpp
--- a/src/hbcore/utils/hbtextmeasurementutility_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbtextmeasurementutility_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -292,9 +292,9 @@
         QTimer::singleShot(after, this, SLOT(doMeasureItems()));
     } else {
         // Synchronous
-        QCoreApplication::processEvents();
-        QCoreApplication::processEvents();
-        QCoreApplication::processEvents();
+        QCoreApplication::sendPostedEvents();
+        QCoreApplication::sendPostedEvents();
+        QCoreApplication::sendPostedEvents();
         doMeasureItems();
     }
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbthetestutility_p.cpp
--- a/src/hbcore/utils/hbthetestutility_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbthetestutility_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -50,7 +50,7 @@
 const QString KDriveEPath("E:\\data\\log\\");
 const QString KDriveCPath("C:\\data\\log\\");
 const QString KTheConfigureFile("TheTestUtility.txt"); // todo: proper name for configuration file
-
+const QString KUnixPath("HbTestUtility");
 
 class HbTheTestUtilityPrivate
 {
@@ -103,7 +103,11 @@
 #elif defined (Q_OS_WIN32)
     return doCheckConfigFile(KDriveCPath);
 #else
-    return false; // only Symbian and Windows are supported
+    QString path(QDir::homePath());
+    path.append(QDir::separator());
+    path.append(KUnixPath);
+    path.append(QDir::separator());
+    return doCheckConfigFile(path);
 #endif
 }
 
@@ -273,7 +277,10 @@
 #elif defined (Q_OS_WIN)
     QString filePath("C:\\data\\log\\");
 #else
-    QString filePath(QDir::tempPath());
+    QString filePath(QDir::homePath());
+    filePath.append(QDir::separator());
+    filePath.append(KUnixPath);
+    filePath.append(QDir::separator());
 #endif
 
     filePath = QDir::toNativeSeparators(filePath);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbthetestwidget_p.cpp
--- a/src/hbcore/utils/hbthetestwidget_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbthetestwidget_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -364,6 +364,7 @@
 
 void HbTheTestWidget::showThemeServerMemoryInfo()
 {
+#ifdef Q_OS_SYMBIAN
     HbDialog *dialog = new HbDialog();
     dialog->setAttribute(Qt::WA_DeleteOnClose);
 
@@ -393,13 +394,16 @@
     dialog->setContentWidget(textItem);
 
     dialog->show();
+#endif
 }
 
 void HbTheTestWidget::createSharedMemoryReport() const
 {
+#ifdef Q_OS_SYMBIAN
 #ifdef HB_THEME_SERVER_MEMORY_REPORT
     HbThemeClient::global()->createMemoryReport();
 #endif
+#endif // Q_OS_SYMBIAN
 }
 
 void HbTheTestWidget::launchThemeChanger()
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbtypefaceinfo.cpp
--- a/src/hbcore/utils/hbtypefaceinfo.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbtypefaceinfo.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -45,8 +45,8 @@
     HbTypefaceInfoPrivate() : initialized(false) {}
     ~HbTypefaceInfoPrivate();
     void initialize();
-    bool containsRole( HbFontSpec::Role role, int &index );
-    bool containsFamily( const QString& typefaceFamily, int &index );
+    bool containsRole(HbFontSpec::Role role, int &index) const;
+    bool containsFamily(const QString &typefaceFamily, int &index) const;
 
 public: // data
     bool initialized;
@@ -65,7 +65,6 @@
     mTypefaceVector = HbThemeClient::global()->typefaceInfo();
 
     if( !mTypefaceVector ) {
-        qWarning() << "HbTypefaceInfo, no theme server connection - working in fallback mode";
         HbTypefaceInfoDatabase *heapDatabase = HbTypefaceInfoDatabase::instance( HbMemoryManager::HeapMemory );
         mTypefaceVector = HbMemoryUtils::getAddress<HbTypefaceInfoVector>(HbMemoryManager::HeapMemory,
                                                 heapDatabase->typefaceInfoVectorOffset());
@@ -103,14 +102,15 @@
     delete d;
 }
 
-bool HbTypefaceInfoPrivate::containsRole( HbFontSpec::Role role, int &index )
+bool HbTypefaceInfoPrivate::containsRole(HbFontSpec::Role role, int &index) const
 {
     if( ! initialized ) {
         qWarning( "HbTypefaceInfoPrivate in not initialized, line %d", __LINE__ );
         return false;
     }
     for( int i = 0; i < mTypefaceVector->size(); i++ ) {
-        if( mTypefaceVector->at(i).mRoleEnum == role ) {
+        if (mTypefaceVector->at(i).mRoleEnum == role && 
+			mTypefaceVector->at(i).mIsAlias == false) {
             index = i;
             return true;
         }
@@ -119,22 +119,51 @@
 }
 
 
-bool HbTypefaceInfoPrivate::containsFamily( const QString& typefaceFamily, int &index )
+bool HbTypefaceInfoPrivate::containsFamily(const QString &typefaceFamily, int &index) const
 {
     if( ! initialized ) {
         qWarning( "HbTypefaceInfoPrivate in not initialized, line %d", __LINE__ );
         return false;
     }
     for( int i = 0; i < mTypefaceVector->size(); i++ ) {
-        if( mTypefaceVector->at(i).mFamily == typefaceFamily ) {
+        if (!typefaceFamily.compare(mTypefaceVector->at(i).mFamily, Qt::CaseInsensitive)) {
             index = i;
             return true;
         }
     }
     return false;
 }
-
-
+bool HbTypefaceInfo::containsFamily(const QString &typefaceFamily) const
+{
+	int dummy;
+	return d->containsFamily(typefaceFamily, dummy);
+}
+bool HbTypefaceInfo::tryGetFamilyFromAliasName( 
+	const QString &aliasFamily, 
+	QString &typefaceFamily,
+	int &weight) const
+{
+    for (int i = 0; i < d->mTypefaceVector->size(); i++) {
+        if (d->mTypefaceVector->at(i).mIsAlias == true &&
+            !aliasFamily.compare(d->mTypefaceVector->at(i).mAliasedFamily, Qt::CaseInsensitive)) {
+            typefaceFamily = d->mTypefaceVector->at(i).mFamily ;
+			weight = d->mTypefaceVector->at(i).mIsBold ? QFont::Bold : QFont::Normal;
+			return true;
+        }
+    }
+	return false;
+}
+int HbTypefaceInfo::getWeight(const QString &typefaceFamily) const
+{
+	int index, weight;
+	if (d->containsFamily( typefaceFamily, index)) {
+		weight = d->mTypefaceVector->at(index).mIsBold ? QFont::Bold : QFont::Normal;
+	}
+	else {
+		weight = QFont::Normal;
+	}
+	return weight;
+}
 void HbTypefaceInfo::roleToTypeface(HbFontSpec::Role role, QString& typefaceFamily, int& weight) const
 {
     int index;
@@ -143,10 +172,10 @@
 	if (!validRole) {
 		role = HbFontSpec::Undefined;
 		validRole = d->containsRole( role, index );
-	}
 	if( !validRole ) {
-	    qWarning( "HbTypefaceInfo: cannot find corresponding font role, line %d", __LINE__ );
+		    qWarning( "HbTypefaceInfo: cannot find corresponding font role %d, line %d", role, __LINE__ );
 	    return;
+		}
 	}
 
 	typefaceFamily = d->mTypefaceVector->at( index ).mFamily;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbtypefaceinfo_p.h
--- a/src/hbcore/utils/hbtypefaceinfo_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbtypefaceinfo_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -42,6 +42,9 @@
 
   	void roleToTypeface(HbFontSpec::Role role, QString &typefaceFamily, int &weight) const;
 	int textHeightToSizeInPixels(const QString &typefaceFamily, int weight, qreal textHeight) const;
+	bool tryGetFamilyFromAliasName(const QString &aliasFamily, QString &typefaceFamily, int &weight) const;
+	bool containsFamily(const QString& typefaceFamily) const;
+	int getWeight(const QString& typefaceFamily) const;
 
 private:
     mutable HbTypefaceInfoPrivate *d;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbtypefaceinfodatabase_p.cpp
--- a/src/hbcore/utils/hbtypefaceinfodatabase_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbtypefaceinfodatabase_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -50,6 +50,7 @@
 #define TITLE_STRING "title"
 #define DIGITAL_STRING "digital"
 #define UNDEFINED_STRING "undefined"
+#define ALIAS_STRING "alias"
 
 #define TYPEFACE_METRICS_FILE_STEM "typeface_metrics_"
 static const int LARGEST_SIZE = 100;
@@ -91,6 +92,15 @@
     return encoded;
 }
 
+static bool isAliasRole(const QString &roleName)
+{
+	bool alias(false); // return value
+    QString name = roleName.toLower();
+    if (name == ALIAS_STRING) {
+        alias = true;
+    }
+	return alias;
+}
 /*!
 Returns path to a writable location that should be used as a base storage folder for
 dynamic metric creation.
@@ -165,19 +175,25 @@
     }
     else {
         QString role;
-        QString family;
+        QString family, aliasFamily;
         bool isBold;
-        while (parser->readMapping( role, family, isBold)) {
+        while (parser->readMapping( role, family, aliasFamily, isBold)) {
             HbTypefaceInfoItem item( mType );
             HbFontSpec::Role roleEnum;
             if (encodeRole(role, roleEnum)){
                 item.mRoleEnum = roleEnum;
                 item.mFamily = family;
                 item.mIsBold = isBold;
+				item.mIsAlias = false;
                 mTypefaceInfoVector->append( item );
             }
-            else {
-                // role might be an alias.  Not required functionality. Ignore
+            else if (isAliasRole(role)) {
+				item.mRoleEnum = HbFontSpec::Undefined;
+				item.mFamily = aliasFamily;
+				item.mAliasedFamily = family;
+				item.mIsBold = isBold;
+				item.mIsAlias = true;
+				mTypefaceInfoVector->append( item );
             }
         }
 
@@ -189,7 +205,7 @@
             if( item->mRoleEnum == HbFontSpec::Secondary ) {
                 secondaryFontspec = item;
             }
-            if( item->mRoleEnum == HbFontSpec::Undefined ) {
+            if (item->mRoleEnum == HbFontSpec::Undefined && item->mIsAlias == false) {
                 undefinedFontspec = item;
             }
         }
@@ -226,7 +242,8 @@
 
 
 
-bool HbTypefaceInfoDatabase::readTypefaceMetricsFile( HbTypefaceXmlParser *parser, HbTypefaceInfoItem *typeFaceInfoItem )
+bool HbTypefaceInfoDatabase::readTypefaceMetricsFile( HbTypefaceXmlParser *parser, 
+													 HbTypefaceInfoItem *typeFaceInfoItem )
 {
     int numPoints(0);
 
@@ -254,7 +271,8 @@
 	delete file;
 
 #ifdef HBTYPEFACEINFO_DEBUG_ENABLE
-    qDebug("HbDownsizeInfo::readTypefaceMetricsFile: typeface metric filename: %s", typefaceMetricsFileName.toAscii().constData());
+    qDebug("HbDownsizeInfo::readTypefaceMetricsFile: typeface metric filename: %s", 
+		typefaceMetricsFileName.toAscii().constData());
 #endif
     parser->setFilePath(typefaceMetricsFileName);
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbtypefaceinfodatabase_p.h
--- a/src/hbcore/utils/hbtypefaceinfodatabase_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbtypefaceinfodatabase_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -36,6 +36,8 @@
     HbFontSpec::Role mRoleEnum;
     HbString mFamily;
     bool mIsBold;
+	bool mIsAlias;
+	HbString mAliasedFamily;
 
     struct HbTypefaceMeasureInfoStruct
     {
@@ -48,8 +50,9 @@
     int mLowestExtent;
     int mHighestExtent;
 
+    // Initialize lowest extent to something big enough and highest extent to zero.
     HbTypefaceInfoItem(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
-        : mFamily(type), mDownSizeTable(type)
+        : mFamily(type), mAliasedFamily(type), mDownSizeTable(type), mLowestExtent(10000), mHighestExtent(0)
     {
     }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbtypefacexmlparser.cpp
--- a/src/hbcore/utils/hbtypefacexmlparser.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbtypefacexmlparser.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -44,6 +44,7 @@
 #define TYPEFACE_BASELINE_ATT "baseline"
 #define TYPEFACE_LANGUAGE_ATT "language"
 #define TYPEFACE_COUNTRY_ATT "country"
+#define TYPEFACE_ALIASFAMILY_ATT "aliasfamily"
 
 
 #define TYPEFACE_ATT_VAL_BOLD "bold"
@@ -285,7 +286,7 @@
     \param bold true if typeface is to be used bold by default
     \return false iff there was an error. Output parameters not defined
 */
-bool HbTypefaceXmlParser::readMapping(QString& role, QString& family, bool& bold)
+bool HbTypefaceXmlParser::readMapping(QString &role, QString &family, QString &aliasFamily, bool &bold)
 {
 	bool atEnd(false);
 	bool success(false);
@@ -302,7 +303,7 @@
 		}
 		else if (isStartElement()) {
 			if (name() == TYPEFACE_MAPPING) {
-				success = readMapItem(role, family, bold);
+				success = readMapItem(role, family, aliasFamily, bold);
 			}
 		}
 
@@ -317,7 +318,7 @@
 /*
  * Parses information inside one <typeface_mapping> field.
  */
-bool HbTypefaceXmlParser::readMapItem(QString& role, QString& family, bool& isBold)
+bool HbTypefaceXmlParser::readMapItem(QString &role, QString &family, QString &aliasFamily, bool &isBold)
 {
     Q_ASSERT(isStartElement() && name() == TYPEFACE_MAPPING);
     isBold = false;
@@ -346,6 +347,9 @@
 			if (attr.value().toString() == TYPEFACE_ATT_VAL_BOLD)
 				isBold = true;
 		}
+		else if (attrName == TYPEFACE_ALIASFAMILY_ATT) {
+			aliasFamily = attr.value().toString();
+		}
 		else {
 			qDebug("Unrecognized attribute");
 		}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbtypefacexmlparser_p.h
--- a/src/hbcore/utils/hbtypefacexmlparser_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbtypefacexmlparser_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -62,14 +62,14 @@
     void setFilePath(const QString &path);
     bool init();
     StartElement readToStartElement();
-    bool readMapping(QString &role, QString &family, bool &isBold);
+    bool readMapping(QString &role, QString &family, QString &aliasFamily, bool &isBold);
     bool readMetric(int &textHeight, int &size, int &baseline);
     const QString metricsTypefaceFamily() const;
 	bool readAndPositionTypefaceSet();
     void close();
 
 private:
-    bool readMapItem(QString &role, QString &family, bool &isBold);
+    bool readMapItem(QString &role, QString &family, QString &aliasFamily, bool &isBold);
     bool readMetricItem(int &textHeight, int &size, int &baseline);
 	bool matchLanguageAndCountry() const;
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbwidgetloader.cpp
--- a/src/hbcore/utils/hbwidgetloader.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbwidgetloader.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -56,7 +56,7 @@
 
 #define hbInstance (HbInstance::instance())
 
-// cache at the client side to store the mesh items.
+// cache at the client side to store the anchor items.
 // key used here is the filename+layoutname+sectionname.
 
 typedef QHash<QString,HbWidgetLoader::LayoutDefinition*> ClientHashForLayoutDefs;
@@ -146,14 +146,14 @@
 /*!
     Loads and processes a WidgetML file.
 
-    If the widget already has a layout assumes it's HbMeshLayout.
-    If the widget doesn't have a layout creates HbMeshLayout and sets it to widget.
+    If the widget already has a layout assumes it's HbAnchorLayout.
+    If the widget doesn't have a layout creates HbAnchorLayout and sets it to widget.
     Creates the anchor edge attachments based on WidgetML.
 
     \param fileName file to be processed.
     \param name the name of the layout to be loaded.
     \param section space separated route to section, that you want to load.
-    \param storage specifies where to store the mesh items.
+    \param storage specifies where to store the anchor items.
     \return true if file was loaded and processed successfully.
 */
 bool HbWidgetLoader::load(
@@ -268,7 +268,7 @@
     const QString &section,
     HbWidgetLoader::LayoutDefinition *&layoutDef )
 {
-    // check in the client side cache if the vector of meshitems is present.
+    // check in the client side cache if the vector of anchor items is present.
     QString key (fileName + name + section);
     if (clientLayoutDefsCache()->contains(key)){
         // present in the client cache.
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbwidgetloader_p.h
--- a/src/hbcore/utils/hbwidgetloader_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbwidgetloader_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -28,6 +28,7 @@
 
 #include <hbglobal.h>
 #include <hbnamespace.h>
+#include <hbanchor.h>
 #include <QString>
 #include "hbstring_p.h"
 #include "hbvector_p.h"
@@ -44,25 +45,39 @@
 {
 public:
 
-    struct MeshItem
+    struct AnchorItem
     {
-        HbString src;
-        HbString dst;
+        HbString srcId;
+        HbString dstId;
         Hb::Edge srcEdge;
         Hb::Edge dstEdge;
-        HbXmlLengthValue::Type spacingType;
-        float spacingVal;
-        HbString spacingText;
-        HbString spacer;
-        MeshItem(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
-            : src(type), dst(type), spacingText(type), spacer(type) {}
+        
+        HbXmlLengthValue::Type minType;
+        float minVal;
+        HbString minText;
+
+        HbXmlLengthValue::Type prefType;
+        float prefVal;
+        HbString prefText;
+
+        HbXmlLengthValue::Type maxType;
+        float maxVal;
+        HbString maxText;
+
+        int sizepolicy;
+        int direction;
+
+        HbString anchorId;
+
+        AnchorItem(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
+            : srcId(type), dstId(type), minText(type), prefText(type), maxText(type), anchorId(type) {}
     };
 
     struct LayoutDefinition {
         HbMemoryManager::MemoryType type;
-        HbVector<MeshItem> meshItems;
+        HbVector<AnchorItem> anchorItems;
         LayoutDefinition(HbMemoryManager::MemoryType memtype)
-            : type(memtype), meshItems(memtype)
+            : type(memtype), anchorItems(memtype)
         {
         }
     };
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbwidgetloaderactions_p.cpp
--- a/src/hbcore/utils/hbwidgetloaderactions_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbwidgetloaderactions_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -54,9 +54,10 @@
 /*!
     \internal
 */
-bool HbWidgetLoaderActions::createMeshLayout( const QString &widget )
+bool HbWidgetLoaderActions::createAnchorLayout( const QString &widget, bool modify )
 {
     Q_UNUSED( widget );
+    Q_UNUSED( modify );
     HbAnchorLayout *layout = static_cast<HbAnchorLayout*>(mWidget->layout());
     if (!layout) {
         layout = new HbAnchorLayout();
@@ -76,45 +77,69 @@
 /*!
     \internal
 */
-bool HbWidgetLoaderActions::addMeshLayoutEdge( const QString &src, Hb::Edge srcEdge,
-                                               const QString &dst, Hb::Edge dstEdge,
-                                               const HbXmlLengthValue &spacing, const QString &spacer )
+bool HbWidgetLoaderActions::addAnchorLayoutItem(
+    const QString &src,
+    const QString &srcId,
+    Hb::Edge srcEdge, 
+    const QString &dst,
+    const QString &dstId,
+    Hb::Edge dstEdge,
+    const HbXmlLengthValue &minLength,
+    const HbXmlLengthValue &prefLength,
+    const HbXmlLengthValue &maxLength,
+    QSizePolicy::Policy *policy, 
+    HbAnchor::Direction *dir,
+    const QString &anchorId )
 {
-    bool ok = true;
-    if ( !spacer.isEmpty() ) {
-        // spacer is added
-        // divide original mesh definition into two. src->dst becomes src->spacer->dst
-        if ( src.isEmpty() ) {
-            // if the starting item is layout
-            // "layout --(spacing)--> item"
-            // becomes
-            // "layout --(spacing)--> spacer --(0)--> item"
-            ok &= addMeshLayoutEdge( src, srcEdge, spacer, srcEdge, spacing, QString() );
-            HbXmlLengthValue val(0, HbXmlLengthValue::Pixel);
-            ok &= addMeshLayoutEdge( spacer, getAnchorOppositeEdge(srcEdge), dst, dstEdge, val, QString() );
+    // widgetml is purely id based.
+    Q_UNUSED(src); 
+    Q_UNUSED(dst);
+
+    HbAnchor* anchor = new HbAnchor( srcId, srcEdge, dstId, dstEdge );
+
+    if ( minLength.mType != HbXmlLengthValue::None ) {
+        qreal minVal(0);
+        if ( !toPixels(minLength, minVal) ) {
+            delete anchor;
+            return false;
         } else {
-            // between two items, or if end item is layout
-            // "item1 --(spacing)--> item2"
-            // becomes
-            // "item1 --(spacing)--> spacer --(0)--> item2"
-            ok &= addMeshLayoutEdge( src, srcEdge, spacer, getAnchorOppositeEdge(srcEdge), spacing, QString() );
-            HbXmlLengthValue val(0, HbXmlLengthValue::Pixel);
-            ok &= addMeshLayoutEdge( spacer, srcEdge, dst, dstEdge, val, QString() );
-        }
-        if ( ok & !mWidget->layoutPrimitive( spacer ) ) {
-            static_cast<HbWidgetPrivate*>(HbWidgetBasePrivate::d_ptr(mWidget))
-                ->createSpacerItem(spacer);
-        }
-    } else {
-        qreal spacingPx=0.0;
-        if (spacing.mType != HbXmlLengthValue::None ) {
-            ok = toPixels(spacing, spacingPx);
-        } // else default to zero.
-        if ( ok ) {
-            mLayout->setAnchor(src, srcEdge, dst, dstEdge, spacingPx);
+            anchor->setMinimumLength( minVal );
         }
     }
-    return ok;
+
+    if ( prefLength.mType != HbXmlLengthValue::None ) {
+        qreal prefVal(0);
+        if ( !toPixels(prefLength, prefVal) ) {
+            delete anchor;
+            return false;
+        } else {
+            anchor->setPreferredLength( prefVal );
+        }
+    }
+
+    if ( maxLength.mType != HbXmlLengthValue::None ) {
+        qreal maxVal(0);
+        if ( !toPixels(maxLength, maxVal) ) {
+            delete anchor;
+            return false;
+        } else {
+            anchor->setMaximumLength( maxVal );
+        }
+    }
+
+    if ( policy ) {
+        anchor->setSizePolicy( *policy );
+    }
+
+    if ( dir ) {
+        anchor->setDirection( *dir );
+    }
+
+    if ( !anchorId.isEmpty() ) {
+        anchor->setAnchorId( anchorId );
+    }
+
+    return mLayout->setAnchor( anchor );
 }
 #endif
 /*
@@ -140,32 +165,54 @@
 /*!
     \internal
 */
-bool HbWidgetLoaderMemoryActions::createMeshLayout( const QString &widget )
+bool HbWidgetLoaderMemoryActions::createAnchorLayout( const QString &widget, bool modify )
 {
     Q_UNUSED(widget);
-    mLayoutDef->meshItems.clear();
+    Q_UNUSED(modify);
+    mLayoutDef->anchorItems.clear();
     return true;
 }
 
 /*!
     \internal
 */
-bool HbWidgetLoaderMemoryActions::addMeshLayoutEdge( const QString &src, Hb::Edge srcEdge,
-                                               const QString &dst, Hb::Edge dstEdge,
-                                               const HbXmlLengthValue &spacing, const QString &spacer )
+bool HbWidgetLoaderMemoryActions::addAnchorLayoutItem(
+    const QString &src,
+    const QString &srcId,
+    Hb::Edge srcEdge, 
+    const QString &dst,
+    const QString &dstId,
+    Hb::Edge dstEdge,
+    const HbXmlLengthValue &minLength,
+    const HbXmlLengthValue &prefLength,
+    const HbXmlLengthValue &maxLength,
+    QSizePolicy::Policy *policy, 
+    HbAnchor::Direction *dir,
+    const QString &anchorId )
 {
-    HbWidgetLoader::MeshItem item(mLayoutDef->type);
-    item.src = src;
-    item.dst = dst;
+    // widgetml is purely id based.
+    Q_UNUSED(src); 
+    Q_UNUSED(dst);
+
+    HbWidgetLoader::AnchorItem item(mLayoutDef->type);
+    item.srcId = srcId;
+    item.dstId = dstId;
     item.srcEdge = srcEdge;
     item.dstEdge = dstEdge;
-    item.spacingType = spacing.mType;
-    item.spacingVal = spacing.mValue;
-    item.spacingText = spacing.mString;
-    item.spacer = spacer;
+    item.minType = minLength.mType;
+    item.minVal = minLength.mValue;
+    item.minText = minLength.mString;
+    item.prefType = prefLength.mType;
+    item.prefVal = prefLength.mValue;
+    item.prefText = prefLength.mString;
+    item.maxType = maxLength.mType;
+    item.maxVal = maxLength.mValue;
+    item.maxText = maxLength.mString;
+    item.sizepolicy = policy ? *policy : -1;
+    item.direction = dir ? *dir : -1;
+    item.anchorId = anchorId;
 
-    mLayoutDef->meshItems.append(item);
-
+    mLayoutDef->anchorItems.append(item);
     return true;
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbwidgetloaderactions_p.h
--- a/src/hbcore/utils/hbwidgetloaderactions_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbwidgetloaderactions_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -57,10 +57,20 @@
 
         void setWidget( HbWidget *widget );
 #ifndef HB_BIN_CSS
-        bool createMeshLayout( const QString &widget );
-        bool addMeshLayoutEdge( const QString &src, Hb::Edge srcEdge,
-                                const QString &dst, Hb::Edge dstEdge,
-                                const HbXmlLengthValue &spacing, const QString &spacer = QString() );
+        bool createAnchorLayout( const QString &widget, bool modify );
+        bool addAnchorLayoutItem(
+            const QString &src,
+            const QString &srcId,
+            Hb::Edge srcEdge, 
+            const QString &dst,
+            const QString &dstId,
+            Hb::Edge dstEdge,
+            const HbXmlLengthValue &minLength,
+            const HbXmlLengthValue &prefLength,
+            const HbXmlLengthValue &maxLength,
+            QSizePolicy::Policy *policy, 
+            HbAnchor::Direction *dir,
+            const QString &anchorId );
 #endif
 
     public:
@@ -76,10 +86,21 @@
     public:
         HbWidgetLoaderMemoryActions();
         virtual ~HbWidgetLoaderMemoryActions();
-        bool createMeshLayout( const QString &widget );
-        bool addMeshLayoutEdge( const QString &src, Hb::Edge srcEdge,
-                                const QString &dst, Hb::Edge dstEdge,
-                                const HbXmlLengthValue &spacing, const QString &spacer = QString() );
+        
+        bool createAnchorLayout( const QString &widget, bool modify );
+        bool addAnchorLayoutItem(
+            const QString &src,
+            const QString &srcId,
+            Hb::Edge srcEdge, 
+            const QString &dst,
+            const QString &dstId,
+            Hb::Edge dstEdge,
+            const HbXmlLengthValue &minLength,
+            const HbXmlLengthValue &prefLength,
+            const HbXmlLengthValue &maxLength,
+            QSizePolicy::Policy *policy, 
+            HbAnchor::Direction *dir,
+            const QString &anchorId );
 
     public:
         Q_DISABLE_COPY(HbWidgetLoaderMemoryActions)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbwidgetloadersyntax_p.cpp
--- a/src/hbcore/utils/hbwidgetloadersyntax_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbwidgetloadersyntax_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -49,7 +49,7 @@
 
 // Widget loader version number
 #define VERSION_MAJOR 0
-#define VERSION_MINOR 2
+#define VERSION_MINOR 3
 
 #define MIN_SUPPORTED_VERSION_MAJOR 0
 #define MIN_SUPPORTED_VERSION_MINOR 1
@@ -157,13 +157,14 @@
     const QString layout_name = attribute( ATTR_NAME );
     bool result = false;
     
-    if( layout_type == lexemValue(LAYOUT_MESH) ) {
+    if( layout_type == lexemValue(LAYOUT_ANCHOR) ||
+        layout_type == lexemValue(LAYOUT_MESH) ) {
         if( layout_name == mLayoutName ) {
-            mCurrentLayoutType = LAYOUT_MESH_TARGET;
+            mCurrentLayoutType = LAYOUT_ANCHOR;
             mLayoutFound = true;
-            result = mActions->createMeshLayout( QString() );
+            result = mActions->createAnchorLayout( QString(), false );
         } else {
-            mCurrentLayoutType = LAYOUT_MESH_ALIEN;
+            mCurrentLayoutType = LAYOUT_ALIEN;
             result = true;
         }
     } else {        
@@ -180,36 +181,18 @@
 {
     bool result = false;
     switch( mCurrentLayoutType ) {
-        case LAYOUT_MESH_ALIEN:
+        case LAYOUT_ALIEN:
         {
-            HB_DOCUMENTLOADER_PRINT( "GENERAL LAYOUT START ITEM: ALIEN MESH ITEM" );
+            HB_DOCUMENTLOADER_PRINT( "GENERAL LAYOUT START ITEM: ALIEN" );
             result = true;
             break;
         }
-        case LAYOUT_MESH_TARGET: 
+        case LAYOUT_ANCHOR: 
         {
-            HB_DOCUMENTLOADER_PRINT( "GENERAL LAYOUT START ITEM: TARGET MESH ITEM" );
-            if( mReader.name() == lexemValue(ML_MESHITEM) ) {
-                result = true;
-                
-                const QString src = attribute( ML_SRC_NAME );  
-                const QString dst = attribute( ML_DST_NAME );
-                const QString srcEdgeStr = attribute( ML_SRC_EDGE );
-                const QString dstEdgeStr = attribute( ML_DST_EDGE );
-                const QString spacing = attribute( ML_SPACING );
-                const QString spacer = attribute( ML_SPACER );
-                
-                HbXmlLengthValue spacingVal;
-                if ( !spacing.isEmpty() ) {
-                    result = toLengthValue(spacing, spacingVal);
-                }
-                Hb::Edge srcEdge, dstEdge;
-                result &= getAnchorEdge( srcEdgeStr, srcEdge );
-                result &= getAnchorEdge( dstEdgeStr, dstEdge );
-                if (result) {
-                    result = mActions->addMeshLayoutEdge( src, srcEdge, dst, dstEdge, spacingVal, spacer );
-                }
-              
+            HB_DOCUMENTLOADER_PRINT( "GENERAL LAYOUT START ITEM: TARGET ANCHOR ITEM" );
+            if( mReader.name() == lexemValue(AL_ANCHOR) ||
+                mReader.name() == lexemValue(ML_MESHITEM) ) {
+                result = readAnchorLayoutStartItem(true);
             }
             break;
         }
@@ -263,14 +246,35 @@
     bool retVal(true);
 
     // Construct layout from layout definition
-    retVal = mActions->createMeshLayout(QString());
-    for (int i = 0; retVal && i < layoutDef->meshItems.count(); i++){
-		const HbWidgetLoader::MeshItem &item = layoutDef->meshItems.at(i);
-        HbXmlLengthValue spacingVal;
-        spacingVal.mType = item.spacingType;
-        spacingVal.mValue = item.spacingVal;
-        spacingVal.mString = item.spacingText;
-        retVal = mActions->addMeshLayoutEdge( item.src, item.srcEdge, item.dst, item.dstEdge, spacingVal, item.spacer );
+    retVal = mActions->createAnchorLayout(QString(), false);
+    for (int i = 0; retVal && i < layoutDef->anchorItems.count(); i++){
+		const HbWidgetLoader::AnchorItem &item = layoutDef->anchorItems.at(i);
+        HbXmlLengthValue minLength, prefLength, maxLength;
+        minLength.mType = item.minType;
+        minLength.mValue = item.minVal;
+        minLength.mString = item.minText;
+        prefLength.mType = item.prefType;
+        prefLength.mValue = item.prefVal;
+        prefLength.mString = item.prefText;
+        maxLength.mType = item.maxType;
+        maxLength.mValue = item.maxVal;
+        maxLength.mString = item.maxText;
+        QSizePolicy::Policy sizepolicy;
+        QSizePolicy::Policy *sizepolicy_p = 0;
+        if ( item.sizepolicy != -1 ) {
+            sizepolicy = (QSizePolicy::Policy)item.sizepolicy;
+            sizepolicy_p = &sizepolicy;
+        }
+        HbAnchor::Direction direction;
+        HbAnchor::Direction *direction_p = 0;
+        if ( item.direction != -1 ) {
+            direction = (HbAnchor::Direction)item.direction;
+            direction_p = &direction;
+        }
+
+        retVal = mActions->addAnchorLayoutItem(
+            QString(), item.srcId, item.srcEdge, QString(), item.dstId, item.dstEdge,
+            minLength, prefLength, maxLength, sizepolicy_p, direction_p, item.anchorId );
     }
 
     return retVal;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbxmlloaderabstractactions_p.cpp
--- a/src/hbcore/utils/hbxmlloaderabstractactions_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderabstractactions_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -82,13 +82,6 @@
     return RETURNVALUE;
 }
 
-bool HbXmlLoaderAbstractActions::pushSpacerItem( const QString &name, const QString &widget )
-{
-    Q_UNUSED(name);
-    Q_UNUSED(widget);
-    return RETURNVALUE;
-}
-
 bool HbXmlLoaderAbstractActions::pushConnect(
     const QString &srcName,
     const QString &signalName,
@@ -180,57 +173,62 @@
     return RETURNVALUE;
 }
 
-bool HbXmlLoaderAbstractActions::createAnchorLayout( const QString &widget )
+bool HbXmlLoaderAbstractActions::createAnchorLayout( const QString &widget, bool modify )
 {
     Q_UNUSED(widget);
+    Q_UNUSED(modify);
     return RETURNVALUE;
 }
 
-bool HbXmlLoaderAbstractActions::addAnchorLayoutEdge(
+bool HbXmlLoaderAbstractActions::addAnchorLayoutItem(
     const QString &src,
+    const QString &srcId,
     Hb::Edge srcEdge, 
     const QString &dst,
+    const QString &dstId,
     Hb::Edge dstEdge,
-    const HbXmlLengthValue &spacing,
-    const QString &spacer )
+    const HbXmlLengthValue &minLength,
+    const HbXmlLengthValue &prefLength,
+    const HbXmlLengthValue &maxLength,
+    QSizePolicy::Policy *policy, 
+    HbAnchor::Direction *dir,
+    const QString &anchorId )
 {
     Q_UNUSED(src);
+    Q_UNUSED(srcId);
     Q_UNUSED(srcEdge);
     Q_UNUSED(dst);
+    Q_UNUSED(dstId);
     Q_UNUSED(dstEdge);
-    Q_UNUSED(spacing);
-    Q_UNUSED(spacer);
+    Q_UNUSED(minLength);
+    Q_UNUSED(prefLength);
+    Q_UNUSED(maxLength);
+    Q_UNUSED(policy);
+    Q_UNUSED(dir);
+    Q_UNUSED(anchorId);
+    return RETURNVALUE;
+}
+
+bool HbXmlLoaderAbstractActions::setAnchorLayoutMapping(
+    const QString &item,
+    const QString &id,
+    bool remove)
+{
+    Q_UNUSED(item);
+    Q_UNUSED(id);
+    Q_UNUSED(remove);
     return RETURNVALUE;
 }
 
 
-bool HbXmlLoaderAbstractActions::createMeshLayout( const QString &widget )
-{
-    Q_UNUSED(widget);
-    return RETURNVALUE;
-}
-
-bool HbXmlLoaderAbstractActions::addMeshLayoutEdge(
-    const QString &src,
-    Hb::Edge srcEdge, 
-    const QString &dst,
-    Hb::Edge dstEdge,
+bool HbXmlLoaderAbstractActions::createGridLayout(
+    const QString &widget,
     const HbXmlLengthValue &spacing,
-    const QString &spacer )
-{
-    Q_UNUSED(src);
-    Q_UNUSED(srcEdge);
-    Q_UNUSED(dst);
-    Q_UNUSED(dstEdge);
-    Q_UNUSED(spacing);
-    Q_UNUSED(spacer);
-    return RETURNVALUE;
-}
-
-bool HbXmlLoaderAbstractActions::createGridLayout( const QString &widget, const HbXmlLengthValue &spacing )
+    bool modify )
 {
     Q_UNUSED(widget);
     Q_UNUSED(spacing);
+    Q_UNUSED(modify);
     return RETURNVALUE;
 }
 
@@ -309,11 +307,13 @@
 bool HbXmlLoaderAbstractActions::createLinearLayout(
     const QString &widget,
     Qt::Orientation *orientation, 
-    const HbXmlLengthValue &spacing )
+    const HbXmlLengthValue &spacing,
+    bool modify )
 {
     Q_UNUSED(widget);
     Q_UNUSED(orientation);
     Q_UNUSED(spacing);
+    Q_UNUSED(modify);
     return RETURNVALUE;
 }
 
@@ -353,9 +353,10 @@
     Q_UNUSED(bottom);
     return RETURNVALUE;
 }
-bool HbXmlLoaderAbstractActions::createStackedLayout( const QString &widget )
+bool HbXmlLoaderAbstractActions::createStackedLayout( const QString &widget, bool modify )
 {
     Q_UNUSED(widget);
+    Q_UNUSED(modify);
     return RETURNVALUE;
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbxmlloaderabstractactions_p.h
--- a/src/hbcore/utils/hbxmlloaderabstractactions_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderabstractactions_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -31,6 +31,7 @@
 
 #include <hbglobal.h>
 #include <hbnamespace.h>
+#include <hbanchor.h>
 
 #include <QGraphicsWidget>
 #include <QGraphicsLayout>
@@ -67,7 +68,6 @@
             const QString &name,
             const QString &role,
             const QString &plugin );
-        virtual bool pushSpacerItem( const QString &name, const QString &widget );
         virtual bool pushConnect(
             const QString &srcName,
             const QString &signalName,
@@ -99,25 +99,26 @@
             bool fixed);
         virtual bool setToolTip( const HbXmlVariable &tooltip );
 
-        virtual bool createAnchorLayout( const QString &widget );
-        virtual bool addAnchorLayoutEdge(
+        virtual bool createAnchorLayout( const QString &widget, bool modify );
+        virtual bool addAnchorLayoutItem(
             const QString &src,
+            const QString &srcId,
             Hb::Edge srcEdge, 
             const QString &dst,
+            const QString &dstId,
             Hb::Edge dstEdge,
+            const HbXmlLengthValue &minLength,
+            const HbXmlLengthValue &prefLength,
+            const HbXmlLengthValue &maxLength,
+            QSizePolicy::Policy *policy, 
+            HbAnchor::Direction *dir,
+            const QString &anchorId );
+        virtual bool setAnchorLayoutMapping( const QString &item, const QString &id, bool remove);
+
+        virtual bool createGridLayout(
+            const QString &widget,
             const HbXmlLengthValue &spacing,
-            const QString &spacer = QString() );
-        
-        virtual bool createMeshLayout( const QString &widget );
-        virtual bool addMeshLayoutEdge(
-            const QString &src,
-            Hb::Edge srcEdge, 
-            const QString &dst,
-            Hb::Edge dstEdge,
-            const HbXmlLengthValue &spacing,
-            const QString &spacer = QString() );
-
-        virtual bool createGridLayout( const QString &widget, const HbXmlLengthValue &spacing );
+            bool modify );
         virtual bool addGridLayoutCell(
             const QString &src,
             int row, 
@@ -151,7 +152,8 @@
         virtual bool createLinearLayout(
             const QString &widget,
             Qt::Orientation *orientation, 
-            const HbXmlLengthValue &spacing );
+            const HbXmlLengthValue &spacing,
+            bool modify );
         virtual bool addLinearLayoutItem(
             const QString &itemname,
             int *index,
@@ -168,7 +170,7 @@
             const HbXmlLengthValue &right,
             const HbXmlLengthValue &bottom );
 
-        virtual bool createStackedLayout( const QString &widget );
+        virtual bool createStackedLayout( const QString &widget, bool modify );
         virtual bool addStackedLayoutItem( const QString &itemname, int *index );
                                 
         virtual bool createNullLayout( const QString &widget );
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbxmlloaderabstractsyntax_p.cpp
--- a/src/hbcore/utils/hbxmlloaderabstractsyntax_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderabstractsyntax_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -72,6 +72,7 @@
 
     "textpaneheight",   // ...Deprecated... ATTR_TEXTPANEHEIGHT
     "locid",            // ATTR_LOCID
+    "action",           // ATTR_ACTION
 
     "hbdocument",       // TYPE_DOCUMENT
     "hbwidget",         // TYPE_HBWIDGET
@@ -104,20 +105,16 @@
     "fontspec",         // TYPE_FONTSPEC
 
     "anchor",           // LAYOUT_ANCHOR
-    "mesh",             // LAYOUT_MESH
-    "",                 // LAYOUT_MESH_TARGET
-    "",                 // LAYOUT_MESH_ALIEN
+    "mesh",             // ...deprecated... LAYOUT_MESH
     "grid",             // LAYOUT_GRID
     "linear",           // LAYOUT_LINEAR
     "stacked",          // LAYOUT_STACK
     "null",             // LAYOUT_NULL
+    "",                 // LAYOUT_ALIEN
 
     "stringlist",       // CONTAINER_STRINGLIST
     "null",             // CONTAINER_NULL
 
-    "TRUE",             // VALUE_BOOL_TRUE
-    "FALSE",            // VALUE_BOOL_FALSE
-
     "un",               // UNIT_UNIT
     "px",               // UNIT_PIXEL
     "mm",               // UNIT_MILLIMETER
@@ -135,16 +132,20 @@
     "dst",              // AL_DST_NAME
     "dstId",            // AL_DST_ID
     "dstEdge",          // AL_DST_EDGE
+    "minLength",        // AL_MIN_LENGTH
+    "prefLength",       // AL_PREF_LENGTH
+    "maxLength",        // AL_MAX_LENGTH
+    "sizepolicy",       // AL_SIZEPOLICY
+    "direction",        // AL_DIRECTION
+    "anchorId",         // AL_ANCHOR_ID
     "spacing",          // AL_SPACING
     "spacer",           // AL_SPACER
 
-    "meshitem",         // ML_MESHITEM
-    "src",              // ML_SRC_NAME
-    "srcEdge",          // ML_SRC_EDGE
-    "dst",              // ML_DST_NAME
-    "dstEdge",          // ML_DST_EDGE
-    "spacing",          // ML_SPACING
-    "spacer",           // ML_SPACER
+    "anchormapping",    // AL_MAPPING
+    "item",             // AL_MAPPING_ITEM
+    "id",               // AL_MAPPING_ID
+
+    "meshitem",         // ...deprecated... ML_MESHITEM
 
     "griditem",         // GL_GRIDCELL
     "itemname",         // GL_ITEMNAME
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbxmlloaderabstractsyntax_p.h
--- a/src/hbcore/utils/hbxmlloaderabstractsyntax_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderabstractsyntax_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -61,7 +61,6 @@
         ActionPushDocument,
         ActionPushObject,
         ActionPushWidget,
-        ActionPushSpacerItem,
         ActionPushConnect,
         ActionPushProperty,
         ActionPushRef,
@@ -72,9 +71,8 @@
         ActionSetSizeHint,
         ActionSetToolTip,
         ActionCreateAnchorLayout,
-        ActionAddAnchorLayoutEdge,
-        ActionCreateMeshLayout,
-        ActionAddMeshLayoutEdge,
+        ActionAddAnchorLayoutItem,
+        ActionSetAnchorLayoutMapping,
         ActionCreateGridLayout,
         ActionAddGridLayoutCell,
         ActionSetGridLayoutRowProperties,
@@ -200,11 +198,14 @@
         // Deprecated.
         ATTR_TEXTPANEHEIGHT,
         ATTR_LOCID,
+        ATTR_ACTION,
         
         TYPE_DOCUMENT,
         TYPE_HBWIDGET,
         TYPE_OBJECT,
         TYPE_WIDGET,
+
+        // Deprecated.
         TYPE_SPACERITEM,
         TYPE_CONNECT,
         TYPE_LAYOUT,
@@ -233,19 +234,15 @@
         
         LAYOUT_ANCHOR,
         LAYOUT_MESH,
-        LAYOUT_MESH_TARGET,
-        LAYOUT_MESH_ALIEN,
         LAYOUT_GRID,
         LAYOUT_LINEAR,
         LAYOUT_STACK,
         LAYOUT_NULL,
+        LAYOUT_ALIEN,
         
         CONTAINER_STRINGLIST,
         CONTAINER_NULL,
         
-        VALUE_BOOL_TRUE,
-        VALUE_BOOL_FALSE,
-
         UNIT_UNIT,
         UNIT_PIXEL,
         UNIT_MILLIMETER,
@@ -263,16 +260,20 @@
         AL_DST_NAME,
         AL_DST_ID,
         AL_DST_EDGE,
+        AL_MIN_LENGTH,
+        AL_PREF_LENGTH,
+        AL_MAX_LENGTH,
+        AL_SIZEPOLICY,
+        AL_DIRECTION,
+        AL_ANCHOR_ID,
         AL_SPACING,
         AL_SPACER,
+
+        AL_MAPPING,
+        AL_MAPPING_ITEM,
+        AL_MAPPING_ID,
         
         ML_MESHITEM, 
-        ML_SRC_NAME, 
-        ML_SRC_EDGE,
-        ML_DST_NAME,
-        ML_DST_EDGE,
-        ML_SPACING,
-        ML_SPACER,
         
         GL_GRIDCELL, 
         GL_ITEMNAME, 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbxmlloaderbaseactions_p.cpp
--- a/src/hbcore/utils/hbxmlloaderbaseactions_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderbaseactions_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -217,15 +217,6 @@
     return current;
 }
 
-QGraphicsLayoutItem *HbXmlLoaderBaseActions::findSpacerItemFromStackTop() const
-{
-    QGraphicsLayoutItem *current = 0;
-    if ( mStack.at(mStack.size()-1).type == HbXml::SPACERITEM ) {
-        current = static_cast<QGraphicsLayoutItem*>(mStack.at(mStack.size()-1).data);
-    }
-    return current;
-}
-
 QObject *HbXmlLoaderBaseActions::findFromStack(bool *isWidgetElement) const
 {
     QObject *current = 0;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbxmlloaderbaseactions_p.h
--- a/src/hbcore/utils/hbxmlloaderbaseactions_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderbaseactions_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -89,7 +89,6 @@
 
         ObjectMapItem lookUp(const QString& type, const QString &name, const QString &plugin = QString());
         QObject *findFromStack(bool *isWidgetElement = 0) const;
-        QGraphicsLayoutItem *findSpacerItemFromStackTop() const;
         
         void addToObjectMap(QList<QObject *> objects);
         void addToObjectMap(QList<QGraphicsItem *> objects);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbxmlloaderbasesyntax_p.cpp
--- a/src/hbcore/utils/hbxmlloaderbasesyntax_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderbasesyntax_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -25,6 +25,7 @@
 
 #include "hbxmlloaderbasesyntax_p.h"
 
+#include <QMetaEnum>
 #include <QDebug>
 
 /*
@@ -482,6 +483,127 @@
     return false;
 }
 
+bool HbXmlLoaderBaseSyntax::readAnchorLayoutStartItem(bool idBased)
+{
+    bool result = true;
+
+    HbXmlLengthValue minVal, prefVal, maxVal;
+    QSizePolicy::Policy sizepolicyVal;
+    QSizePolicy::Policy *sizepolicyValP = 0;
+    HbAnchor::Direction directionVal;
+    HbAnchor::Direction *directionValP = 0;
+    QString anchorId;
+
+    const QString src = attribute( AL_SRC_NAME );
+    QString srcId = attribute( AL_SRC_ID );
+    if ( src.isNull() && srcId.isNull() ) {
+        HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: NO SRC NOR SRCID SPECIFIED" ) );
+        result = false;
+    } else if ( !src.isNull() && !srcId.isNull() ) {
+        HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: BOTH SRC AND SRCID SPECIFIED" ) );
+        result = false;
+    } else if ( idBased && srcId.isNull() ) {
+        srcId = src;
+    }
+
+    const QString dst = attribute( AL_DST_NAME );
+    QString dstId = attribute( AL_DST_ID );
+    if ( dst.isNull() && dstId.isNull() ) {
+        HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: NO DST NOR DSTID SPECIFIED" ) );
+        result = false;
+    } else if ( !dst.isNull() && !dstId.isNull() ) {
+        HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: BOTH DST AND DSTID SPECIFIED" ) );
+        result = false;
+    } else if ( idBased && dstId.isNull() ) {
+        dstId = dst;
+    }
+
+    const QString srcEdgeStr = attribute( AL_SRC_EDGE );
+    const QString dstEdgeStr = attribute( AL_DST_EDGE );
+
+    Hb::Edge srcEdge, dstEdge;
+    result &= toAnchorEdge( srcEdgeStr, srcEdge );
+    result &= toAnchorEdge( dstEdgeStr, dstEdge );
+
+    // Check the convenience notation first. 
+    QString spacing = attribute( AL_SPACING );
+    if ( result && !spacing.isEmpty() ) {
+        directionVal = HbAnchor::Positive;
+        directionValP = &directionVal;
+        if (spacing.at(0) == '-') {
+            directionVal = HbAnchor::Negative;
+            spacing = spacing.mid(1);
+        }
+        sizepolicyVal = QSizePolicy::Fixed;
+        sizepolicyValP = &sizepolicyVal;
+        result = toLengthValue( spacing, prefVal );
+    }
+
+    const QString direction = attribute( AL_DIRECTION );
+    if ( result && !direction.isNull() ) {
+        // intentionally overriding possible previously set value
+        directionValP = &directionVal;
+        result = toAnchorDir( direction, directionVal );
+    }
+
+    const QString spacer = attribute( AL_SPACER );
+    if ( result && !spacer.isEmpty() ) {
+        // intentionally overriding possible previously set value
+        sizepolicyVal = QSizePolicy::Preferred;
+        sizepolicyValP = &sizepolicyVal;
+        anchorId = spacer;
+        if (prefVal.mType != HbXmlLengthValue::None) {
+            // previously set by "spacing"
+            minVal = prefVal;
+        } else {
+            prefVal.mType = HbXmlLengthValue::PlainNumber;
+            prefVal.mValue = 0;
+        }
+        if ( !directionValP ) {
+            // direction not yet set, use heuristics
+            bool srcIsLayout = src.isEmpty() && srcId.isEmpty();
+            bool negativeEdge = srcEdge == Hb::LeftEdge || srcEdge == Hb::TopEdge;
+            directionVal = ( (!srcIsLayout && negativeEdge) || (srcIsLayout && !negativeEdge) )
+                ? HbAnchor::Negative
+                : HbAnchor::Positive;
+            directionValP = &directionVal;
+            HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: ANCHOR DIRECTION SET BY HEURISTICS" ) );
+        }
+    }
+
+    const QString minLength = attribute( AL_MIN_LENGTH );
+    const QString prefLength = attribute( AL_PREF_LENGTH );
+    const QString maxLength = attribute( AL_MAX_LENGTH );
+    const QString sizepolicy = attribute( AL_SIZEPOLICY );
+    
+    const QString anchorIdTemp = attribute( AL_ANCHOR_ID );
+    if ( !anchorIdTemp.isNull() ) {
+        // intentionally overriding possible previously set value
+        anchorId = anchorIdTemp;
+    }
+
+    if ( result && !minLength.isNull() ) {
+        // intentionally overriding possible previously set value
+        result = toLengthValue( minLength, minVal );
+    }
+    if ( result && !prefLength.isNull() ) {
+        // intentionally overriding possible previously set value
+        result = toLengthValue( prefLength, prefVal );
+    }
+    if ( result && !maxLength.isNull() ) {
+        result = toLengthValue( maxLength, maxVal );
+    }
+    if ( result && !sizepolicy.isNull() ) {
+        // intentionally overriding possible previously set value
+        sizepolicyValP = &sizepolicyVal;
+        result = toSizePolicy( sizepolicy, sizepolicyVal );
+    }
+    if ( result ) {
+        result = mActions->addAnchorLayoutItem( src, srcId, srcEdge, dst, dstId, dstEdge, minVal, prefVal, maxVal, sizepolicyValP, directionValP, anchorId );
+    }
+    return result;
+}
+
 bool HbXmlLoaderBaseSyntax::readLayoutEndItem()
 {
     HB_DOCUMENTLOADER_PRINT( "GENERAL LAYOUT END ITEM" );
@@ -673,23 +795,72 @@
     return mReader.attributes().value( lexemValue(lexem) ).toString();
 }
 
-bool HbXmlLoaderBaseSyntax::getAnchorEdge( const QString &edgeString, Hb::Edge &edge ) const
+bool HbXmlLoaderBaseSyntax::toBool( const QString &boolString, bool &value ) const
 {
     bool retVal(true);
-    if( edgeString=="TOP" ) {
+    if (!boolString.compare("TRUE", Qt::CaseInsensitive)) {
+        value = true;
+    } else if (!boolString.compare("FALSE", Qt::CaseInsensitive)) {
+        value = false;
+    } else {
+        retVal = false;
+    }
+    return retVal;
+}
+
+bool HbXmlLoaderBaseSyntax::toAnchorEdge( const QString &edgeString, Hb::Edge &edge ) const
+{
+    bool retVal(true);
+    if( !edgeString.compare("TOP", Qt::CaseInsensitive) ) {
         edge = Hb::TopEdge;
-    } else if( edgeString=="BOTTOM" ) {
+    } else if( !edgeString.compare("BOTTOM", Qt::CaseInsensitive) ) {
         edge = Hb::BottomEdge;
-    } else if( edgeString=="LEFT" ) {
+    } else if( !edgeString.compare("LEFT", Qt::CaseInsensitive) ) {
         edge = Hb::LeftEdge;
-    } else if( edgeString=="RIGHT" ) {
+    } else if( !edgeString.compare("RIGHT", Qt::CaseInsensitive) ) {
         edge = Hb::RightEdge;
-    } else if( edgeString=="CENTERH" ) {
+    } else if( !edgeString.compare("CENTERH", Qt::CaseInsensitive) ) {
         edge = Hb::CenterHEdge;
-    } else if( edgeString=="CENTERV" ) {
+    } else if( !edgeString.compare("CENTERV", Qt::CaseInsensitive) ) {
         edge = Hb::CenterVEdge;
     } else {
         retVal = false;
     }
     return retVal;
 }
+
+bool HbXmlLoaderBaseSyntax::toAnchorDir( const QString &dirString, HbAnchor::Direction &dir ) const
+{
+    bool retVal(true);
+    if( !dirString.compare("NEGATIVE", Qt::CaseInsensitive) ) {
+        dir = HbAnchor::Negative;
+    } else if( !dirString.compare("POSITIVE", Qt::CaseInsensitive) ) {
+        dir = HbAnchor::Positive;
+    } else {
+        retVal = false;
+    }
+    return retVal;
+}
+
+bool HbXmlLoaderBaseSyntax::toSizePolicy( const QString& policyS, QSizePolicy::Policy &policy ) const
+{
+    if ( policyS.isEmpty() ) {
+        return false;
+    }
+
+    const QMetaObject *meta = &QSizePolicy::staticMetaObject;
+    const int enumIndex = meta->indexOfEnumerator("Policy");
+    Q_ASSERT( enumIndex != -1 );
+    QMetaEnum metaEnum = meta->enumerator(enumIndex);
+    const QByteArray byteArray = policyS.toUtf8();
+    const int policyI = metaEnum.keyToValue(byteArray.data());
+
+    if ( policyI == -1 ) {
+        return false;
+    }
+
+    policy = (QSizePolicy::Policy)policyI;
+
+    return true;
+}
+
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbxmlloaderbasesyntax_p.h
--- a/src/hbcore/utils/hbxmlloaderbasesyntax_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderbasesyntax_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -88,12 +88,16 @@
     virtual bool readGeneralStartItem();
     virtual bool readGeneralEndItem();
     virtual bool readLayoutStartItem();
+    virtual bool readAnchorLayoutStartItem(bool idBased);
     virtual bool readLayoutEndItem();
     virtual bool readContainerStartItem();
     virtual bool readContainerEndItem();
 
 protected :
-    bool getAnchorEdge( const QString &edgeString, Hb::Edge &edge ) const;
+    bool toBool( const QString &boolString, bool &value ) const;
+    bool toAnchorEdge( const QString &edgeString, Hb::Edge &edge ) const;
+    bool toAnchorDir( const QString &dirString, HbAnchor::Direction &dir ) const;
+    bool toSizePolicy( const QString& policyS, QSizePolicy::Policy &policy ) const;
     bool loadDevice(QIODevice *device, const QString &section);
 
 protected:
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbxmlloaderbinaryactions_p.cpp
--- a/src/hbcore/utils/hbxmlloaderbinaryactions_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderbinaryactions_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -29,8 +29,6 @@
 
 #include <QCoreApplication>
 
-#include <QDebug>
-
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 1
 
@@ -55,7 +53,6 @@
 
 void HbXmlLoaderBinaryActions::cleanUp()
 {
-    qDebug() << "BinaryActions, cleanUp";
     mOut << (quint8)HbXml::ActionCleanUp;
 }
 
@@ -71,7 +68,6 @@
 
 bool HbXmlLoaderBinaryActions::pushDocument( const QString& context)
 {
-    qDebug() << "BinaryActions, pushDocument, in";
     if( mOut.device()->pos() != 0 ) {
         mOut << (quint8)HbXml::ActionPushDocument << context;
         return true;
@@ -79,7 +75,6 @@
     mOut.device()->write(HbXmlLoaderBinarySyntax::signature(), strlen(HbXmlLoaderBinarySyntax::signature()));
     mOut << (qint8)VERSION_MAJOR << (qint8)VERSION_MINOR;
     mOut << (quint8)HbXml::ActionPushDocument << context;
-    qDebug() << "BinaryActions, pushDocument, out";
     return true;
 }
 
@@ -99,12 +94,6 @@
     return true;
 }
 
-bool HbXmlLoaderBinaryActions::pushSpacerItem( const QString &name, const QString &widget )
-{
-    mOut << (quint8)HbXml::ActionPushSpacerItem << name << widget;
-    return true;
-}
-
 bool HbXmlLoaderBinaryActions::pushConnect(
     const QString &srcName,
     const QString &signalName,
@@ -203,46 +192,61 @@
     return true;
 }
 
-bool HbXmlLoaderBinaryActions::createAnchorLayout( const QString &widget )
+bool HbXmlLoaderBinaryActions::createAnchorLayout( const QString &widget, bool modify )
 {
-    mOut << (quint8)HbXml::ActionCreateAnchorLayout << widget;
+    mOut << (quint8)HbXml::ActionCreateAnchorLayout << widget << modify;
     return true;
 }
 
-bool HbXmlLoaderBinaryActions::addAnchorLayoutEdge(
+bool HbXmlLoaderBinaryActions::addAnchorLayoutItem(
     const QString &src,
-    Hb::Edge srcEdge,
+    const QString &srcId,
+    Hb::Edge srcEdge, 
     const QString &dst,
+    const QString &dstId,
     Hb::Edge dstEdge,
-    const HbXmlLengthValue &spacing,
-    const QString &spacer )
+    const HbXmlLengthValue &minLength,
+    const HbXmlLengthValue &prefLength,
+    const HbXmlLengthValue &maxLength,
+    QSizePolicy::Policy *policy, 
+    HbAnchor::Direction *dir,
+    const QString &anchorId )
 {
-    mOut << (quint8)HbXml::ActionAddAnchorLayoutEdge << src << (quint8)srcEdge << dst << (quint8)dstEdge << spacing << spacer;
+    mOut << (quint8)HbXml::ActionAddAnchorLayoutItem;
+    mOut << src << srcId << (quint8)srcEdge;
+    mOut << dst << dstId << (quint8)dstEdge;
+    mOut << minLength << prefLength << maxLength;
+    if (policy) {
+        mOut << true << (quint8)*policy;
+    } else {
+        mOut << false;
+    }
+    if (dir) {
+        mOut << true << (quint8)*dir;
+    } else {
+        mOut << false;
+    }
+    mOut << anchorId;
+    return true;
+}
+
+bool HbXmlLoaderBinaryActions::setAnchorLayoutMapping(
+    const QString &item,
+    const QString &id,
+    bool remove)
+{
+    mOut << (quint8)HbXml::ActionSetAnchorLayoutMapping;
+    mOut << item << id << remove;
     return true;
 }
 
 
-bool HbXmlLoaderBinaryActions::createMeshLayout( const QString &widget )
+bool HbXmlLoaderBinaryActions::createGridLayout(
+    const QString &widget,
+    const HbXmlLengthValue &spacing,
+    bool modify )
 {
-    mOut << (quint8)HbXml::ActionCreateMeshLayout << widget;
-    return true;
-}
-
-bool HbXmlLoaderBinaryActions::addMeshLayoutEdge(
-    const QString &src,
-    Hb::Edge srcEdge,
-    const QString &dst,
-    Hb::Edge dstEdge,
-    const HbXmlLengthValue &spacing,
-    const QString &spacer )
-{
-    mOut << (quint8)HbXml::ActionAddMeshLayoutEdge << src << (quint8)srcEdge << dst << (quint8)dstEdge << spacing << spacer;
-    return true;
-}
-
-bool HbXmlLoaderBinaryActions::createGridLayout( const QString &widget, const HbXmlLengthValue &spacing )
-{
-    mOut << (quint8)HbXml::ActionCreateGridLayout << widget << spacing;
+    mOut << (quint8)HbXml::ActionCreateGridLayout << widget << spacing << modify;
     return true;
 }
 
@@ -337,7 +341,8 @@
 bool HbXmlLoaderBinaryActions::createLinearLayout(
     const QString &widget,
     Qt::Orientation *orientation,
-    const HbXmlLengthValue &spacing )
+    const HbXmlLengthValue &spacing,
+    bool modify )
 {
     mOut << (quint8)HbXml::ActionCreateLinearLayout << widget;
     if ( orientation ) {
@@ -345,7 +350,7 @@
     } else {
         mOut << false;
     }
-    mOut << spacing;
+    mOut << spacing << modify;
     return true;
 }
 
@@ -403,9 +408,9 @@
     mOut << (quint8)HbXml::ActionSetLayoutContentsMargins << left << top << right << bottom;
     return true;
 }
-bool HbXmlLoaderBinaryActions::createStackedLayout( const QString &widget )
+bool HbXmlLoaderBinaryActions::createStackedLayout( const QString &widget, bool modify )
 {
-    mOut << (quint8)HbXml::ActionCreateStackedLayout << widget;
+    mOut << (quint8)HbXml::ActionCreateStackedLayout << widget << modify;
     return true;
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbxmlloaderbinaryactions_p.h
--- a/src/hbcore/utils/hbxmlloaderbinaryactions_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderbinaryactions_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -63,7 +63,6 @@
             const QString &name,
             const QString &role,
             const QString &plugin );
-        bool pushSpacerItem( const QString &name, const QString &widget );
         bool pushConnect(
             const QString &srcName,
             const QString &signalName,
@@ -95,25 +94,29 @@
             bool fixed);
         bool setToolTip( const HbXmlVariable &tooltip );
 
-        bool createAnchorLayout( const QString &widget );
-        bool addAnchorLayoutEdge(
+        bool createAnchorLayout( const QString &widget, bool modify );
+        bool addAnchorLayoutItem(
             const QString &src,
+            const QString &srcId,
             Hb::Edge srcEdge, 
             const QString &dst,
+            const QString &dstId,
             Hb::Edge dstEdge,
+            const HbXmlLengthValue &minLength,
+            const HbXmlLengthValue &prefLength,
+            const HbXmlLengthValue &maxLength,
+            QSizePolicy::Policy *policy, 
+            HbAnchor::Direction *dir,
+            const QString &anchorId );
+        bool setAnchorLayoutMapping(
+            const QString &item,
+            const QString &id,
+            bool remove);
+
+        bool createGridLayout(
+            const QString &widget,
             const HbXmlLengthValue &spacing,
-            const QString &spacer = QString() );
-        
-        bool createMeshLayout( const QString &widget );
-        bool addMeshLayoutEdge(
-            const QString &src,
-            Hb::Edge srcEdge, 
-            const QString &dst,
-            Hb::Edge dstEdge,
-            const HbXmlLengthValue &spacing,
-            const QString &spacer = QString() );
-
-        bool createGridLayout( const QString &widget, const HbXmlLengthValue &spacing );
+            bool modify );
         bool addGridLayoutCell(
             const QString &src,
             int row, 
@@ -147,7 +150,8 @@
         bool createLinearLayout(
             const QString &widget,
             Qt::Orientation *orientation, 
-            const HbXmlLengthValue &spacing );
+            const HbXmlLengthValue &spacing,
+            bool modify );
         bool addLinearLayoutItem(
             const QString &itemname,
             int *index,
@@ -164,7 +168,7 @@
             const HbXmlLengthValue &right,
             const HbXmlLengthValue &bottom );
 
-        bool createStackedLayout( const QString &widget );
+        bool createStackedLayout( const QString &widget, bool modify );
         bool addStackedLayoutItem( const QString &itemname, int *index );
                                 
         bool createNullLayout( const QString &widget );
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbxmlloaderbinarysyntax_p.cpp
--- a/src/hbcore/utils/hbxmlloaderbinarysyntax_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderbinarysyntax_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -143,7 +143,6 @@
         case HbXml::ActionPushDocument: result = parsePushDocument(); break;
         case HbXml::ActionPushObject: result = parsePushObject(); break;
         case HbXml::ActionPushWidget: result = parsePushWidget(); break;
-        case HbXml::ActionPushSpacerItem: result = parsePushSpacerItem(); break;
         case HbXml::ActionPushConnect: result = parsePushConnect(); break;
         case HbXml::ActionPushProperty: result = parsePushProperty(); break;
         case HbXml::ActionPushRef: result = parsePushRef(); break;
@@ -154,9 +153,8 @@
         case HbXml::ActionSetSizeHint: result = parseSetSizeHint(); break;
         case HbXml::ActionSetToolTip: result = parseSetToolTip(); break;
         case HbXml::ActionCreateAnchorLayout: result = parseCreateAnchorLayout(); break;
-        case HbXml::ActionAddAnchorLayoutEdge: result = parseAddAnchorLayoutEdge(); break;
-        case HbXml::ActionCreateMeshLayout: result = parseCreateMeshLayout(); break;
-        case HbXml::ActionAddMeshLayoutEdge: result = parseAddMeshLayoutEdge(); break;
+        case HbXml::ActionAddAnchorLayoutItem: result = parseAddAnchorLayoutItem(); break;
+        case HbXml::ActionSetAnchorLayoutMapping: result = parseSetAnchorLayoutMapping(); break;
         case HbXml::ActionCreateGridLayout: result = parseCreateGridLayout(); break;
         case HbXml::ActionAddGridLayoutCell: result = parseAddGridLayoutCell(); break;
         case HbXml::ActionSetGridLayoutRowProperties: result = parseSetGridLayoutRowProperties(); break;
@@ -267,13 +265,6 @@
     return mActions->pushWidget(type, name, role, plugin);
 }
 
-bool HbXmlLoaderBinarySyntax::parsePushSpacerItem()
-{
-    QString name, widget;
-    mIn >> name >> widget;
-    return mActions->pushSpacerItem(name, widget);
-}
-
 bool HbXmlLoaderBinarySyntax::parsePushConnect()
 {
     QString srcName, signalName, dstName, slotName;
@@ -287,6 +278,9 @@
     HbXmlVariable buffer;
     mIn >> propertyName >> buffer;
     bool res = mActions->pushProperty(propertyName, buffer);
+    if ( !res ) {
+        qDebug() << "HbXmlLoaderBinarySyntax, failed at pushProperty " << propertyName;
+    }
     delete[] propertyName;
     return res;
 }
@@ -388,41 +382,65 @@
 bool HbXmlLoaderBinarySyntax::parseCreateAnchorLayout()
 {
     QString widget;
-    mIn >> widget;
-    return mActions->createAnchorLayout(widget);
-}
-
-bool HbXmlLoaderBinarySyntax::parseAddAnchorLayoutEdge()
-{
-    QString src, dst, spacer;
-    quint8 srcEdge, dstEdge;
-    HbXmlLengthValue spacing;
-    mIn >> src >> srcEdge >> dst >> dstEdge >> spacing >> spacer;
-    return mActions->addAnchorLayoutEdge(src, (Hb::Edge)srcEdge, dst, (Hb::Edge)dstEdge, spacing, spacer);
+    bool modify;
+    mIn >> widget >> modify;
+    return mActions->createAnchorLayout(widget, modify);
 }
 
-bool HbXmlLoaderBinarySyntax::parseCreateMeshLayout()
+bool HbXmlLoaderBinarySyntax::parseAddAnchorLayoutItem()
 {
-    QString widget;
-    mIn >> widget;
-    return mActions->createMeshLayout(widget);
+    QString src, srcId, dst, dstId, anchorId;
+    Hb::Edge srcEdge, dstEdge;
+    HbXmlLengthValue minLength, prefLength, maxLength;
+    QSizePolicy::Policy policy; 
+    QSizePolicy::Policy *policy_p = 0;
+    HbAnchor::Direction dir;
+    HbAnchor::Direction *dir_p = 0;
+
+    bool temp;
+    quint8 tempEnum;
+
+    mIn >> src >> srcId >> tempEnum;
+    srcEdge = (Hb::Edge)tempEnum;
+
+    mIn >> dst >> dstId >> tempEnum;
+    dstEdge = (Hb::Edge)tempEnum;
+
+    mIn >> minLength >> prefLength >> maxLength;
+
+    // Optional parameters
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempEnum;
+        policy = (QSizePolicy::Policy)tempEnum;
+        policy_p = &policy;
+    }
+    mIn >> temp;
+    if ( temp ) {
+        mIn >> tempEnum;
+        dir = (HbAnchor::Direction)tempEnum;
+        dir_p = &dir;
+    }
+    mIn >> anchorId;
+
+    return mActions->addAnchorLayoutItem( src, srcId, srcEdge, dst, dstId, dstEdge, minLength, prefLength, maxLength, policy_p, dir_p, anchorId );
 }
 
-bool HbXmlLoaderBinarySyntax::parseAddMeshLayoutEdge()
+bool HbXmlLoaderBinarySyntax::parseSetAnchorLayoutMapping()
 {
-    QString src, dst, spacer;
-    quint8 srcEdge, dstEdge;
-    HbXmlLengthValue spacing;
-    mIn >> src >> srcEdge >> dst >> dstEdge >> spacing >> spacer;
-    return mActions->addMeshLayoutEdge(src, (Hb::Edge)srcEdge, dst, (Hb::Edge)dstEdge, spacing, spacer);
+    QString item, id;
+    bool remove;
+    mIn >> item >> id >> remove;
+    return mActions->setAnchorLayoutMapping(item, id, remove);
 }
 
 bool HbXmlLoaderBinarySyntax::parseCreateGridLayout()
 {
     QString widget;
     HbXmlLengthValue spacing;
-    mIn >> widget >> spacing;
-    return mActions->createGridLayout(widget, spacing);
+    bool modify;
+    mIn >> widget >> spacing >> modify;
+    return mActions->createGridLayout(widget, spacing, modify);
 }
 
 bool HbXmlLoaderBinarySyntax::parseAddGridLayoutCell()
@@ -553,6 +571,7 @@
     Qt::Orientation orientation;
     Qt::Orientation *orientation_p = 0;
     HbXmlLengthValue spacing;
+    bool modify;
     mIn >> widget;
 
     // Optional parameter
@@ -564,9 +583,9 @@
         orientation = (Qt::Orientation)tempEnum;
         orientation_p = &orientation;
     }
-    mIn >> spacing;
+    mIn >> spacing >> modify;
 
-    return mActions->createLinearLayout(widget, orientation_p, spacing);
+    return mActions->createLinearLayout(widget, orientation_p, spacing, modify);
 }
 
 bool HbXmlLoaderBinarySyntax::parseAddLinearLayoutItem()
@@ -640,8 +659,9 @@
 bool HbXmlLoaderBinarySyntax::parseCreateStackedLayout()
 {
     QString widget;
-    mIn >> widget;
-    return mActions->createStackedLayout(widget);
+    bool modify;
+    mIn >> widget >> modify;
+    return mActions->createStackedLayout(widget, modify);
 }
 
 bool HbXmlLoaderBinarySyntax::parseAddStackedLayoutItem()
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbcore/utils/hbxmlloaderbinarysyntax_p.h
--- a/src/hbcore/utils/hbxmlloaderbinarysyntax_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderbinarysyntax_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -54,7 +54,6 @@
     bool parsePushDocument();
     bool parsePushObject();
     bool parsePushWidget();
-    bool parsePushSpacerItem();
     bool parsePushConnect();
     bool parsePushProperty();
     bool parsePushRef();
@@ -65,9 +64,8 @@
     bool parseSetSizeHint();
     bool parseSetToolTip();
     bool parseCreateAnchorLayout();
-    bool parseAddAnchorLayoutEdge();
-    bool parseCreateMeshLayout();
-    bool parseAddMeshLayoutEdge();
+    bool parseAddAnchorLayoutItem();
+    bool parseSetAnchorLayoutMapping();
     bool parseCreateGridLayout();
     bool parseAddGridLayoutCell();
     bool parseSetGridLayoutRowProperties();
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbfeedback/player/hbcontinuousfeedback.cpp
--- a/src/hbfeedback/player/hbcontinuousfeedback.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbfeedback/player/hbcontinuousfeedback.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -59,35 +59,27 @@
 
     Continuous feedbacks are feedback effects that last as long as the user is touching the screen,
     for example when dragging a slider handle. Continuous feedback effects need to be started, updated 
-    and stopped using methods HbFeedbackPlayer::startContinuousFeedback(), HbFeedbackPlayer::updateContinuousFeedback()
-    and HbFeedbackPlayer::cancelContinuousFeedback(). The effect intensity can be varied during the feedback.
+    and stopped using methods play() and stop().
 */
 
-#define UPDATE_IF_ONGOING \
-HbFeedbackPlayer *player = HbFeedbackPlayer::instance(); \
-if(player && player->continuousFeedbackOngoing(d->cFeedbackId)) { \
-    player->updateContinuousFeedback(d->cFeedbackId,*this); \
-}
-
-
 /*!
     \fn void HbContinuousFeedback::setContinuousEffect(HbFeedback::ContinuousEffect effect)
 
-    Sets the continuous feedback effect that determines what kind of continuous effects will
-    be played when calling HbFeedbackPlayer::startContinuousFeedback().
+    Sets the continuous feedback effect that will be played by the feedback object.
+    \sa continuousEffect()
 */
 
 void HbContinuousFeedback::setContinuousEffect(HbFeedback::ContinuousEffect effect)
 {
     d->cEffect = effect;
-    UPDATE_IF_ONGOING;
 }
 
 /*!
     \fn void HbFeedback::ContinuousEffect HbContinuousFeedback::continuousEffect() const
 
-    Returns the continuous effect of the continuous feedback object. Continuous effect represents the continuous
-    feedback effect that will be played when calling HbFeedbackPlayer::startContinuousFeedback().
+    Returns the continuous effect of the continuous feedback object.
+
+    \sa setContinuousEffect()
 */
 
 HbFeedback::ContinuousEffect HbContinuousFeedback::continuousEffect() const
@@ -98,9 +90,11 @@
 /*!
     \fn int HbContinuousFeedback::timeout() const
 
-    The timeout value of the feedback in milliseconds. Continuous feedback is
-    automatically stopped if previously started continuous feedback has not been
-    updated within the timeout.
+    Returns the timeout value (in milliseconds) of the feedback object. Continuous feedback is
+    automatically stopped if it is not updated within the timeout (by subsequent calls to
+    play()).
+
+    \sa setTimeout(), play()
 */
 
 int HbContinuousFeedback::timeout() const {
@@ -110,8 +104,10 @@
 /*!
     \fn int HbContinuousFeedback::intensity() const
 
-    The intensity of the continuous feedback effect. Intensity can be varied between 
+    Returns the intensity of the continuous feedback effect. Intensity can be varied between
     values HbFeedback::IntensityZero and HbFeedback::IntensityFull.
+
+    \sa setIntensity()
 */
 
 int HbContinuousFeedback::intensity() const {
@@ -134,7 +130,7 @@
 /*!
     Constructor.
 
-    \param effect continuous feedback to be played
+    \param effect continuous feedback effect to be played
     \param widget used to determine the window where continuous feedback is active.
            There can only be one ongoing continuous feedback per application window.
 */
@@ -153,43 +149,53 @@
 }
 
 /*!
-    Sets the timeout value in milliseconds. Continuous feedback is automatically stopped
-    if the continuous feedback has not been updated within the timeout.
+    Sets the timeout value (in milliseconds) of the feedback object. Continuous feedback is
+    automatically stopped if it is not updated within the timeout (by subsequent calls to
+    play()). This is a safety mechanism to prevent situations in which the  client fails to
+    explicitly stop() a continuous feedback effect. The default timeout value is
+    HbFeedback::StandardFeedbackTimeout.
+
+    \sa timeout()
 */
 void HbContinuousFeedback::setTimeout(int msecTimeout)
 {
     if (msecTimeout > 0) {
         d->cTimeout = msecTimeout;
-        UPDATE_IF_ONGOING;
     }
 }
 
 /*!
     Sets the intensity of the continuous feedback effect. The intensity can be varied between 
     HbFeedback::IntensityZero and HbFeedback::IntensityFull.
+
+    \sa intensity()
 */
 void HbContinuousFeedback::setIntensity(int intensity)
 {
     if (intensity >= 0 && intensity <= HbFeedback::IntensityFull) {
         d->cIntensity = intensity;
-        UPDATE_IF_ONGOING;
     }
 }
 
 /*!
-    Plays the continuous feedback.
+    Starts/updates the continuous feedback.
+    The feedback effect will be played untill the timeout is reached or a call to stop() is made.
+    \sa stop()
 */
 void HbContinuousFeedback::play()
 {
-    HbFeedbackPlayer* feedbackPlayer = HbFeedbackPlayer::instance();
-
-    if (feedbackPlayer) {
-        d->cFeedbackId = feedbackPlayer->startContinuousFeedback(*this);
+    HbFeedbackPlayer *feedbackPlayer = HbFeedbackPlayer::instance();
+    if(feedbackPlayer) {
+        if( feedbackPlayer->continuousFeedbackOngoing(d->cFeedbackId)) {
+            feedbackPlayer->updateContinuousFeedback(d->cFeedbackId,*this);
+        } else {
+            d->cFeedbackId = feedbackPlayer->startContinuousFeedback(*this);
+        }
     }
 }
 
 /*!
-    Stops the continous feedback.
+    Stops the continuous feedback.
 */
 void HbContinuousFeedback::stop()
 {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbfeedback/player/hbfeedbackplayer.cpp
--- a/src/hbfeedback/player/hbfeedbackplayer.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbackplayer.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -29,7 +29,6 @@
 #include <hbinstantfeedback.h>
 #include <hbcontinuousfeedback.h>
 #include <hbfeedbacksettings.h>
-#include "hbfeedbackplayer_stub_p.h"
 
 #ifdef FEEDBACK_TEST_EVENT
 #include "hbfeedbacktestevent_p.h"
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbfeedback/player/hbfeedbackplayer_p.h
--- a/src/hbfeedback/player/hbfeedbackplayer_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbackplayer_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
-#ifndef HBFEEDBACKPLAYER_H
-#define HBFEEDBACKPLAYER_H
+#ifndef HBFEEDBACKPLAYER_P_H
+#define HBFEEDBACKPLAYER_P_H
 
 #include <hbfeedbacknamespace.h>
 #include <QObject>
@@ -60,4 +60,4 @@
     HbFeedbackPlayerPrivate* const d;
 };
 
-#endif // HBFEEDBACKPLAYER_H
+#endif // HBFEEDBACKPLAYER_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbfeedback/player/hbfeedbackplayer_p_p.h
--- a/src/hbfeedback/player/hbfeedbackplayer_p_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbackplayer_p_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
-#ifndef HBFEEDBACKPLAYERPRIVATE_H
-#define HBFEEDBACKPLAYERPRIVATE_H
+#ifndef HBFEEDBACKPLAYER_P_P_H
+#define HBFEEDBACKPLAYER_P_P_H
 
 #include "hbfeedbackplayer_p.h"
 
@@ -50,4 +50,4 @@
     HbFeedbackSettings* feedbackSettings;
 };
 
-#endif // HBFEEDBACKPLAYERPRIVATE_H
+#endif // HBFEEDBACKPLAYER_P_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbfeedback/player/hbfeedbackplayer_stub_p.h
--- a/src/hbfeedback/player/hbfeedbackplayer_stub_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbackplayer_stub_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
-#ifndef HBFEEDBACKBASEPLAYER_H
-#define HBFEEDBACKBASEPLAYER_H
+#ifndef HBFEEDBACKPLAYER_STUB_P_H
+#define HBFEEDBACKPLAYER_STUB_P_H
 
 #include <hbfeedbacknamespace.h>
 
@@ -53,4 +53,4 @@
     HbFeedbackBasePlayerPrivate* const d;
 };
 
-#endif // HBFEEDBACKBASEPLAYER_H
+#endif // HBFEEDBACKPLAYER_STUB_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbfeedback/player/hbfeedbackplayer_symbian_p.h
--- a/src/hbfeedback/player/hbfeedbackplayer_symbian_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbackplayer_symbian_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
-#ifndef HBFEEDBACKBASEPLAYER_H
-#define HBFEEDBACKBASEPLAYER_H
+#ifndef HBFEEDBACKPLAYER_SYMBIAN_H
+#define HBFEEDBACKPLAYER_SYMBIAN_H
 
 #include <hbfeedbacknamespace.h>
 
@@ -54,4 +54,4 @@
     HbFeedbackBasePlayerPrivate* const d;
 };
 
-#endif // HBFEEDBACKBASEPLAYER_H
+#endif // HBFEEDBACKPLAYER_SYMBIAN_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbfeedback/player/hbinstantfeedback.cpp
--- a/src/hbfeedback/player/hbinstantfeedback.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbfeedback/player/hbinstantfeedback.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -55,7 +55,10 @@
 /*!
     \fn void HbInstantFeedback::setInstantEffect(HbFeedback::InstantEffect effect)
 
-    Sets the instant effect to be be played when calling HbFeedbackPlayer::playInstantFeedback().
+    Sets the instant effect of the feedback object. This effect will be played when calling
+    the play() function.
+
+    \sa instantEffect()
 */
 
 void HbInstantFeedback::setInstantEffect(HbFeedback::InstantEffect effect)
@@ -66,8 +69,9 @@
 /*!
     \fn void HbFeedback::InstantEffect HbInstantFeedback::instantEffect() const
 
-    Returns the instant effect of the instant feedback object. Instant effect represents the feedback 
-    effect to be played when calling HbFeedbackPlayer::playInstantFeedback().
+    Returns the instant effect of the instant feedback object.
+
+    \sa setInstantEffect()
 */
 
 HbFeedback::InstantEffect HbInstantFeedback::instantEffect() const
@@ -78,7 +82,7 @@
 /*!
     \fn bool HbInstantFeedback::isValid() const
 
-    Instant feedback is valid if a proper instant effect (not HbFeedback::None) has beed
+    Instant feedback is valid if a proper instant effect (not HbFeedback::None) has been
     defined for the feedback.
 */
 
@@ -108,7 +112,8 @@
 /*!
     Constructor.
 
-    \param effect instant feedback to be played
+    \param effect the instant feedback effect of the feedback object. This effect will
+           be played when calling the play() function.
 */
 HbInstantFeedback::HbInstantFeedback(HbFeedback::InstantEffect effect) : d(new HbInstantFeedbackPrivate)
 {
@@ -124,7 +129,7 @@
 }
 
 /*!
-    Plays the instant feedback effect.
+    Plays the feedback object's instant feedback effect.
 */
 void HbInstantFeedback::play()
 {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputbutton.cpp
--- a/src/hbinput/inputwidgets/hbinputbutton.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputbutton.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -75,7 +75,8 @@
         mIcons.append(HbIcon());
     }
 
-    if (keyCode != HbInputButton::ButtonKeyCodeCharacter) {
+    if (keyCode != HbInputButton::ButtonKeyCodeCharacter &&
+        keyCode != HbInputButton::ButtonKeyCodeSpace) {
         mType = HbInputButton::ButtonTypeFunction;
     }
 
@@ -125,22 +126,30 @@
 
 void HbInputButtonPrivate::setDefaultGraphics(int keyCode)
 {
-    if (keyCode == HbInputButton::ButtonKeyCodeDelete) {
-        mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconDelete));
-    } else if (keyCode == HbInputButton::ButtonKeyCodeShift) {
-        mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconShift));
-    } else if (keyCode == HbInputButton::ButtonKeyCodeSymbol) {
-        mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconSymbol));
-    } else if (keyCode == HbInputButton::ButtonKeyCodeEnter) {
-        mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconEnter));
-    } else if (keyCode == HbInputButton::ButtonKeyCodeSpace) {
-        mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconSpace));
-    } else if (keyCode == HbInputButton::ButtonKeyCodeAlphabet) {
-        mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconAlphabet));
-    } else if (keyCode == HbInputButton::ButtonKeyCodePageChange) {
-        mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconPageChange));
-    } else if (keyCode == HbInputButton::ButtonKeyCodeSmiley) {
-        mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconSmiley));
+    switch(keyCode) {
+        case HbInputButton::ButtonKeyCodeDelete:
+            mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconDelete));
+            break;
+        case HbInputButton::ButtonKeyCodeShift:
+            mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconShift));
+            break;
+        case HbInputButton::ButtonKeyCodeSymbol:
+            mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconSymbol));
+            break;
+        case HbInputButton::ButtonKeyCodeEnter:
+            mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconEnter));
+            break;
+        case HbInputButton::ButtonKeyCodeSpace:
+            mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconSpace));
+            break;
+        case HbInputButton::ButtonKeyCodeAlphabet:
+            mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconSymbol));
+            break;
+        case HbInputButton::ButtonKeyCodeSmiley:
+            mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconSmiley));
+            break;
+        default:
+            break;
     }
 }
 
@@ -176,7 +185,7 @@
 }
 
 /*!
-Updates buttons type.
+Updates button's type.
 
 \sa type
 */
@@ -188,7 +197,7 @@
 }
 
 /*!
-Returns buttons type.
+Returns button's type.
 
 \sa setType
 */
@@ -200,7 +209,7 @@
 }
 
 /*!
-Updates buttons state.
+Updates button's state.
 
 \sa state
 */
@@ -212,7 +221,7 @@
 }
 
 /*!
-Returns buttons state.
+Returns button's state.
 
 \sa setState
 */
@@ -224,7 +233,7 @@
 }
 
 /*!
-Updates buttons position.
+Updates button's position.
 
 position is button's position in grid cell units.
 
@@ -238,7 +247,7 @@
 }
 
 /*!
-Returns buttons position.
+Returns button's position.
 
 \sa setPosition
 */
@@ -250,7 +259,7 @@
 }
 
 /*!
-Updates buttons size.
+Updates button's size.
 
 size is button's size in grid cell units.
 
@@ -264,7 +273,7 @@
 }
 
 /*!
-Returns buttons size.
+Returns button's size.
 
 \sa setSize
 */
@@ -276,7 +285,7 @@
 }
 
 /*!
-Updates buttons key code.
+Updates button's key code.
 
 \sa keyCode
 */
@@ -288,7 +297,7 @@
 }
 
 /*!
-Returns buttons key code.
+Returns button's key code.
 
 \sa setKeyCode
 */
@@ -300,7 +309,7 @@
 }
 
 /*!
-Updates buttons auto repeat status.
+Updates button's auto repeat status.
 
 \sa autoRepeat
 */
@@ -312,7 +321,7 @@
 }
 
 /*!
-Returns buttons auto repeat status.
+Returns button's auto repeat status.
 
 \sa setAutoRepeat
 */
@@ -340,11 +349,11 @@
 }
 
 /*!
-Updates all button texts.
+Updates all button's texts.
 Button can have three different texts. Text position and size
-will depend of other buttons texts and icons. If list contains
+will depend on other buttons texts and icons. If list contains
 more strings, then the rest will be ignored. Icon with same index
-than text will override the text.
+as text will override the text.
 
 \sa text
 \sa texts
@@ -380,7 +389,7 @@
 }
 
 /*!
-Returns all button texts.
+Returns all button's texts.
 
 \sa setText
 \sa setTexts
@@ -435,9 +444,9 @@
 /*!
 Updates all button icons.
 Button can have three different icons. Icon position
-will depend of other buttons icons and texts. If list contains
+will depend on other buttons icons and texts. If list contains
 more icons, then the rest will be ignored. Icon with same index
-than text will override the text.
+as text will override the text.
 
 \sa icon
 \sa icons
@@ -472,7 +481,7 @@
 }
 
 /*!
-Returns all button icon.
+Returns all button's icons.
 
 \sa setIcon
 \sa setIcons
@@ -497,7 +506,7 @@
 }
 
 /*!
-Returns buttons bounding rectangle.
+Returns button's bounding rectangle.
 
 \sa setBoundingRect
 */
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputbuttongroup.cpp
--- a/src/hbinput/inputwidgets/hbinputbuttongroup.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputbuttongroup.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -158,6 +158,8 @@
             if (drawer != mButtonDrawers.at(i)) {
                 HbFrameDrawerPool::release(mButtonDrawers.at(i));
                 mButtonDrawers.replace(i, drawer);
+            } else {
+                HbFrameDrawerPool::release(drawer);
             }
         } else {
             mButtonDrawers.append(drawer);
@@ -313,12 +315,18 @@
 {
     Q_Q(HbInputButtonGroup);
 
+    // Button preview should be shown only for non-function buttons if preview
+    // is enabled for this button group. Space key is handled as a special case
+    // and no preview will be shown for that although it is not function button.
     int index = mButtonData.indexOf(item);
-    if (mButtonPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction &&
-        !mButtonPreview.contains(index)) {
+    if (mButtonPreviewEnabled && !mButtonPreview.contains(index) &&
+        item->type() != HbInputButton::ButtonTypeFunction &&
+        item->keyCode() != HbInputButton::ButtonKeyCodeSpace) {
+
         HbInputButtonGroup *group = new HbInputButtonGroup(QSize(1, 1));
         mButtonPreview.insert(index, group);
 
+        // Create preview button and add it to the new button group
         QList<HbInputButton *> buttons;
         HbInputButton *previewItem = 0;
         if (!item->icon(HbInputButton::ButtonIconIndexPrimary).isNull()) {
@@ -339,11 +347,13 @@
         qreal cellWidth = q->boundingRect().width() / mGridSize.width();
         qreal cellHeight = q->boundingRect().height() / mGridSize.height();
 
+        // Calculate text size
         QFont font = HbFontSpec(HbFontSpec::Primary).font();
         font.setPixelSize(int(fontSize(HbInputButtonGroup::ButtonTextTypeLabel)));
         QFontMetricsF fontMetrics(font);
         qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexPrimary));
 
+        // Calculate preview size
         qreal width = textWidth + HbPreviewMarginInUnits * mUnitValue;
         if (!item->icon(HbInputButton::ButtonIconIndexPrimary).isNull()) {
             width = item->boundingRect().width();
@@ -383,14 +393,22 @@
 {
     Q_Q(HbInputButtonGroup);
 
+    // Character preview should be shown only for non-function buttons which contains more
+    // than one character if preview is enabled for this button group
     if (mCharacterSelectionPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction &&
         item->mappedCharacters().count() > 1) {
 
-        HbWidgetFeedback::triggered(q, Hb::InstantLongPressed);
+        if (item->type() == HbInputButton::ButtonTypeFunction) {
+            HbWidgetFeedback::triggered(q, Hb::InstantLongPressed, Hb::ModifierInputFunctionButton);
+        }
+        else {
+            HbWidgetFeedback::triggered(q, Hb::InstantLongPressed);
+        }
 
         mProbabilities.clear();
         q->cancelButtonPress();
 
+        // Create and initialize character preview
         if (!mCharacterSelectionPreview) {
             mCharacterSelectionPreview = new HbDialog();
             HbInputRegionCollector::instance()->attach(mCharacterSelectionPreview);
@@ -414,16 +432,19 @@
         qreal cellWidth = q->boundingRect().width() / mGridSize.width();
         qreal cellHeight = q->boundingRect().height() / mGridSize.height();
 
+        // Calculate text size
         QFont font = HbFontSpec(HbFontSpec::Primary).font();
         font.setPixelSize(int(fontSize(HbInputButtonGroup::ButtonTextTypeLabel)));
         QFontMetricsF fontMetrics(font);
         qreal textWidth = fontMetrics.width(item->mappedCharacters());
 
-        qreal width = textWidth + HbPreviewMarginInUnits * mUnitValue * item->mappedCharacters().count();
+        // Calculate preview size
+        qreal width = textWidth + HbPreviewMarginInUnits * mUnitValue * (item->mappedCharacters().count() - 1);
         qreal height = HbPreviewHeightInUnits * mUnitValue;
         qreal x = q->scenePos().x() + (item->position().x() + 0.5 * item->size().width()) * cellWidth;
         qreal y = q->scenePos().y() + item->position().y() * cellHeight;
 
+        // Create character preview button and add it to the created button group
         QList<HbInputButton *> buttons;
         for (int i = 0; i < item->mappedCharacters().count(); ++i) {
             HbInputButton *previewItem = new HbInputButton(item->keyCode(), QPoint(i, 0));
@@ -434,7 +455,7 @@
         group->setButtons(buttons);
         group->setButtonBorderSize(0);
 
-        mCharacterSelectionPreview->setPreferredSize(QSizeF(width, height));
+        group->setPreferredSize(QSizeF(width, height));
         mCharacterSelectionPreview->setPreferredPos(QPointF(x, y), HbPopup::BottomEdgeCenter);
         mCharacterSelectionPreview->setContentWidget(group);
 
@@ -450,6 +471,7 @@
 {
     Q_Q(HbInputButtonGroup);
 
+    // Ignore press events outside button group
     if (!(position.x() >= 0 && position.x() < q->boundingRect().width() &&
           position.y() >= 0 && position.y() < q->boundingRect().height())) {
         return;
@@ -471,8 +493,13 @@
             }
             return;
         }
-
-        HbWidgetFeedback::triggered(q, Hb::InstantPressed);
+        
+        if (item->type() == HbInputButton::ButtonTypeFunction) {
+            HbWidgetFeedback::triggered(q, Hb::InstantPressed, Hb::ModifierInputFunctionButton);
+        }
+        else {
+            HbWidgetFeedback::triggered(q, Hb::InstantPressed);        
+        }
 
         item->setState(HbInputButton::ButtonStatePressed);
         updateGraphics(QSizeF(q->boundingRect().width(), q->boundingRect().height()));
@@ -500,6 +527,7 @@
 {
     Q_Q(HbInputButtonGroup);
 
+    // Ignore double press events outside button group
     if (!(position.x() >= 0 && position.x() < q->boundingRect().width() &&
           position.y() >= 0 && position.y() < q->boundingRect().height())) {
         return;
@@ -522,7 +550,12 @@
             return;
         }
 
-        HbWidgetFeedback::triggered(q, Hb::InstantPressed);
+        if (item->type() == HbInputButton::ButtonTypeFunction) {
+            HbWidgetFeedback::triggered(q, Hb::InstantPressed, Hb::ModifierInputFunctionButton);
+        }
+        else {
+            HbWidgetFeedback::triggered(q, Hb::InstantPressed);        
+        }
 
         item->setState(HbInputButton::ButtonStatePressed);
         updateGraphics(QSizeF(q->boundingRect().width(), q->boundingRect().height()));
@@ -558,6 +591,7 @@
     int oldIndex = mButtonGridPositions.value(QPair<int, int>(oldColumn, oldRow), -1);
     int newIndex = mButtonGridPositions.value(QPair<int, int>(newColumn, newRow), -1);
 
+    // Check if movement happens inside button group
     if (newPosition.x() >= 0 && newPosition.x() < q->boundingRect().width() &&
         newPosition.y() >= 0 && newPosition.y() < q->boundingRect().height() &&
         oldPosition.x() >= 0 && oldPosition.x() < q->boundingRect().width() &&
@@ -583,6 +617,9 @@
             q->emitPressedButtonChanged(releaseEvent, pressEvent);
         }
     } else {
+        // Move event came from outside button group so create new release and press events
+        // for old and new position. If one of the positions is inside button group
+        // a new event will get generated.
         releaseEvent(oldPosition, false);
         pressEvent(newPosition);
     }
@@ -592,6 +629,7 @@
 {
     Q_Q(HbInputButtonGroup);
 
+    // Ignore release events outside button group
     if (!(position.x() >= 0 && position.x() < q->boundingRect().width() &&
           position.y() >= 0 && position.y() < q->boundingRect().height())) {
         return;
@@ -611,7 +649,12 @@
             return;
         }
 
-        HbWidgetFeedback::triggered(q, Hb::InstantReleased);
+        if (item->type() == HbInputButton::ButtonTypeFunction) {
+            HbWidgetFeedback::triggered(q, Hb::InstantReleased, Hb::ModifierInputFunctionButton);
+        }
+        else {
+            HbWidgetFeedback::triggered(q, Hb::InstantReleased);
+        }
 
         item->setState(HbInputButton::ButtonStateReleased);
         updateGraphics(QSizeF(q->boundingRect().width(), q->boundingRect().height()));
@@ -625,7 +668,12 @@
         hideButtonPreview(item);
 
         if (emitSignal) {
-            HbWidgetFeedback::triggered(q, Hb::InstantClicked);
+            if (item->type() == HbInputButton::ButtonTypeFunction) {
+                HbWidgetFeedback::triggered(q, Hb::InstantClicked, Hb::ModifierInputFunctionButton);
+            }
+            else {
+                HbWidgetFeedback::triggered(q, Hb::InstantClicked);
+            }
             int actionIndex = item->keyCode() - HbInputButton::ButtonKeyCodeCustom;
             if (actionIndex >= 0 && actionIndex < mCustomActions.count()) {
                 emit q->aboutToActivateCustomAction(mCustomActions.at(actionIndex));
@@ -656,6 +704,7 @@
     if (index >= 0 && index < mButtonData.count()) {
         HbInputButton *item = mButtonData.at(index);
 
+        // Handle autorepeating buttons
         if (item->autoRepeat() &&
             (item->state() == HbInputButton::ButtonStatePressed ||
              item->state() == HbInputButton::ButtonStateLatched)) {
@@ -663,23 +712,35 @@
             mLongPressTimers.append(timer);
             timer->start(HbAutoRepeatTimeout);
 
-            HbWidgetFeedback::triggered(q, Hb::InstantKeyRepeated);
+            if (item->type() == HbInputButton::ButtonTypeFunction) {
+                HbWidgetFeedback::triggered(q, Hb::InstantKeyRepeated, Hb::ModifierInputFunctionButton);
+            }
+            else {
+                HbWidgetFeedback::triggered(q, Hb::InstantKeyRepeated);
+            }
 
             QString text;
             if (item->type() == HbInputButton::ButtonTypeLabel) {
                 text = item->text(HbInputButton::ButtonTextIndexPrimary);
             }
-            QKeyEvent releaeEvent(QEvent::KeyRelease, item->keyCode(), Qt::NoModifier, text, true);
+            int keycode = item->keyCode();
+            QKeyEvent releaeEvent(QEvent::KeyRelease, keycode, Qt::NoModifier, text, true);
             q->emitButtonReleased(releaeEvent);
-            QKeyEvent pressEvent(QEvent::KeyPress, item->keyCode(), Qt::NoModifier, text, true);
+            QKeyEvent pressEvent(QEvent::KeyPress, keycode, Qt::NoModifier, text, true);
             q->emitButtonPressed(pressEvent);
         } else {
-            if (mCharacterSelectionPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction && item->mappedCharacters().count() > 1) {
+            // Buttons that doesn't support autorepeat can either show character preview
+            // or generate a long press
+            if (mCharacterSelectionPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction
+                && item->mappedCharacters().count() > 1) {
                 showCharacterSelectionPreview(item);
             } else {
-                HbWidgetFeedback::triggered(q, Hb::InstantLongPressed);
-
-                delete timer;
+                if (item->type() == HbInputButton::ButtonTypeFunction) {
+                    HbWidgetFeedback::triggered(q, Hb::InstantLongPressed, Hb::ModifierInputFunctionButton);
+                }
+                else {
+                    HbWidgetFeedback::triggered(q, Hb::InstantLongPressed);
+                }
 
                 QString text;
                 if (item->type() == HbInputButton::ButtonTypeLabel) {
@@ -688,6 +749,7 @@
                 QKeyEvent event(QEvent::KeyPress, item->keyCode(), Qt::NoModifier, text, true);
                 q->emitButtonLongPressed(event);
             }
+            delete timer;
         }
     }
 }
@@ -704,6 +766,7 @@
     QRectF touchArea = QRectF(position.x() - 0.5 * cellWidth, position.y() - 0.5 * cellHeight,
                               HbTouchAreaSizeInUnits * mUnitValue, HbTouchAreaSizeInUnits * mUnitValue);
 
+    // Calculate probabilities based on the intersection area of "touch area" and button area
     qreal probabilities = 0;
     foreach(HbInputButton *button, mButtonData) {
         QRectF intersection = button->boundingRect().intersected(touchArea);
@@ -813,9 +876,6 @@
 
 void HbInputButtonGroupPrivate::createSecondaryTextLayout(int index, const QHash<int, QString> &textContent, const QSizeF &size)
 {
-    qreal cellWidth = size.width() / mGridSize.width();
-    qreal cellHeight = size.height() / mGridSize.height();
-
     QFont font = HbFontSpec(HbFontSpec::Primary).font();
     font.setPixelSize(int(fontSize(HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow)));
 
@@ -831,54 +891,90 @@
             layoutIndex = item->type() * HbInputButton::ButtonStateCount + HbInputButton::ButtonStateDisabled + HbTextTypeCount * 2;
         }
         if (index == layoutIndex) {
-            if (!item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow).isEmpty() &&
-                item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).isNull()) {
-                qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow));
-                qreal textHeight = fontMetrics.height();
-
-                QTextLine line = mTextLayouts.at(index)->createLine();
-                line.setNumColumns(item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow).length());
-
-                layoutTextLine(HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
-            }
+            // Layout secondary text for first row
+            layoutSecondaryText(index, item, fontMetrics, size,
+                                HbInputButton::ButtonTextIndexSecondaryFirstRow,
+                                HbInputButton::ButtonIconIndexSecondaryFirstRow,
+                                HbInputButton::ButtonTextIndexSecondarySecondRow,
+                                HbInputButton::ButtonIconIndexSecondarySecondRow,
+                                HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow);
+                                
 
-            if (!item->text(HbInputButton::ButtonTextIndexSecondarySecondRow).isEmpty() &&
-                item->icon(HbInputButton::ButtonIconIndexSecondarySecondRow).isNull()) {
-                qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexSecondarySecondRow));
-                qreal textHeight = fontMetrics.height();
-
-                QTextLine line = mTextLayouts.at(index)->createLine();
-                line.setNumColumns(item->text(HbInputButton::ButtonTextIndexSecondarySecondRow).length());
-
-                layoutTextLine(HbInputButtonGroup::ButtonTextTypeSecondarySecondRow, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
-            }
+            // Layout secondary text for second row
+            layoutSecondaryText(index, item, fontMetrics, size,
+                                HbInputButton::ButtonTextIndexSecondarySecondRow,
+                                HbInputButton::ButtonIconIndexSecondarySecondRow,
+                                HbInputButton::ButtonTextIndexSecondaryFirstRow,
+                                HbInputButton::ButtonIconIndexSecondaryFirstRow,
+                                HbInputButtonGroup::ButtonTextTypeSecondarySecondRow);
         }
     }
     mTextLayouts.at(index)->endLayout();
     mTextLayouts.at(index)->setCacheEnabled(true);
 }
 
+void HbInputButtonGroupPrivate::layoutSecondaryText(int index, HbInputButton *item, QFontMetricsF &fontMetrics, const QSizeF &size,
+                                                    HbInputButton::HbInputButtonTextIndex firstTextIndex,
+                                                    HbInputButton::HbInputButtonIconIndex firstIconIndex,
+                                                    HbInputButton::HbInputButtonTextIndex secondTextIndex,
+                                                    HbInputButton::HbInputButtonIconIndex secondIconIndex,
+                                                    HbInputButtonGroup::HbInputButtonTextType textType)
+{
+    qreal cellWidth = size.width() / mGridSize.width();
+    qreal cellHeight = size.height() / mGridSize.height();
+
+    if (!item->text(firstTextIndex).isEmpty() &&
+        item->icon(firstIconIndex).isNull()) {
+        qreal textWidth = fontMetrics.width(item->text(firstTextIndex));
+        qreal textHeight = fontMetrics.height();
+
+        QTextLine line = mTextLayouts.at(index)->createLine();
+        line.setNumColumns(item->text(firstTextIndex).length());
+
+        if (item->text(HbInputButton::ButtonTextIndexPrimary).isEmpty() && 
+            item->icon(HbInputButton::ButtonIconIndexPrimary).isNull() &&
+            item->text(secondTextIndex).isEmpty() && 
+            item->icon(secondIconIndex).isNull()) {
+            layoutTextLine(HbInputButtonGroup::ButtonTextTypeSingle, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
+        } else {
+            layoutTextLine(textType, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
+        }
+    }
+}
+
 void HbInputButtonGroupPrivate::layoutTextLine(HbInputButtonGroup::HbInputButtonTextType textType, const HbInputButton *button, const QSizeF &cellSize,
         QTextLine &textLine, const QSizeF &textSize)
 {
     qreal textPositionX = 0.0;
     qreal textPositionY = 0.0;
-    if (textType == HbInputButtonGroup::ButtonTextTypeSingle ||
-        textType == HbInputButtonGroup::ButtonTextTypeLabel) {
-        textPositionX = (button->position().x() + 0.5 * button->size().width()) * cellSize.width() - 0.5 * textSize.width();
-        textPositionY = (button->position().y() + 0.5 * button->size().height()) * cellSize.height() - 0.5 * textSize.height();
-    } else if (textType == HbInputButtonGroup::ButtonTextTypePrimary) {
-        textPositionX = button->position().x() * cellSize.width() + HbHorizontalMarginInUnits * mUnitValue + mButtonBorderSize;
-        textPositionY = (button->position().y() + 0.5 * button->size().height()) * cellSize.height() - 0.5 * textSize.height();
-    } else if (textType == HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow) {
-        textPositionX = (button->position().x() + button->size().width()) * cellSize.width() -
-                        textSize.width() - HbHorizontalMarginInUnits * mUnitValue - mButtonBorderSize;
-        textPositionY = (button->position().y() + button->size().height()) * cellSize.height() -
-                        textSize.height() - HbVerticalMarginInUnits * mUnitValue - mButtonBorderSize;
-    } else if (textType == HbInputButtonGroup::ButtonTextTypeSecondarySecondRow) {
-        textPositionX = (button->position().x() + button->size().width()) * cellSize.width() -
-                        textSize.width() - HbHorizontalMarginInUnits * mUnitValue - mButtonBorderSize;
-        textPositionY = button->position().y() * cellSize.height() + HbVerticalMarginInUnits * mUnitValue + mButtonBorderSize;
+    
+    switch(textType) {
+        case HbInputButtonGroup::ButtonTextTypeSingle:
+        case HbInputButtonGroup::ButtonTextTypeLabel:
+            textPositionX = (button->position().x() + 0.5 * button->size().width()) * cellSize.width() - 0.5 * textSize.width();
+            textPositionY = (button->position().y() + 0.5 * button->size().height()) * cellSize.height() - 0.5 * textSize.height();
+            break;
+
+        case HbInputButtonGroup::ButtonTextTypePrimary:
+            textPositionX = button->position().x() * cellSize.width() + HbHorizontalMarginInUnits * mUnitValue + mButtonBorderSize;
+            textPositionY = (button->position().y() + 0.5 * button->size().height()) * cellSize.height() - 0.5 * textSize.height();
+            break;
+
+        case HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow:
+            textPositionX = (button->position().x() + button->size().width()) * cellSize.width() -
+                            textSize.width() - HbHorizontalMarginInUnits * mUnitValue - mButtonBorderSize;
+            textPositionY = (button->position().y() + button->size().height()) * cellSize.height() -
+                            textSize.height() - HbVerticalMarginInUnits * mUnitValue - mButtonBorderSize;
+            break;
+
+        case HbInputButtonGroup::ButtonTextTypeSecondarySecondRow:
+            textPositionX = (button->position().x() + button->size().width()) * cellSize.width() -
+                            textSize.width() - HbHorizontalMarginInUnits * mUnitValue - mButtonBorderSize;
+            textPositionY = button->position().y() * cellSize.height() + HbVerticalMarginInUnits * mUnitValue + mButtonBorderSize;
+            break;
+
+        default:
+            break;
     }
     textLine.setPosition(QPointF(textPositionX, textPositionY));
 }
@@ -943,17 +1039,23 @@
 
 qreal HbInputButtonGroupPrivate::fontSize(HbInputButtonGroup::HbInputButtonTextType textType)
 {
-    if (textType == HbInputButtonGroup::ButtonTextTypeSingle) {
-        return HbTextSizeInUnits * mUnitValue;
-    } else if (textType == HbInputButtonGroup::ButtonTextTypePrimary) {
-        return HbPrimaryTextSizeInUnits * mUnitValue;
-    } else if (textType == HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow ||
-               textType == HbInputButtonGroup::ButtonTextTypeSecondarySecondRow) {
-        return HbSecondaryTextSizeInUnits * mUnitValue;
-    } else if (textType == HbInputButtonGroup::ButtonTextTypeLabel) {
-        return HbLabelTextSizeInUnits * mUnitValue;
+    switch(textType) {
+        case HbInputButtonGroup::ButtonTextTypeSingle:
+            return HbTextSizeInUnits * mUnitValue;
+
+        case HbInputButtonGroup::ButtonTextTypePrimary:
+            return HbPrimaryTextSizeInUnits * mUnitValue;
+
+        case HbInputButtonGroup::ButtonTextTypeSecondaryFirstRow:
+        case HbInputButtonGroup::ButtonTextTypeSecondarySecondRow:
+            return HbSecondaryTextSizeInUnits * mUnitValue;
+
+        case HbInputButtonGroup::ButtonTextTypeLabel:
+            return HbLabelTextSizeInUnits * mUnitValue;
+
+        default:
+            return 0;
     }
-    return 0;
 }
 
 void HbInputButtonGroupPrivate::startLongPress(int index)
@@ -1000,7 +1102,6 @@
     d->mUnitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
 
     setAcceptedMouseButtons(Qt::LeftButton);
-    setFlag(QGraphicsItem::ItemHasNoContents,false);
 }
 
 /*!
@@ -1014,7 +1115,6 @@
     d->mUnitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
 
     setAcceptedMouseButtons(Qt::LeftButton);
-    setFlag(QGraphicsItem::ItemHasNoContents,false);
 }
 
 /*!
@@ -1030,7 +1130,6 @@
     setAcceptedMouseButtons(Qt::LeftButton);
 
     setGridSize(size);
-    setFlag(QGraphicsItem::ItemHasNoContents,false);
 }
 
 /*!
@@ -1046,7 +1145,6 @@
     setAcceptedMouseButtons(Qt::LeftButton);
 
     setGridSize(size);
-    setFlag(QGraphicsItem::ItemHasNoContents,false);
 }
 
 /*!
@@ -1485,6 +1583,7 @@
 
     Q_D(HbInputButtonGroup);
 
+    // Draw button group background
     if (d->mBackground) {
         d->mBackground->paint(painter, QRectF(0, 0, boundingRect().width(), boundingRect().height()));
     }
@@ -1495,6 +1594,7 @@
     for (int i = 0; i < d->mButtonData.count(); ++i) {
         HbInputButton *item = d->mButtonData.at(i);
 
+        // Draw button backgrounds
         if (d->mButtonDrawers.at(i)) {
             qreal x = item->position().x() * cellWidth + d->mButtonBorderSize;
             qreal y = item->position().y() * cellHeight + d->mButtonBorderSize;
@@ -1507,6 +1607,7 @@
             painter->restore();
         }
 
+        // Draw primary icons
         if (!item->icon(HbInputButton::ButtonIconIndexPrimary).isNull()) {
             qreal x = item->position().x() * cellWidth;
             qreal y = item->position().y() * cellHeight;
@@ -1525,6 +1626,7 @@
             item->icon(HbInputButton::ButtonIconIndexPrimary).paint(painter, QRectF(x, y, width, height));
         }
 
+        // Draw secondary icons on first row
         if (!item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).isNull()) {
             qreal x = (item->position().x() + item->size().width()) * cellWidth -
                       HbSecondaryIconSizeInUnits * d->mUnitValue - HbHorizontalMarginInUnits * d->mUnitValue - d->mButtonBorderSize;
@@ -1537,6 +1639,7 @@
             item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).paint(painter, QRectF(x, y, width, height), Qt::KeepAspectRatio, alignment);
         }
 
+        // Draw secondary icons on second row
         if (!item->icon(HbInputButton::ButtonIconIndexSecondarySecondRow).isNull()) {
             qreal x = (item->position().x() + item->size().width()) * cellWidth -
                       HbSecondaryIconSizeInUnits * d->mUnitValue - HbHorizontalMarginInUnits * d->mUnitValue - d->mButtonBorderSize;
@@ -1550,6 +1653,7 @@
 
     }
 
+    // Draw button texts
     for (int i = 0; i < HbTextLayoutCount; ++i) {
         painter->save();
         painter->setPen(d->mColors.at(i % HbTextTypeCount));
@@ -1575,48 +1679,70 @@
         return false;
     }
 
-    if (event->type() == QEvent::TouchBegin) {
-        QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
-        foreach(const QTouchEvent::TouchPoint &point, touchEvent->touchPoints()) {
-            if (!point.isPrimary() && d->mMultiTouchEnabled) {
-                d->pressEvent(point.pos());
+    switch(event->type()) {
+        case QEvent::TouchBegin: {
+            QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
+            foreach(const QTouchEvent::TouchPoint &point, touchEvent->touchPoints()) {
+                if (!point.isPrimary() && d->mMultiTouchEnabled) {
+                    d->pressEvent(point.pos());
+                }
             }
+            break;
         }
-    } else if (event->type() == QEvent::TouchUpdate) {
-        QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
-        foreach(const QTouchEvent::TouchPoint &point, touchEvent->touchPoints()) {
-            if (!point.isPrimary() && d->mMultiTouchEnabled) {
-                if (point.state() & Qt::TouchPointPressed) {
-                    d->pressEvent(point.pos());
-                } else if (point.state() & Qt::TouchPointMoved) {
-                    d->moveEvent(point.lastPos(), point.pos());
-                } else if (point.state() & Qt::TouchPointReleased) {
+
+        case QEvent::TouchUpdate: {
+            QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
+            foreach(const QTouchEvent::TouchPoint &point, touchEvent->touchPoints()) {
+                if (!point.isPrimary() && d->mMultiTouchEnabled) {
+                    if (point.state() & Qt::TouchPointPressed) {
+                        d->pressEvent(point.pos());
+                    } else if (point.state() & Qt::TouchPointMoved) {
+                        d->moveEvent(point.lastPos(), point.pos());
+                    } else if (point.state() & Qt::TouchPointReleased) {
+                        d->releaseEvent(point.pos());
+                    }
+                }
+            }
+            break;
+        }
+
+        case QEvent::TouchEnd: {
+            QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
+            foreach(const QTouchEvent::TouchPoint &point, touchEvent->touchPoints()) {
+                if (!point.isPrimary() && d->mMultiTouchEnabled) {
                     d->releaseEvent(point.pos());
                 }
             }
+            break;
         }
-    } else if (event->type() == QEvent::TouchEnd) {
-        QTouchEvent *touchEvent = static_cast<QTouchEvent *>(event);
-        foreach(const QTouchEvent::TouchPoint &point, touchEvent->touchPoints()) {
-            if (!point.isPrimary() && d->mMultiTouchEnabled) {
-                d->releaseEvent(point.pos());
-            }
+
+        case QEvent::GraphicsSceneMousePress: {
+            QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
+            d->pressEvent(mouseEvent->pos());
+            break;
+        }
+
+        case QEvent::GraphicsSceneMouseDoubleClick: {
+            QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
+            d->doublePressEvent(mouseEvent->pos());
+            break;
         }
-    } else if (event->type() == QEvent::GraphicsSceneMousePress) {
-        QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
-        d->pressEvent(mouseEvent->pos());
-    } else if (event->type() == QEvent::GraphicsSceneMouseDoubleClick) {
-        QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
-        d->doublePressEvent(mouseEvent->pos());
-    } else if (event->type() == QEvent::GraphicsSceneMouseMove) {
-        QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
-        d->moveEvent(mouseEvent->lastPos(), mouseEvent->pos());
-    } else if (event->type() == QEvent::GraphicsSceneMouseRelease) {
-        QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
-        d->releaseEvent(mouseEvent->pos());
-        cancelButtonPress();
-    } else {
-        return HbWidget::event(event);
+
+        case QEvent::GraphicsSceneMouseMove: {
+            QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
+            d->moveEvent(mouseEvent->lastPos(), mouseEvent->pos());
+            break;
+        }
+
+        case QEvent::GraphicsSceneMouseRelease: {
+            QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
+            d->releaseEvent(mouseEvent->pos());
+            cancelButtonPress();
+            break;
+        }
+
+        default:
+            return HbWidget::event(event);
     }
     return true;
 }
@@ -1759,18 +1885,19 @@
 
     ungrabMouse();
 
-    for (int i = 0; i < d->mButtonData.count(); ++i) {
-        if (d->mButtonData.at(i)->state() == HbInputButton::ButtonStatePressed) {
-            d->mButtonData.at(i)->setState(HbInputButton::ButtonStateReleased);
-        }
-        d->hideButtonPreview(d->mButtonData.at(i));
+    // Cancel long press timers
+    d->mLongPressButtons.clear();
+    foreach (QTimer *timer, d->mLongPressTimers) {
+        delete timer;
+    }
+    d->mLongPressTimers.clear();
 
-        if (d->mLongPressButtons.contains(i)) {
-            int listIndex = d->mLongPressButtons.indexOf(i);
-            delete d->mLongPressTimers.at(listIndex);
-            d->mLongPressTimers.removeAt(listIndex);
-            d->mLongPressButtons.removeAt(listIndex);
+    // Release all buttons and close previews
+    foreach (HbInputButton *button, d->mButtonData) {
+        if (button->state() == HbInputButton::ButtonStatePressed) {
+            button->setState(HbInputButton::ButtonStateReleased);
         }
+        d->hideButtonPreview(button);
     }
     if (d->mCharacterSelectionPreview) {
         d->mCharacterSelectionPreview->hide();
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputbuttongroup_p.h
--- a/src/hbinput/inputwidgets/hbinputbuttongroup_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputbuttongroup_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -68,6 +68,13 @@
     virtual void createPrimaryTextLayout(int index, const QHash<int, QString> &textContent, const QSizeF &size);
     virtual void createSecondaryTextLayout(int index, const QHash<int, QString> &textContentt, const QSizeF &size);
 
+    virtual void layoutSecondaryText(int index, HbInputButton *item, QFontMetricsF &fontMetrics, const QSizeF &size,
+                                     HbInputButton::HbInputButtonTextIndex firstTextIndex,
+                                     HbInputButton::HbInputButtonIconIndex firstIconIndex,
+                                     HbInputButton::HbInputButtonTextIndex secondTextIndex,
+                                     HbInputButton::HbInputButtonIconIndex secondIconIndex,
+                                     HbInputButtonGroup::HbInputButtonTextType textType);
+
     virtual void layoutTextLine(HbInputButtonGroup::HbInputButtonTextType textType, const HbInputButton *button, const QSizeF &cellSize,
                                 QTextLine &textLine, const QSizeF &textSize);
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputcandidatelist.cpp
--- a/src/hbinput/inputwidgets/hbinputcandidatelist.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputcandidatelist.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -196,7 +196,10 @@
 void HbCandidateList::populateList(const QStringList &candidates, bool addSpellQuery)
 {
     Q_D(HbCandidateList);
-
+	// Only for the first time when we launch candidate list its not setting a layout, 
+	// Mostly the problem is form Qt side, for the time being to resolve issue related to candidate list
+	// making visible property true.  
+    setVisible(true);
     setContentWidget(d->mList);
 
     d->setPriority(HbPopupPrivate::VirtualKeyboard + 1);  // Should be shown on top of virtual keyboard.
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputcheckboxlist.cpp
--- a/src/hbinput/inputwidgets/hbinputcheckboxlist.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputcheckboxlist.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -28,6 +28,7 @@
 #include <hblistwidgetitem.h>
 #include <hbdataformmodelitem.h>
 #include <hbdataformmodel.h>
+#include "hbwidget_p.h"
 
 /// @cond
 
@@ -115,7 +116,10 @@
     d->mListWidget = new HbListWidget();
     d->mListWidget->setSelectionMode(HbAbstractItemView::MultiSelection);
     d->mListWidget->contentWidget()->setContentsMargins(10, 10, 10, 10);
-    d->mListWidget->setBackgroundItem(HbStyle::P_DataItem_background);
+    
+    // get listwidget's widget private ptr
+    HbWidgetPrivate *priv = static_cast<HbWidgetPrivate*>(HbWidgetBasePrivate::d_ptr(d->mListWidget));
+    priv->setBackgroundItem(HbStyle::P_DataItem_background);
     d->mListWidget->setScrollDirections(0);
 
     QStringList items = modelItem->contentWidgetData(QString("items")).toStringList();
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputexactwordpopup.cpp
--- a/src/hbinput/inputwidgets/hbinputexactwordpopup.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputexactwordpopup.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -39,7 +39,6 @@
 #include "hbinputsettingproxy.h"
 #include "hbframeitem.h"
 #include "hbframedrawer.h"
-#include "hbcolorscheme.h"
 #include "hbdialog_p.h"
 
 const qreal HbExactWordPopupHeight = 50.0;
@@ -201,11 +200,6 @@
     d->mPopupBackground->frameDrawer().setFrameType(HbFrameDrawer::NinePieces);
     d->mPopupBackground->frameDrawer().setFrameGraphicsName("qtg_fr_popup_secondary");
     d->mPopupBackground->setGeometry(boundingRect());
-
-	QColor col = HbColorScheme::color( "qtc_editor_normal" ); //popupforeground
-    if (col.isValid()) {
-        d->mText->setTextColor(col);
-    }
 }
 
 // this method is called whenever there is a switch of keypad usage from h/w to virtual
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputmethodselectionlist.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbinput/inputwidgets/hbinputmethodselectionlist.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,216 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbInput module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include "hbinputmethodselectionlist.h"
+
+#include <QGraphicsLinearLayout>
+
+#include <hbmainwindow.h>
+#include <hblistwidget.h>
+#include <hblistwidgetitem.h>
+#include <hbabstractviewitem.h>
+#include <hbinputmethod.h>
+#include <hbinputsettingproxy.h>
+#include <hbinputregioncollector_p.h>
+
+#include "hbdialog_p.h"
+
+/// @cond
+
+class HbInputMethodSelectionListPrivate : public HbDialogPrivate
+{
+    Q_DECLARE_PUBLIC(HbInputMethodSelectionList)
+
+public:
+    HbInputMethodSelectionListPrivate();
+
+    void createSelectionList();
+
+public:
+    HbListWidget *mList;
+    QList<int> mMethodIndices;
+
+};
+
+HbInputMethodSelectionListPrivate::HbInputMethodSelectionListPrivate()
+ : mList(0)
+{
+}
+
+void HbInputMethodSelectionListPrivate::createSelectionList()
+{
+    Q_Q(HbInputMethodSelectionList);
+
+    mList = new HbListWidget();
+    mList->setSelectionMode(HbAbstractItemView::SingleSelection);
+    mList->setItemRecycling(false);
+
+    HbInputSettingProxy *proxy = HbInputSettingProxy::instance();
+    HbInputMethodDescriptor descriptor = proxy->preferredInputMethod();
+    QByteArray customData = proxy->preferredInputMethodCustomData(q->mainWindow()->orientation());
+
+    QList<HbInputMethodDescriptor> methodList = HbInputMethod::listCustomInputMethods(q->mainWindow()->orientation(), proxy->globalInputLanguage());
+    methodList.insert(0, HbInputMethod::defaultInputMethod(q->mainWindow()->orientation()));
+
+    int selectedIndex = -1;
+    int index = -1;
+    for (int i = 0; i < methodList.count(); ++i) {
+        // If descriptor contains multiple display names, it supports multiple input methods
+        // which should be added one by one to the list
+        QStringList displayNames = methodList.at(i).displayNames();
+        if (!displayNames.isEmpty()) {
+            QList<HbIcon> icons = methodList.at(i).icons();
+            for (int j = 0; j < displayNames.count(); ++j) {
+                HbListWidgetItem* item = new HbListWidgetItem();
+                QString displayName = displayNames.at(j);
+                item->setText(displayName);
+                if (j < icons.count()) {
+                    item->setIcon(icons.at(j));
+                } else {
+                    item->setIcon(methodList.at(i).icon());
+                }
+                mList->addItem(item);
+                mMethodIndices.append(i);
+                ++index;
+
+                if (descriptor.pluginNameAndPath() == methodList.at(i).pluginNameAndPath() &&
+                    QString::fromUtf8(customData) == displayName) {
+                  selectedIndex = index;
+               }
+            }
+        } else {
+            // Descriptor contains information about one input method
+            HbListWidgetItem* item = new HbListWidgetItem();
+            QString displayName = methodList.at(i).displayName();
+            item->setText(displayName);
+            item->setIcon(methodList.at(i).icon());
+            mList->addItem(item);
+            mMethodIndices.append(i);
+            ++index;
+    
+            if (descriptor.pluginNameAndPath() == methodList.at(i).pluginNameAndPath() &&
+                descriptor.displayName() == displayName ) {
+                selectedIndex = index;
+            }
+        }
+    }
+
+    // Default input method doesn't have valid plugin name, so set the index directly
+    if (descriptor.isDefault() || descriptor.pluginNameAndPath().isEmpty()) {
+        selectedIndex = 0;
+    }
+
+    HbAbstractViewItem *viewItem = mList->viewItem(selectedIndex);
+    if (viewItem) {
+        mList->setCurrentIndex(viewItem->modelIndex(), QItemSelectionModel::Select);
+    }
+}
+
+/// @endcond
+
+/*!
+Constructs input method selection list
+*/
+HbInputMethodSelectionList::HbInputMethodSelectionList(QGraphicsWidget* parent)
+ : HbDialog(*new HbInputMethodSelectionListPrivate(), parent)
+{
+    Q_D(HbInputMethodSelectionList);
+    HbInputRegionCollector::instance()->attach(this);
+
+    HbStyle style;
+    qreal listWidth(300);
+    style.parameter(QString("expr(var(hb-param-screen-short-edge)-(2*var(hb-param-margin-gene-screen)))"), listWidth);
+    qreal margin(5);
+    style.parameter(QString("hb-param-margin-gene-popup"), margin);
+
+    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout();
+    layout->setContentsMargins(margin, margin, margin, margin);
+
+    // set default values for popup
+    setTimeout(HbDialog::NoTimeout);
+    setBackgroundFaded(false);
+    setDismissPolicy(TapOutside);
+    setPreferredWidth(listWidth);
+    setModal(true);
+
+    // Make sure input method selection list never steals focus.
+    setFlag(QGraphicsItem::ItemIsPanel, true);
+    setActive(false);
+
+    d->createSelectionList();
+
+    layout->addItem(d->mList);
+    QGraphicsWidget *content = new QGraphicsWidget(this);
+    content->setLayout(layout);
+    setContentWidget(content);
+
+    connect(d->mList, SIGNAL(activated(HbListWidgetItem*)), this, SLOT(activateSelectedMethod(HbListWidgetItem*)));
+    connect(d->mList, SIGNAL(longPressed(HbListWidgetItem*, const QPointF&)), this, SLOT(activateSelectedMethod(HbListWidgetItem*)));
+}
+
+/*!
+Destructs the object.
+*/
+HbInputMethodSelectionList::~HbInputMethodSelectionList()
+{
+}
+
+/*!
+Called when input method is selected from the list. Signal inputMethodSelected
+is emitted with selected input method as parameter.
+*/
+void HbInputMethodSelectionList::activateSelectedMethod(HbListWidgetItem *item)
+{
+    Q_D(HbInputMethodSelectionList);
+
+    int index = d->mMethodIndices.at(d->mList->row(item));
+    QByteArray customData;
+
+    HbInputMethodDescriptor selectedMethod;
+
+    if (index == 0) {
+        selectedMethod = HbInputMethod::defaultInputMethod(mainWindow()->orientation());
+
+        if (!selectedMethod.displayNames().isEmpty()) {
+            customData = selectedMethod.displayNames().at(d->mList->row(item)).toUtf8();
+        }
+    } else {
+        HbInputSettingProxy *proxy = HbInputSettingProxy::instance();
+        QList<HbInputMethodDescriptor> customList = HbInputMethod::listCustomInputMethods(mainWindow()->orientation(), proxy->globalInputLanguage());
+        selectedMethod = customList.at(index - 1);
+
+        int firstItemIndex = d->mMethodIndices.indexOf(index);
+
+        if (!selectedMethod.displayNames().isEmpty()) {
+            customData = selectedMethod.displayNames().at(d->mList->row(item) - firstItemIndex).toUtf8();
+        }
+    }
+
+    close();
+
+    emit inputMethodSelected(selectedMethod, customData);
+}
+
+// End of file
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputmethodselectionlist.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbinput/inputwidgets/hbinputmethodselectionlist.h	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbInput module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HB_INPUT_METHOD_SELECTION_LIST_H
+#define HB_INPUT_METHOD_SELECTION_LIST_H
+
+#include <hbdialog.h>
+#include <hbinputdef.h>
+
+class HbInputMethodSelectionListPrivate;
+class HbListWidgetItem;
+class HbInputMethodDescriptor;
+
+class HB_INPUT_EXPORT HbInputMethodSelectionList : public HbDialog
+{
+    Q_OBJECT
+
+public:
+    HbInputMethodSelectionList(QGraphicsWidget* parent = 0);
+    virtual ~HbInputMethodSelectionList();
+
+public slots:
+    void activateSelectedMethod(HbListWidgetItem *item);
+
+signals:
+    void inputMethodSelected(const HbInputMethodDescriptor &descriptor, const QByteArray &customData);
+
+private:
+    Q_DECLARE_PRIVATE_D(d_ptr, HbInputMethodSelectionList)
+    Q_DISABLE_COPY(HbInputMethodSelectionList)   
+};
+
+#endif // HB_INPUT_METHOD_SELECTION_LIST_H
+
+// End of file
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputscreenshotwidget.cpp
--- a/src/hbinput/inputwidgets/hbinputscreenshotwidget.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputscreenshotwidget.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -96,7 +96,6 @@
     // Make sure the keypad never steals focus.
     setFlag(QGraphicsItem::ItemIsPanel, true);
     setActive(false);
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
 }
 
 /*!
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputsctkeyboard.cpp
--- a/src/hbinput/inputwidgets/hbinputsctkeyboard.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsctkeyboard.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -38,9 +38,9 @@
 #include "hbinputbuttongroup.h"
 #include "hbinputbutton.h"
 
-const qreal HbPortraitKeyboardHeightInUnits = 46.8;
+const qreal HbPortraitKeyboardHeightInUnits = 45.9;
 const qreal HbPortraitKeyboardWidthInUnits = 53.8;
-const qreal HbLandscapeKeyboardHeightInUnits = 34.6;
+const qreal HbLandscapeKeyboardHeightInUnits = 33.7;
 const qreal HbLandscapeKeyboardWidthInUnits = 95.5;
 
 const int HbSctPortraitNumberOfRows = 5;
@@ -117,6 +117,17 @@
     HbInputButton::ButtonKeyCodeCustom
 };
 
+const int HbSctSpaceMarker = 0xE118;
+const int HbSctEnterMarker = 0xE125;
+
+#if defined(Q_OS_SYMBIAN)
+const QChar HbSctSpaceGlyph = 0xF800;
+const QChar HbSctEnterGlyph = 0xF801;
+#else
+const QChar HbSctSpaceGlyph = ' ';
+const QChar HbSctEnterGlyph = ' ';
+#endif
+
 /*!
 @proto
 @hbinput
@@ -175,10 +186,15 @@
                 ++key;
             } else if (keyCode(i) == HbInputButton::ButtonKeyCodeDelete &&
                        mType == HbKeyboardSctPortrait) {
+                // Portrait SCT has different delete icon from the default one
                 item->setIcon(HbIcon(HbInputButtonIconDelete2), HbInputButton::ButtonIconIndexPrimary);
-            } else if (keyCode(i) == HbInputButton::ButtonKeyCodePageChange &&
-                       mType == HbKeyboardSctPortrait) {
-                item->setIcon(HbIcon(HbInputButtonIconPageChange2), HbInputButton::ButtonIconIndexPrimary);
+            } else if (keyCode(i) == HbInputButton::ButtonKeyCodeAlphabet) {
+                // Button that is used to return to normal keypad should be shown as latched
+                item->setState(HbInputButton::ButtonStateLatched);
+                if (mType == HbKeyboardSctPortrait) {
+                    // Portrait SCT has different symbol icon from the default one
+                    item->setIcon(HbIcon(HbInputButtonIconSymbol2), HbInputButton::ButtonIconIndexPrimary);
+                }
             }
             ++key;
         }
@@ -234,6 +250,15 @@
                 } else if (item->state() == HbInputButton::ButtonStateDisabled) {
                     state = HbInputButton::ButtonStateReleased;
                 }
+            } else if (keyCode(i) == HbInputButton::ButtonKeyCodeAlphabet) {
+                state = HbInputButton::ButtonStateLatched;
+            } else if (keyCode(i) == HbInputButton::ButtonKeyCodeSpace) {
+                bool allowed = focusedObject->characterAllowedInEditor(QChar(' '));
+                if (!allowed) {
+                    state = HbInputButton::ButtonStateDisabled;
+                } else if (item->state() == HbInputButton::ButtonStateDisabled) {
+                    state = HbInputButton::ButtonStateReleased; 
+                }
             }
             item->setState(state);
         }
@@ -264,7 +289,14 @@
                 HbInputButton *item = buttons.at(i);
 
                 if (keyboardMap && key < keyboardMap->keys.count()) {
-                    item->setKeyCode(keyboardMap->keys.at(key)->keycode.unicode());
+                    // Replace space and enter markers with correct keycodes
+                    if (keyboardMap->keys.at(key)->keycode.unicode() == HbSctSpaceMarker) {
+                        item->setKeyCode(HbInputButton::ButtonKeyCodeSpace);
+                    } else if (keyboardMap->keys.at(key)->keycode.unicode() == HbSctEnterMarker) {
+                        item->setKeyCode(HbInputButton::ButtonKeyCodeEnter);
+                    } else {
+                        item->setKeyCode(keyboardMap->keys.at(key)->keycode.unicode());
+                    }
                 } else {
                     item->setKeyCode(-1);
                 }
@@ -289,12 +321,23 @@
                 const HbKeyboardMap *keyboardMap = mKeymap->keyboard(q->keyboardType());
                 if (keyboardMap && key < keyboardMap->keys.count() && keyboardMap->keys.at(key)->characters(HbModifierNone) != QString("")) {
                     QString keydata = keyboardMap->keys.at(key)->characters(HbModifierNone);
-                    item->setText(keydata.at(0), HbInputButton::ButtonTextIndexPrimary);
+                    // Replace space and enter markers with correct glyphs.
+                    // These only exist in symbian fonts, so if we are not using symbian, use blank.
+                    if (keydata.at(0) == HbSctSpaceMarker) {
+                        item->setText(HbSctSpaceGlyph, HbInputButton::ButtonTextIndexPrimary);
+                    } else if (keydata.at(0) == HbSctEnterMarker) {
+                        item->setText(HbSctEnterGlyph, HbInputButton::ButtonTextIndexPrimary);
+                    } else {
+                        item->setText(keydata.at(0), HbInputButton::ButtonTextIndexPrimary);
+                    }
                 } else {
                     item->setText("", HbInputButton::ButtonTextIndexPrimary);
                 }
 
                 ++key;
+            } else if (keyCode(i) == HbInputButton::ButtonKeyCodePageChange) {
+                HbInputButton *item = buttons.at(i);
+                item->setText(QString::number(mActivePage+1) + '/' + QString::number(mPages), HbInputButton::ButtonTextIndexSecondaryFirstRow);
             }
         }
         buttonGroup->setButtons(buttons);
@@ -435,9 +478,9 @@
 
     if (flickDirection == HbInputVkbWidget::HbFlickDirectionRight ||
         flickDirection == HbInputVkbWidget::HbFlickDirectionLeft) {
-        int direction = -1;
+        int direction = 1;
         if (flickDirection == HbInputVkbWidget::HbFlickDirectionRight) {
-            direction = 1;
+            direction = -1;
         }
 
         d->mActivePage = (d->mActivePage + direction) % d->mPages;
@@ -466,12 +509,10 @@
 */
 void HbSctKeyboard::sendKeyReleaseEvent(const QKeyEvent &event)
 {
-    Q_D(HbSctKeyboard);
-
     if (event.key() == HbInputButton::ButtonKeyCodePageChange) {
-        changePage(HbInputVkbWidget::HbFlickDirectionRight);
+        changePage(HbInputVkbWidget::HbFlickDirectionLeft);
     } else if (event.key() == HbInputButton::ButtonKeyCodeSmiley) {
-        showSmileyPicker(d->mRows, d->mColumns);
+        showSmileyPicker();
     } else {
         HbInputVkbWidget::sendKeyReleaseEvent(event);
     }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputsettinglist.cpp
--- a/src/hbinput/inputwidgets/hbinputsettinglist.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsettinglist.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -27,6 +27,7 @@
 #include <QGraphicsLinearLayout>
 #include <QGraphicsGridLayout>
 
+#include <hbmainwindow.h>
 #include <hblabel.h>
 #include <hbpushbutton.h>
 #include <hblistwidget.h>
@@ -36,20 +37,28 @@
 #include <hbinpututils.h>
 #include <hbinputpredictionfactory.h>
 #include <hbinputregioncollector_p.h>
+#include <hbinputmethodselectionlist.h>
 
 #include "hbdialog_p.h"
 
 const QString settingsIcon("qtg_mono_settings");
 const QString inputMethodIcon("qtg_mono_virtual_input");
 
+const qreal HbSelectionListMarginInUnits = 0.8;
+const qreal HbSelectionListLandscapeAlignInUnits = 9.4;
+
 /// @cond
 
 class HbInputSettingListPrivate : public HbDialogPrivate
 {
+    Q_DECLARE_PUBLIC(HbInputSettingList)
+
 public:
     HbInputSettingListPrivate();
+    ~HbInputSettingListPrivate();
 
     qreal languageNameWidth();
+    void showInputMethodSelectionList();
 
 public:
     HbPushButton *mLanguageButton;
@@ -58,13 +67,19 @@
     HbInputLanguage mPrimaryLanguage;
     HbInputLanguage mSecondaryLanguage;
     QList<QString> mPredictionValues;
+    HbInputMethodSelectionList *mInputMethodSelectionList;
 };
 
 HbInputSettingListPrivate::HbInputSettingListPrivate()
-    : mLanguageButton(0), mPredictionButton(0), mOptionList(0)
+ : mLanguageButton(0), mPredictionButton(0), mOptionList(0), mInputMethodSelectionList(0)
 {
 }
 
+HbInputSettingListPrivate::~HbInputSettingListPrivate()
+{
+    delete mInputMethodSelectionList;
+}
+
 qreal HbInputSettingListPrivate::languageNameWidth()
 {
     qreal nameWidth(0);
@@ -82,6 +97,30 @@
     return nameWidth;
 }
 
+void HbInputSettingListPrivate::showInputMethodSelectionList()
+{
+    Q_Q(HbInputSettingList);
+
+    delete mInputMethodSelectionList;
+    mInputMethodSelectionList = new HbInputMethodSelectionList();
+    mInputMethodSelectionList->setObjectName("Input method selection list");
+
+    qreal unitValue = HbDeviceProfile::profile(q->mainWindow()).unitValue();
+
+    QPointF position(q->scenePos().x() + q->size().width(),
+                     mOptionList->scenePos().y() - HbSelectionListMarginInUnits * unitValue);
+
+    if (q->mainWindow()->orientation() == Qt::Horizontal) {
+        position.setX(position.x() - HbSelectionListLandscapeAlignInUnits * unitValue);
+    }
+    
+    mInputMethodSelectionList->setPreferredPos(position, HbPopup::BottomRightCorner);
+
+    QObject::connect(mInputMethodSelectionList, SIGNAL(inputMethodSelected(const HbInputMethodDescriptor &, const QByteArray &)),
+                     q, SLOT(closeSettings(const HbInputMethodDescriptor &, const QByteArray &)));
+    mInputMethodSelectionList->show();
+}
+
 /// @endcond
 
 /*!
@@ -93,6 +132,13 @@
     Q_D(HbInputSettingList);
     HbInputRegionCollector::instance()->attach(this);
 
+    // Get correct size from style parameters
+    HbStyle style;
+    qreal listWidth(300);
+    style.parameter(QString("expr(var(hb-param-screen-short-edge)-(2*var(hb-param-margin-gene-screen)))"), listWidth);
+    qreal margin(5);
+    style.parameter(QString("hb-param-margin-gene-popup"), margin);
+
     QGraphicsLinearLayout *mainLayout = new QGraphicsLinearLayout(Qt::Vertical);
     QGraphicsGridLayout *gridLayout = new QGraphicsGridLayout();
 
@@ -113,24 +159,25 @@
     d->mOptionList->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
     d->mOptionList->setObjectName("Input options list");
     d->mOptionList->addItem(HbIcon(settingsIcon), tr("Input settings"));
-    d->mOptionList->setPreferredWidth(300);
+    d->mOptionList->setContentsMargins(0, 0, 0, 0);
+    d->mOptionList->setPreferredWidth(listWidth - 2 * margin);
 
     gridLayout->addItem(languageLabel, 0, 0);
     gridLayout->addItem(d->mLanguageButton, 0, 1);
     gridLayout->addItem(predictionLabel, 1, 0);
     gridLayout->addItem(d->mPredictionButton, 1, 1);
+    gridLayout->setContentsMargins(0, 0, 0, 0);
 
-    qreal buttonWidth = 30 + d->languageNameWidth();
-    gridLayout->setColumnFixedWidth(0, 300 - buttonWidth);
-    gridLayout->setColumnFixedWidth(1, buttonWidth);
-
-    qreal buttonHeight = buttonWidth * 0.4;
-    gridLayout->setRowFixedHeight(0, buttonHeight);
-    gridLayout->setRowFixedHeight(1, buttonHeight);
+    // Width for language button is based on the width of language name string and button margins
+    qreal buttonMargin(20);
+    style.parameter(QString("expr(var(hb-param-margin-gene-left)+var(hb-param-margin-gene-right))"), buttonMargin);
+    gridLayout->setColumnFixedWidth(1, buttonMargin + d->languageNameWidth());
 
     mainLayout->addItem(gridLayout);
     mainLayout->addItem(d->mOptionList);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     QGraphicsWidget *content = new QGraphicsWidget(this);
+    content->setContentsMargins(0, 0, 0, 0);
     content->setLayout(mainLayout);
     setContentWidget(content);
 
@@ -141,8 +188,10 @@
     setTimeout(HbDialog::NoTimeout);
     setBackgroundFaded(false);
     setDismissPolicy(TapOutside);
+    setContentsMargins(margin, margin, margin, margin);
+    setPreferredWidth(listWidth);
 
-    // Make sure the custom button list never steals focus.
+    // Make sure the input settings list never steals focus.
     setFlag(QGraphicsItem::ItemIsPanel, true);
     setActive(false);
 
@@ -155,6 +204,8 @@
     connect(settings, SIGNAL(globalInputLanguageChanged(const HbInputLanguage &)), this, SLOT(primaryLanguageChanged(const HbInputLanguage &)));
     connect(settings, SIGNAL(globalSecondaryInputLanguageChanged(const HbInputLanguage &)), this, SLOT(secondaryLanguageChanged(const HbInputLanguage &)));
     connect(settings, SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)), this, SLOT(predictionStatusChanged(HbKeyboardSettingFlags, bool)));
+
+    connect(this, SIGNAL(aboutToClose()), this, SLOT(aboutToClose()));
 }
 
 /*!
@@ -178,7 +229,7 @@
     d->mLanguageButton->setText(d->mPrimaryLanguage.localisedName());
     d->mPredictionButton->setText(d->mPredictionValues.at(settings->predictiveInputStatusForActiveKeyboard()));
 
-    QList<HbInputMethodDescriptor> customList = HbInputMethod::listCustomInputMethods();
+    QList<HbInputMethodDescriptor> customList = HbInputMethod::listCustomInputMethods(mainWindow()->orientation(), d->mPrimaryLanguage);
     bool showInputMethod = true;
     if (customList.count() < 1) {
         showInputMethod = false;
@@ -212,6 +263,18 @@
 }
 
 /*!
+Closes input method selection if settings is closed
+*/
+void HbInputSettingList::aboutToClose()
+{
+    Q_D(HbInputSettingList);
+
+    if (d->mInputMethodSelectionList) {
+        d->mInputMethodSelectionList->close();
+    }
+}
+
+/*!
 Swaps current primary and secondary languages
 */
 void HbInputSettingList::languageButtonClicked()
@@ -259,11 +322,10 @@
 
     if (d->mOptionList->row(item) == d->mOptionList->count() - 1) {
         emit inputSettingsButtonClicked();
+        close();
     } else {
-        emit inputMethodsButtonClicked();
+        d->showInputMethodSelectionList();
     }
-
-    close();
 }
 
 /*!
@@ -300,4 +362,13 @@
     d->mPredictionButton->setText(d->mPredictionValues.at(status));
 }
 
+/*!
+Closes settings and emits inputMethodSelected signal with given parameter
+*/
+void HbInputSettingList::closeSettings(const HbInputMethodDescriptor &descriptor, const QByteArray &customData)
+{
+    close();
+    emit inputMethodSelected(descriptor, customData);
+}
+
 // End of file
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputsettinglist.h
--- a/src/hbinput/inputwidgets/hbinputsettinglist.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsettinglist.h	Tue Jul 06 14:36:53 2010 +0300
@@ -32,6 +32,7 @@
 class HbInputSettingListPrivate;
 class HbListWidgetItem;
 class HbInputLanguage;
+class HbInputMethodDescriptor;
 
 class HB_INPUT_EXPORT HbInputSettingList : public HbDialog
 {
@@ -47,16 +48,19 @@
     void setPredictionSelectionEnabled(bool disabled);
 
 public slots:
+    void aboutToClose();
     void languageButtonClicked();
     void predictionButtonClicked();
     void listItemActivated(HbListWidgetItem *item);
     void primaryLanguageChanged(const HbInputLanguage &newLanguage);
     void secondaryLanguageChanged(const HbInputLanguage &newLanguage);
     void predictionStatusChanged(HbKeyboardSettingFlags keyboardType, bool newStatus);
+    void closeSettings(const HbInputMethodDescriptor &descriptor, const QByteArray &customData);
 
 signals:
     void inputMethodsButtonClicked();
     void inputSettingsButtonClicked();
+    void inputMethodSelected(const HbInputMethodDescriptor &descriptor, const QByteArray &customData);
 
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbInputSettingList)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputsettingwidget.cpp
--- a/src/hbinput/inputwidgets/hbinputsettingwidget.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsettingwidget.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -29,17 +29,82 @@
 #include <hbinpututils.h>
 #include <hbinputsettingproxy.h>
 #include <hbinputpredictionfactory.h>
+#include <QInputContextPlugin>
+#include <QLibrary>
+#include <QPluginLoader>
+#include <QDir>
 #include <QtAlgorithms>
 
 #include "hbinputcheckboxlist_p.h"
+#include "hbinputsettingproxy_p.h"
+#include <hbinputmethoddescriptor.h>
 
 const QString statusOff = QObject::tr("Off");
 const QString statusOn = QObject::tr("On");
 const QString bestPrediction = QObject::tr("Best prediction");
 const QString exactTyping = QObject::tr("Exact typing");
 
+/// @cond
+// input modes name for chinese
+const QString KPinyinName("Pinyin");
+const QString KStrokeName("Stroke");
+const QString KZhuyinName("Zhuyin");
+const QString KCangjieNormalName("CangjieNormal");
+const QString KCangjieEasyName("CangjieEasy");
+const QString KCangjieAdvancedName("CangjieAdvanced");
+const QString KHwrName("Handwriting");
+const QString KHwrVerySlowName("VerySlow");
+const QString KHwrSlowName("Slow");
+const QString KHwrNormalName("Normal");
+const QString KHwrFastName("Fast");
+const QString KHwrVeryFastName("VeryFast");
 
-/// @cond
+// strings used for represent cangjie
+const QString KCangjieGeneralName("Cangjie");
+const QString KEasy("Easy");
+const QString KNormal("Normal");
+const QString KAdvanced("Advanced");
+
+// input modes value for chinese
+const int KChineseInputModeNone = -1;
+const int KPinyinMode = 0;
+const int KStrokeMode = 1;
+const int KZhuyinMode = 2;
+const int KCangjieNormalMode = 3;
+const int KCangjieEasyMode = 4;
+const int KCangjieAdvancedMode = 5;
+const int KHwrMode = 6;
+
+// define chinese input plugin name
+#ifdef Q_OS_WIN
+const QString KCnHwrPluginName("HbChineseHwrd.dll");
+#else
+#ifdef Q_OS_SYMBIAN
+const QString KCnHwrPluginName("HbChineseHwr.qtplugin");
+#else
+const QString KCnHwrPluginName("HbChineseHwr.dll");
+#endif
+#endif
+
+#ifdef Q_OS_WIN
+const QString KCnVItutPluginName("HbChineseVItutd.dll");
+#else
+#ifdef Q_OS_SYMBIAN
+const QString KCnVItutPluginName("HbChineseVItut.qtplugin");
+#else
+const QString KCnVItutPluginName("HbChineseVItut.dll");
+#endif
+#endif
+
+#ifdef Q_OS_WIN
+const QString KCnVkbPluginName("HbChineseVkbd.dll");
+#else
+#ifdef Q_OS_SYMBIAN
+const QString KCnVkbPluginName("HbChineseVkb.qtplugin");
+#else
+const QString KCnVkbPluginName("HbChineseVkb.dll");
+#endif
+#endif
 
 class HbInputSettingWidgetPrivate
 {
@@ -55,6 +120,14 @@
     HbInputLanguage indexToLanguage(int index, const QList<HbInputLanguage> &languageList);
     void createSecondaryLanguageList();
     void updateContentWidgetData();
+    int inputModeToIndex(const int &inputMode, const QList<int> &inputModeList);
+    int indexToInputmode(int index, const QList<int> &inputModeList);
+    void createChineseSettingGroup(HbDataFormModel *model);
+
+    QInputContextPlugin *pluginInstance(const QString &pluginFileName) const;
+    HbInputMethodDescriptor findInputMethodDescriptor(const QString &inputMethodString);
+    void setInputMethodVar(Qt::Orientation orientation, QString &inputMethodString, QByteArray &num);
+    QByteArray createHwrSpeedData(QByteArray preferredCustomData, int index);
 public:
     HbDataForm *mForm;
     HbDataFormModelItem *mPrimaryLanguageItem;
@@ -79,17 +152,49 @@
     HbPrimaryCandidateMode mPrimaryCandidateMode;
     HbInputSettingWidget *q_ptr;
     HbDataFormModel *mModel;
+
+    // member variables for chinese
+    HbDataFormModelItem *mLanguageGroup;
+    HbDataFormModelItem *mChineseInputGroup;
+    HbDataFormModelItem *mPortraitInputMethodItem;
+    HbDataFormModelItem *mLandscapeInputMethodItem;
+    HbDataFormModelItem *mHwrSpeedItem;
+    HbDataFormModelItem *mCangjieItem;
+    int mCnPortraitInputMode;
+    int mCnLandscapeInputMode;
+    int mCnCangjieInputMode;
+
+    int mHwrSpeed;
+    QList<int> mCnPortraitInputModeList;
+    QList<int> mCnLandscapeInputModeList;
+    QList<int> mCangjieInputModeList;
+    QStringList mCnPortraitInputModeNames;
+    QStringList mCnLandscapeInputModeNames;
+    QStringList mCnCangjieInputModeNames;
+    QStringList mHwrSpeedNames;
 };
 
 /*!
 Constructs setting widget
 */
 HbInputSettingWidgetPrivate::HbInputSettingWidgetPrivate(HbDataForm *dataForm)
- : mForm(dataForm), mPrimaryLanguageItem(NULL),
-   mSecondaryLanguageItem(NULL), mKeypressTimeoutItem(NULL),
-   mCharacterPreviewItem(NULL), mPredictionItem(NULL),
-   mAutoCompletionItem(NULL), mCorrectionLevelItem(NULL),
-   mPrimaryCandidateItem(NULL), q_ptr(NULL), mModel(0)
+    : mForm(dataForm),
+      mPrimaryLanguageItem(0),
+      mSecondaryLanguageItem(0),
+      mKeypressTimeoutItem(0),
+      mCharacterPreviewItem(0),
+      mPredictionItem(0),
+      mAutoCompletionItem(0),
+      mCorrectionLevelItem(0),
+      mPrimaryCandidateItem(0),
+      q_ptr(0),
+      mModel(0),
+      mLanguageGroup(0),
+      mChineseInputGroup(0),
+      mPortraitInputMethodItem(0),
+      mLandscapeInputMethodItem(0),
+      mHwrSpeedItem(0),
+      mCangjieItem(0)
 {
 }
 
@@ -128,7 +233,161 @@
     }
 }
 
-void HbInputSettingWidgetPrivate::updateContentWidgetData() 
+void HbInputSettingWidgetPrivate::createChineseSettingGroup(HbDataFormModel *model)
+{
+    Q_Q(HbInputSettingWidget);
+    int imMode = KChineseInputModeNone;
+    QByteArray ba = HbInputSettingProxy::instance()->preferredInputMethodCustomData(Qt::Vertical);
+    QString portraitCustomData(ba);
+    QString imName = portraitCustomData.split(" ").at(0);
+    HbInputLanguage lang = HbInputSettingProxy::instance()->globalInputLanguage();
+
+    if (imName == KPinyinName) {
+        imMode = KPinyinMode;
+    } else if (imName == KStrokeName) {
+        imMode = KStrokeMode;
+    } else if (imName == KZhuyinName) {
+        imMode = KZhuyinMode;
+    } else if (imName == KHwrName) {
+        imMode = KHwrMode;
+    } else {
+        if (lang.variant() == QLocale::China) {
+            imMode = KPinyinMode;
+        } else if (lang.variant() == QLocale::HongKong) {
+            imMode = KStrokeMode;
+        } else if (lang.variant() == QLocale::Taiwan) {
+            imMode = KZhuyinMode;
+        }
+    }
+
+    mCnPortraitInputMode = imMode;
+
+    ba = HbInputSettingProxy::instance()->preferredInputMethodCustomData(Qt::Horizontal);
+    QString landscapeCustomData(ba);
+    imName = landscapeCustomData.split(" ").at(0);
+
+    mCnCangjieInputMode = KCangjieNormalMode;
+    if (imName == KPinyinName) {
+        mCnLandscapeInputMode = KPinyinMode;
+    } else if (imName == KStrokeName) {
+        mCnLandscapeInputMode = KStrokeMode;
+    } else if (imName == KZhuyinName) {
+        mCnLandscapeInputMode = KZhuyinMode;
+    } else if (imName == KCangjieNormalName) {
+        mCnLandscapeInputMode = KCangjieNormalMode;
+        mCnCangjieInputMode = KCangjieNormalMode;
+    } else if (imName == KCangjieEasyName) {
+        mCnLandscapeInputMode = KCangjieNormalMode;
+        mCnCangjieInputMode = KCangjieEasyMode;
+    } else if (imName == KCangjieAdvancedName) {
+        mCnLandscapeInputMode = KCangjieNormalMode;
+        mCnCangjieInputMode = KCangjieAdvancedMode;
+    } else if (imName == KHwrName) {
+        mCnLandscapeInputMode = KHwrMode;
+    } else {
+        if (lang.variant() == QLocale::China) {
+            mCnLandscapeInputMode = KPinyinMode;
+        } else if (lang.variant() == QLocale::HongKong) {
+            mCnLandscapeInputMode = KStrokeMode;
+        } else if (lang.variant() == QLocale::Taiwan) {
+            mCnLandscapeInputMode = KZhuyinMode;
+        }
+    }
+
+    Qt::Orientation orientation = HbInputSettingProxy::instance()->screenOrientation();
+    ba = HbInputSettingProxy::instance()->preferredInputMethodCustomData(orientation);
+    QString customData(ba);
+    if (customData.split(" ").count() > 1) {
+        imName = customData.split(" ").at(1);
+        if (imName == KHwrVerySlowName) {
+            mHwrSpeed = 0;
+        } else if (imName == KHwrSlowName) {
+            mHwrSpeed = 1;
+        } else if (imName == KHwrNormalName) {
+            mHwrSpeed = 2;
+        } else if (imName == KHwrFastName) {
+            mHwrSpeed = 3;
+        } else if (imName == KHwrVeryFastName) {
+            mHwrSpeed = 4;
+        } else {
+            mHwrSpeed = 2;
+        }
+    } else {
+        mHwrSpeed = 2;
+    }
+
+    mHwrSpeedNames.clear();
+    mCnPortraitInputModeList.clear();
+    mCnLandscapeInputModeList.clear();
+    mCnPortraitInputModeNames.clear();
+    mCnLandscapeInputModeNames.clear();
+    mCnCangjieInputModeNames.clear();
+
+    mHwrSpeedNames << "Very slow" << "Slow" << "Normal" << "Fast" << "Very Fast";
+    if (mPrimaryInputLanguage == HbInputLanguage(QLocale::Chinese, QLocale::China)) {
+        mCnPortraitInputModeList << KPinyinMode << KStrokeMode << KHwrMode;
+        mCnLandscapeInputModeList << KPinyinMode << KStrokeMode << KHwrMode;
+        mCnPortraitInputModeNames << KPinyinName << KStrokeName << KHwrName;
+        mCnLandscapeInputModeNames << KPinyinName << KStrokeName << KHwrName;
+    } else if (mPrimaryInputLanguage == HbInputLanguage(QLocale::Chinese, QLocale::HongKong)) {
+        mCnPortraitInputModeList << KStrokeMode << KHwrMode;
+        mCnLandscapeInputModeList << KStrokeMode << KCangjieNormalMode << KHwrMode;
+        mCangjieInputModeList << KCangjieEasyMode << KCangjieNormalMode << KCangjieAdvancedMode;
+        mCnPortraitInputModeNames << KStrokeName << KHwrName;
+        mCnLandscapeInputModeNames << KStrokeName << KCangjieGeneralName << KHwrName;
+        mCnCangjieInputModeNames << KEasy << KNormal << KAdvanced;
+    } else if (mPrimaryInputLanguage == HbInputLanguage(QLocale::Chinese, QLocale::Taiwan)) {
+        mCnPortraitInputModeList << KZhuyinMode << KHwrMode;
+        mCnLandscapeInputModeList << KZhuyinMode << KHwrMode;
+        mCnPortraitInputModeNames << KZhuyinName << KHwrName;
+        mCnLandscapeInputModeNames << KZhuyinName << KHwrName;
+    }
+
+    if (!mChineseInputGroup) {
+        mChineseInputGroup = model->appendDataFormGroup(QObject::tr("Chinese Input"));
+        mPortraitInputMethodItem = new HbDataFormModelItem(HbDataFormModelItem::ComboBoxItem, QObject::tr("Portrait mode input method"));
+        mChineseInputGroup->appendChild(mPortraitInputMethodItem);
+        mPortraitInputMethodItem->setContentWidgetData(QString("items"), mCnPortraitInputModeNames);
+        int imIdx = inputModeToIndex(mCnPortraitInputMode, mCnPortraitInputModeList);
+        QVariant varPor;
+        varPor.setValue(imIdx);
+        mPortraitInputMethodItem->setContentWidgetData(QString("currentIndex"), varPor);
+        mPortraitInputMethodItem->setContentWidgetData(QString("objectName"), QString("portrait_input_method"));
+        mForm->addConnection(mPortraitInputMethodItem, SIGNAL(currentIndexChanged(int)), q, SLOT(setPortraitInputMethod(int)));
+
+        mLandscapeInputMethodItem = new HbDataFormModelItem(HbDataFormModelItem::ComboBoxItem, QObject::tr("Landscape mode input method"));
+        mChineseInputGroup->appendChild(mLandscapeInputMethodItem);
+        mLandscapeInputMethodItem->setContentWidgetData(QString("items"), mCnLandscapeInputModeNames);
+        int imIdx_lan = inputModeToIndex(mCnLandscapeInputMode, mCnLandscapeInputModeList);
+        QVariant varLan;
+        varLan.setValue(imIdx_lan);
+        mLandscapeInputMethodItem->setContentWidgetData(QString("currentIndex"), varLan);
+        mLandscapeInputMethodItem->setContentWidgetData(QString("objectName"), QString("landscape_input_method"));
+        mForm->addConnection(mLandscapeInputMethodItem, SIGNAL(currentIndexChanged(int)), q, SLOT(setLandscapeInputMethod(int)));
+
+        mHwrSpeedItem = new HbDataFormModelItem(HbDataFormModelItem::ComboBoxItem, QObject::tr("Handwriting speed"));
+        mChineseInputGroup->appendChild(mHwrSpeedItem);
+        mHwrSpeedItem->setContentWidgetData(QString("items"), mHwrSpeedNames);
+        int hwr = mHwrSpeed;
+        mHwrSpeedItem->setContentWidgetData(QString("currentIndex"), hwr);
+        mHwrSpeedItem->setContentWidgetData(QString("objectName"), QString("handwriting_speed"));
+        mForm->addConnection(mHwrSpeedItem, SIGNAL(currentIndexChanged(int)), q, SLOT(setHwrSpeed(int)));
+    }
+
+    if (mPrimaryInputLanguage == HbInputLanguage(QLocale::Chinese, QLocale::HongKong)) {
+        mCangjieItem = new HbDataFormModelItem(HbDataFormModelItem::ComboBoxItem, QObject::tr("Cangjie mode"));
+        mChineseInputGroup->appendChild(mCangjieItem);
+        mCangjieItem->setContentWidgetData(QString("items"), mCnCangjieInputModeNames);
+        int cangjieIdx = inputModeToIndex(mCnCangjieInputMode, mCangjieInputModeList);
+        QVariant varCang;
+        varCang.setValue(cangjieIdx);
+        mCangjieItem->setContentWidgetData(QString("currentIndex"), varCang);
+        mCangjieItem->setContentWidgetData(QString("objectName"), QString("cangjie_mode"));
+        mForm->addConnection(mCangjieItem, SIGNAL(currentIndexChanged(int)), q, SLOT(setCangjieMode(int)));
+    }
+}
+
+void HbInputSettingWidgetPrivate::updateContentWidgetData()
 {
     // current primary language
     mPrimaryLanguageItem->setContentWidgetData(QString("currentIndex"), languageToIndex(mPrimaryInputLanguage, mPrimaryLanguages));
@@ -172,14 +431,14 @@
     mModel = new HbDataFormModel();
 
     HbInputCheckBoxList *customPrototype = new HbInputCheckBoxList(mForm);
-    QList<HbAbstractViewItem*> prototypes = mForm->itemPrototypes();
+    QList<HbAbstractViewItem *> prototypes = mForm->itemPrototypes();
     prototypes.append(customPrototype);
     mForm->setItemPrototypes(prototypes);
 
-    HbDataFormModelItem *languageGroup = mModel->appendDataFormGroup(QObject::tr("Language"));
+    mLanguageGroup = mModel->appendDataFormGroup(QObject::tr("Language"));
 
     mPrimaryLanguageItem = new HbDataFormModelItem(HbDataFormModelItem::ComboBoxItem, QObject::tr("Primary Writing language"));
-    languageGroup->appendChild(mPrimaryLanguageItem);
+    mLanguageGroup->appendChild(mPrimaryLanguageItem);
     QStringList writingLanguageItems;
     fillLanguageList(writingLanguageItems, mPrimaryLanguages);
     mPrimaryLanguageItem->setContentWidgetData(QString("items"), writingLanguageItems);
@@ -187,15 +446,16 @@
     mPrimaryLanguageItem->setContentWidgetData(QString("objectName"), QString("primary_writing_language"));
     mForm->addConnection(mPrimaryLanguageItem, SIGNAL(currentIndexChanged(int)), q, SLOT(setPrimaryLanguage(int)));
 
-    mSecondaryLanguageItem = new HbDataFormModelItem(HbDataFormModelItem::ComboBoxItem, QObject::tr("Secondary Writing language"));
-    languageGroup->appendChild(mSecondaryLanguageItem);
-    QStringList secondaryLanguageItems;
-    fillLanguageList(secondaryLanguageItems, mSecondaryLanguages, QObject::tr("None"));
-    mSecondaryLanguageItem->setContentWidgetData(QString("items"), secondaryLanguageItems);
-    mSecondaryLanguageItem->setContentWidgetData(QString("currentIndex"), languageToIndex(mSecondaryInputLanguage, mSecondaryLanguages));
-    mSecondaryLanguageItem->setContentWidgetData(QString("objectName"), QString("secondary_writing_language"));
-    mForm->addConnection(mSecondaryLanguageItem, SIGNAL(currentIndexChanged(int)), q, SLOT(setSecondaryLanguage(int)));
-
+    if (mPrimaryInputLanguage.language() != QLocale::Chinese) {
+        mSecondaryLanguageItem = new HbDataFormModelItem(HbDataFormModelItem::ComboBoxItem, QObject::tr("Secondary Writing language"));
+        mLanguageGroup->appendChild(mSecondaryLanguageItem);
+        QStringList secondaryLanguageItems;
+        fillLanguageList(secondaryLanguageItems, mSecondaryLanguages, QObject::tr("None"));
+        mSecondaryLanguageItem->setContentWidgetData(QString("items"), secondaryLanguageItems);
+        mSecondaryLanguageItem->setContentWidgetData(QString("currentIndex"), languageToIndex(mSecondaryInputLanguage, mSecondaryLanguages));
+        mSecondaryLanguageItem->setContentWidgetData(QString("objectName"), QString("secondary_writing_language"));
+        mForm->addConnection(mSecondaryLanguageItem, SIGNAL(currentIndexChanged(int)), q, SLOT(setSecondaryLanguage(int)));
+    }
     HbDataFormModelItem *keyboardGroup = mModel->appendDataFormGroup(QObject::tr("Keyboard"));
 
     mKeypressTimeoutItem = new HbDataFormModelItem(HbDataFormModelItem::SliderItem, QObject::tr("Keypress Timeout"));
@@ -216,8 +476,6 @@
         mCharacterPreviewItem->setContentWidgetData(QString("additionalText"), statusOn);
     }
     mCharacterPreviewItem->setContentWidgetData(QString("objectName"), QString("character_bubble"));
-    
-
 
     HbDataFormModelItem *textInputGroup = mModel->appendDataFormGroup(QObject::tr("Intelligent Text Input"));
 
@@ -249,7 +507,7 @@
     mCorrectionLevelItem = new HbDataFormModelItem(HbDataFormModelItem::RadioButtonListItem, QObject::tr("Typing Correction"));
     textInputGroup->appendChild(mCorrectionLevelItem);
     QStringList correctionLevels;
-    correctionLevels << QObject::tr("Low") << QObject::tr("Medium") << QObject::tr("High");
+    correctionLevels << QObject::tr("Off") << QObject::tr("Medium") << QObject::tr("High");
     mCorrectionLevelItem->setContentWidgetData(QString("items"), correctionLevels);
     mCorrectionLevelItem->setContentWidgetData(QString("selected"), mTypingCorrectionLevel);
     mCorrectionLevelItem->setContentWidgetData(QString("objectName"), QString("typing_correction"));
@@ -265,7 +523,11 @@
         mPrimaryCandidateItem->setContentWidgetData(QString("additionalText"), bestPrediction);
     }
     mPrimaryCandidateItem->setContentWidgetData(QString("objectName"), QString("primary_candidate"));
-    mForm->setModel(mModel);    
+
+    if (mPrimaryInputLanguage.language() == QLocale::Chinese) {
+        createChineseSettingGroup(mModel);
+    }
+    mForm->setModel(mModel);
     QObject::connect(mModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), q, SLOT(dataChange(QModelIndex, QModelIndex)));
 }
 
@@ -327,13 +589,178 @@
     }
 }
 
+/*!
+Returns index of the given inputmode at the inputmode list
+*/
+int HbInputSettingWidgetPrivate::inputModeToIndex(const int &inputMode, const QList<int> &inputModeList)
+{
+    for (int i = 0; i < inputModeList.count(); ++i) {
+        if (inputModeList.at(i) == inputMode) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+/*!
+Returns inputmode in the given index at the inputmode list
+*/
+int HbInputSettingWidgetPrivate::indexToInputmode(int index, const QList<int> &inputModeList)
+{
+    if (index >= 0 && index < inputModeList.count()) {
+        return inputModeList.at(index);
+    } else {
+        return KChineseInputModeNone;
+    }
+}
+
+QInputContextPlugin *HbInputSettingWidgetPrivate::pluginInstance(const QString &pluginFileName) const
+{
+    if (QLibrary::isLibrary(pluginFileName)) {
+        QPluginLoader loader(pluginFileName);
+        QObject *plugin = loader.instance();
+        if (plugin) {
+            return qobject_cast<QInputContextPlugin *>(plugin);
+        }
+    }
+
+    return 0;
+}
+
+HbInputMethodDescriptor HbInputSettingWidgetPrivate::findInputMethodDescriptor(const QString &inputMethodString)
+{
+    HbInputMethodDescriptor descriptor;
+    // Query plugin paths and scan the folders.
+    QStringList folders = HbInputSettingProxy::instance()->inputMethodPluginPaths();
+    foreach(const QString &folder, folders) {
+        QDir dir(folder);
+        for (unsigned int i = 0; i < dir.count(); i++) {
+            QString path = QString(dir.absolutePath());
+            if (path.right(1) != "\\" && path.right(1) != "/") {
+                path += QDir::separator();
+            }
+            path += inputMethodString;
+            QInputContextPlugin *inputContextPlugin = pluginInstance(path);
+            if (inputContextPlugin) {
+                descriptor.setPluginNameAndPath(dir.absolutePath() + QDir::separator() + inputMethodString);
+
+                // For each found plugin, check if there is already a list item for it.
+                // If not, then add one.
+                QStringList contextKeys = inputContextPlugin->keys();
+                foreach(QString key, contextKeys) {
+                    descriptor.setKey(key);
+                    descriptor.setDisplayName(inputContextPlugin->displayName(key));
+                }
+                break;
+            }
+        }
+    }
+    return descriptor;
+}
+
+void HbInputSettingWidgetPrivate::setInputMethodVar(Qt::Orientation orientation, QString &inputMethodString, QByteArray &customData)
+{
+    int inputMode = KChineseInputModeNone;
+    if (orientation == Qt::Vertical) {
+        inputMode = mCnPortraitInputMode;
+    } else if (orientation == Qt::Horizontal) {
+        inputMode = mCnLandscapeInputMode;
+    } else {
+        return;
+    }
+
+    switch (inputMode) {
+    case KPinyinMode: {
+        orientation == Qt::Vertical ? inputMethodString = KCnVItutPluginName : inputMethodString = KCnVkbPluginName;
+        customData.append(KPinyinName.toLatin1().data());
+    }
+    break;
+    case KStrokeMode: {
+        orientation == Qt::Vertical ? inputMethodString = KCnVItutPluginName : inputMethodString = KCnVkbPluginName;
+        customData.append(KStrokeName.toLatin1().data());
+    }
+    break;
+    case KZhuyinMode: {
+        orientation == Qt::Vertical ? inputMethodString = KCnVItutPluginName : inputMethodString = KCnVkbPluginName;
+        customData.append(KZhuyinName.toLatin1().data());
+    }
+    break;
+    case KHwrMode: {
+        inputMethodString = KCnHwrPluginName;
+        customData.append(KHwrName.toLatin1().data());
+    }
+    break;
+    case KCangjieNormalMode: {
+        inputMethodString = KCnVkbPluginName;
+        customData.append(KCangjieNormalName.toLatin1().data());
+    }
+    break;
+    case KCangjieEasyMode: {
+        inputMethodString = KCnVkbPluginName;
+        customData.append(KCangjieEasyName.toLatin1().data());
+    }
+    break;
+    case KCangjieAdvancedMode: {
+        inputMethodString = KCnVkbPluginName;
+        customData.append(KCangjieAdvancedName.toLatin1().data());
+    }
+    break;
+    default:
+        break;
+    }
+
+    QByteArray preferredCustomData = HbInputSettingProxy::instance()->preferredInputMethodCustomData(orientation);
+    QString imName(preferredCustomData);
+    QStringList temp = imName.split(" ");
+    if (temp.count() > 1) {
+        customData.append(" ");
+        customData.append(temp.at(1).toLatin1().data());	
+    } else {
+        customData.append(" ");
+        customData.append(KHwrNormalName.toLatin1().data());
+    }
+    customData.append((char)0);
+    return;
+}
+
+QByteArray HbInputSettingWidgetPrivate::createHwrSpeedData(QByteArray preferredCustomData, int index)
+{
+    QString imName(preferredCustomData);
+    QStringList temp = imName.split(" ");
+
+    QByteArray customData;
+    customData.append(temp.at(0).toLatin1().data());
+    customData.append(" ");
+    switch (index) {
+    case 0:
+        customData.append(KHwrVerySlowName.toLatin1().data());
+        break;
+    case 1:
+        customData.append(KHwrSlowName.toLatin1().data());
+        break;
+    case 2:
+        customData.append(KHwrNormalName.toLatin1().data());
+        break;
+    case 3:
+        customData.append(KHwrFastName.toLatin1().data());
+        break;
+    case 4:
+        customData.append(KHwrVeryFastName.toLatin1().data());
+        break;
+    default:
+        break;
+    }
+    customData.append((char)0);
+    return customData;
+}
+
 /// @endcond
 
 /*!
 Constructs input setting widget
 */
-HbInputSettingWidget::HbInputSettingWidget(HbDataForm *dataForm, QGraphicsWidget* parent)
- : QObject(parent), d_ptr(new HbInputSettingWidgetPrivate(dataForm))
+HbInputSettingWidget::HbInputSettingWidget(HbDataForm *dataForm, QGraphicsWidget *parent)
+    : QObject(parent), d_ptr(new HbInputSettingWidgetPrivate(dataForm))
 {
     Q_D(HbInputSettingWidget);
     d->q_ptr = this;
@@ -406,7 +833,7 @@
         d->mPredictionStatusForITUT = newState;
         changed = true;
     } else if (keyboardType & HbKeyboardSettingQwerty &&
-        d->mPredictionStatusForQwerty != newState) {
+               d->mPredictionStatusForQwerty != newState) {
         d->mPredictionStatusForQwerty = newState;
         changed = true;
     }
@@ -463,7 +890,7 @@
         d->mAutocompletionForITUT = newState;
         changed = true;
     } else if (keyboardType & HbKeyboardSettingQwerty &&
-        d->mAutocompletionForQwerty != newState) {
+               d->mAutocompletionForQwerty != newState) {
         d->mAutocompletionForQwerty = newState;
         changed = true;
     }
@@ -514,30 +941,61 @@
 {
     Q_D(HbInputSettingWidget);
 
-	HbInputSettingProxy *settings = HbInputSettingProxy::instance();
+    HbInputSettingProxy *settings = HbInputSettingProxy::instance();
     HbPredictionFactory *predFactory = HbPredictionFactory::instance();
-    bool oldPLangSupportsPrediction = (predFactory->predictionEngineForLanguage(d->mPrimaryInputLanguage) != NULL);		
+    bool oldPLangSupportsPrediction = (predFactory->predictionEngineForLanguage(d->mPrimaryInputLanguage) != NULL);
     d->mPrimaryInputLanguage = d->indexToLanguage(index, d->mPrimaryLanguages);
     HbInputSettingProxy::instance()->setGlobalInputLanguage(d->mPrimaryInputLanguage);
-    bool langSupportsPrediction = (predFactory->predictionEngineForLanguage(d->mPrimaryInputLanguage) != NULL);		
-	if( oldPLangSupportsPrediction != langSupportsPrediction) {
-		if(settings->predictiveInputStatus(HbKeyboardSetting12key) != langSupportsPrediction) {
-			settings->setPredictiveInputStatus(HbKeyboardSetting12key, langSupportsPrediction);
-		} 
-		if (settings->predictiveInputStatus(HbKeyboardSettingQwerty) != langSupportsPrediction) {
-			settings->setPredictiveInputStatus(HbKeyboardSettingQwerty, langSupportsPrediction);
-		}
-	} 	
+    bool langSupportsPrediction = (predFactory->predictionEngineForLanguage(d->mPrimaryInputLanguage) != NULL);
+    if (oldPLangSupportsPrediction != langSupportsPrediction) {
+        if (settings->predictiveInputStatus(HbKeyboardSetting12key) != langSupportsPrediction) {
+            settings->setPredictiveInputStatus(HbKeyboardSetting12key, langSupportsPrediction);
+        }
+        if (settings->predictiveInputStatus(HbKeyboardSettingQwerty) != langSupportsPrediction) {
+            settings->setPredictiveInputStatus(HbKeyboardSettingQwerty, langSupportsPrediction);
+        }
+    }
 
-    HbInputLanguage secondaryLanguage = d->mSecondaryInputLanguage;
-    // Update secondary language list
-    d->createSecondaryLanguageList();
-    QStringList secondaryLanguageItems;
-    d->fillLanguageList(secondaryLanguageItems, d->mSecondaryLanguages, tr("None"));
-    d->mSecondaryLanguageItem->setContentWidgetData(QString("items"), secondaryLanguageItems);
+    if (d->mPrimaryInputLanguage.language() != QLocale::Chinese) {
+        HbInputLanguage secondaryLanguage = d->mSecondaryInputLanguage;
+        // Update secondary language list
+        d->createSecondaryLanguageList();
+        QStringList secondaryLanguageItems;
+        d->fillLanguageList(secondaryLanguageItems, d->mSecondaryLanguages, tr("None"));
+        if (d->mSecondaryLanguageItem) {
+            d->mSecondaryLanguageItem->setContentWidgetData(QString("items"), secondaryLanguageItems);
+            if (d->mPrimaryInputLanguage != secondaryLanguage) {
+                d->mSecondaryLanguageItem->setContentWidgetData(QString("currentIndex"), d->languageToIndex(secondaryLanguage, d->mSecondaryLanguages));
+            }
+        } else {
+            d->mSecondaryLanguageItem = new HbDataFormModelItem(HbDataFormModelItem::ComboBoxItem, QObject::tr("Secondary Writing language"));
+            d->mLanguageGroup->appendChild(d->mSecondaryLanguageItem);
+            d->mSecondaryLanguageItem->setContentWidgetData(QString("items"), secondaryLanguageItems);
+            d->mSecondaryLanguageItem->setContentWidgetData(QString("currentIndex"), d->languageToIndex(secondaryLanguage, d->mSecondaryLanguages));
+            d->mSecondaryLanguageItem->setContentWidgetData(QString("objectName"), QString("secondary_writing_language"));
+            d->mForm->addConnection(d->mSecondaryLanguageItem, SIGNAL(currentIndexChanged(int)), this, SLOT(setSecondaryLanguage(int)));
+        }
 
-    if (d->mPrimaryInputLanguage != secondaryLanguage) {
-        d->mSecondaryLanguageItem->setContentWidgetData(QString("currentIndex"), d->languageToIndex(secondaryLanguage, d->mSecondaryLanguages));
+        HbDataFormModel *model = qobject_cast<HbDataFormModel *>(d->mForm->model());
+        if (d->mChineseInputGroup) {
+            model->removeItem(d->mChineseInputGroup);
+            d->mChineseInputGroup = NULL;
+        }
+    } else {
+        HbDataFormModel *model = qobject_cast<HbDataFormModel *>(d->mForm->model());
+        if (d->mChineseInputGroup) {
+            model->removeItem(d->mChineseInputGroup);
+            d->mChineseInputGroup = NULL;
+        }
+
+        if (d->mSecondaryLanguageItem) {
+            model->removeItem(d->mSecondaryLanguageItem);
+            d->mSecondaryLanguageItem = NULL;
+        }
+
+        resetChineseInputMode();
+        d->createChineseSettingGroup(model);
+        d->mForm->setModel(model);
     }
 }
 
@@ -631,6 +1089,111 @@
     }
     HbInputSettingProxy::instance()->setPrimaryCandidateMode(d->mPrimaryCandidateMode);
 }
+
+/*!
+Saves the portrait input method
+*/
+void HbInputSettingWidget::setPortraitInputMethod(int index)
+{
+    Q_D(HbInputSettingWidget);
+    d->mCnPortraitInputMode = d->indexToInputmode(index, d->mCnPortraitInputModeList);
+    QString inputMethodString;
+    QByteArray customData;
+    d->setInputMethodVar(Qt::Vertical, inputMethodString, customData);
+
+    const HbInputMethodDescriptor descriptor = d->findInputMethodDescriptor(inputMethodString);
+    HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Vertical, (const HbInputMethodDescriptor &)descriptor, customData);
+}
+
+/*!
+Saves the landscape input method
+*/
+void HbInputSettingWidget::setLandscapeInputMethod(int index)
+{
+    Q_D(HbInputSettingWidget);
+    d->mCnLandscapeInputMode = d->indexToInputmode(index, d->mCnLandscapeInputModeList);
+    QString inputMethodString;
+    QByteArray customData;
+    d->setInputMethodVar(Qt::Horizontal, inputMethodString, customData);
+
+    const HbInputMethodDescriptor descriptor = d->findInputMethodDescriptor(inputMethodString);
+    HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Horizontal, descriptor, customData);
+}
+
+/*!
+Saves the cangjie input mode
+*/
+void HbInputSettingWidget::setCangjieMode(int index)
+{
+    Q_D(HbInputSettingWidget);
+    d->mCnCangjieInputMode = d->indexToInputmode(index, d->mCangjieInputModeList);
+    d->mCnLandscapeInputMode = d->mCnCangjieInputMode;
+
+    QString inputMethodString;
+    QByteArray customData;
+    d->setInputMethodVar(Qt::Horizontal, inputMethodString, customData);
+
+    const HbInputMethodDescriptor descriptor = d->findInputMethodDescriptor(inputMethodString);
+    HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Horizontal, descriptor, customData);
+}
+
+
+/*!
+Saves the handwriting speed
+*/
+void HbInputSettingWidget::setHwrSpeed(int index)
+{
+    Q_D(HbInputSettingWidget);
+    Qt::Orientation currentOrientation = HbInputSettingProxy::instance()->screenOrientation();
+    QByteArray portraitCustomData = HbInputSettingProxy::instance()->preferredInputMethodCustomData(Qt::Vertical);
+    QByteArray landscapeCustomData = HbInputSettingProxy::instance()->preferredInputMethodCustomData(Qt::Horizontal);
+    HbInputMethodDescriptor portraitDes = HbInputSettingProxy::instance()->preferredInputMethod(Qt::Vertical);
+    HbInputMethodDescriptor landscapeDes = HbInputSettingProxy::instance()->preferredInputMethod(Qt::Horizontal);
+    QByteArray portraitHwrspeed = d->createHwrSpeedData(portraitCustomData, index);
+    QByteArray landscapeHwrspeed = d->createHwrSpeedData(landscapeCustomData, index);
+
+    if (currentOrientation == Qt::Vertical) {
+        HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Horizontal, landscapeDes, landscapeHwrspeed);
+        HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Vertical, portraitDes, portraitHwrspeed);
+
+    } if (currentOrientation == Qt::Horizontal) {
+        HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Vertical, portraitDes, portraitHwrspeed);
+        HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Horizontal, landscapeDes, landscapeHwrspeed);
+    }
+}
+
+/*!
+Saves the portrait input method
+*/
+void HbInputSettingWidget::resetChineseInputMode()
+{
+    Q_D(HbInputSettingWidget);
+    HbInputLanguage lang = HbInputSettingProxy::instance()->globalInputLanguage();
+
+    if (lang.variant() == QLocale::China) {
+        d->mCnPortraitInputMode = KPinyinMode;
+        d->mCnLandscapeInputMode = KPinyinMode;
+    } else if (lang.variant() == QLocale::HongKong) {
+        d->mCnPortraitInputMode = KStrokeMode;
+        d->mCnLandscapeInputMode = KStrokeMode;
+    } else if (lang.variant() == QLocale::Taiwan) {
+        d->mCnPortraitInputMode = KZhuyinMode;
+        d->mCnLandscapeInputMode = KZhuyinMode;
+    }
+
+    QString portraitInputMethodString;
+    QString landscapeInputMethodString;
+    QByteArray portraitCustomData;
+    QByteArray landscapeCustomData;
+    d->setInputMethodVar(Qt::Vertical, portraitInputMethodString, portraitCustomData);
+    d->setInputMethodVar(Qt::Horizontal, landscapeInputMethodString, landscapeCustomData);
+
+    const HbInputMethodDescriptor portraitDescriptor = d->findInputMethodDescriptor(portraitInputMethodString);
+    const HbInputMethodDescriptor landscapeDescriptor = d->findInputMethodDescriptor(landscapeInputMethodString);
+    HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Vertical, (const HbInputMethodDescriptor &)portraitDescriptor, portraitCustomData);
+    HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Horizontal, (const HbInputMethodDescriptor &)landscapeDescriptor, landscapeCustomData);
+}
+
 /*
     This slot is called when ever data in the form model is changed
 */
@@ -638,7 +1201,7 @@
 {
     Q_D(HbInputSettingWidget);
     Q_UNUSED(endIn);
-    HbDataFormModelItem *item = d->mModel->itemFromIndex(startIn);    
+    HbDataFormModelItem *item = d->mModel->itemFromIndex(startIn);
     if(item == d->mPrimaryCandidateItem) {
         setPrimaryCandidateMode();
     } else if(item == d->mCharacterPreviewItem) {
@@ -660,8 +1223,7 @@
     disconnect(settings, SIGNAL(keypressTimeoutChanged(int)), this, SLOT(updateKeypressTimeout(int)));
     disconnect(settings, SIGNAL(autocompletionStateChanged(HbKeyboardSettingFlags, bool)), this, SLOT(updateAutocompletionState(HbKeyboardSettingFlags, bool)));
     disconnect(settings, SIGNAL(typingCorrectionLevelChanged(HbTypingCorrectionLevel)), this, SLOT(updateTypingCorrectionLevel(HbTypingCorrectionLevel)));
-    disconnect(settings, SIGNAL(primaryCandidateModeChanged(HbPrimaryCandidateMode)), this, SLOT(updatePrimaryCandidateMode(HbPrimaryCandidateMode)));    
+    disconnect(settings, SIGNAL(primaryCandidateModeChanged(HbPrimaryCandidateMode)), this, SLOT(updatePrimaryCandidateMode(HbPrimaryCandidateMode)));
 }
 
-
 // End of file
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputsettingwidget.h
--- a/src/hbinput/inputwidgets/hbinputsettingwidget.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsettingwidget.h	Tue Jul 06 14:36:53 2010 +0300
@@ -47,6 +47,7 @@
     void initializeWidget();
     
     void resetWidget();
+    void resetChineseInputMode();
 
 public slots:
     void updateGlobalInputLanguage(const HbInputLanguage &newLanguage);
@@ -68,6 +69,10 @@
     void setPrimaryCandidateMode();
     void dataChange(const QModelIndex &startIn, const QModelIndex &endIn);
 
+    void setPortraitInputMethod(int index);
+    void setLandscapeInputMethod(int index);
+    void setHwrSpeed(int index);
+    void setCangjieMode(int index);
 protected:
     HbInputSettingWidgetPrivate *const d_ptr;
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputsmileypicker.cpp
--- a/src/hbinput/inputwidgets/hbinputsmileypicker.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsmileypicker.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -38,6 +38,11 @@
 #include <hbdialog_p.h>
 #include <hbinputregioncollector_p.h>
 
+const int HbLandscapeRows = 3;
+const int HbLandscapeColumns = 7;
+const int HbPortraitRows = 4;
+const int HbPortraitColumns = 5;
+
 /// @cond
 
 class HbInputSmileyPickerPrivate: public HbDialogPrivate
@@ -59,14 +64,14 @@
 HbInputSmileyPickerPrivate::HbInputSmileyPickerPrivate(int rows, int columns)
     : mView(0), mModel(0)
 {
+    Q_UNUSED(rows);
+    Q_UNUSED(columns);
     Q_Q(HbInputSmileyPicker);
     // we should make sure that it comes above vkb
     setPriority(HbPopupPrivate::VirtualKeyboard + 1);
 
     // create a view and set the rows and columns.
     mView = new HbGridView(q);
-    mView->setRowCount(rows);
-    mView->setColumnCount(columns);
     mView->setScrollDirections(Qt::Horizontal);
     mView->setHorizontalScrollBarPolicy(HbScrollArea::ScrollBarAsNeeded);
     mModel = new QStandardItemModel(q);
@@ -94,7 +99,7 @@
     if (!hidingInProgress) {
         HbIcon smileyIcon = index.model()->data(index, Qt::DecorationRole).value<HbIcon>();
         emit q->selected(smileyIcon.iconName());
-        q->hide();
+        q->close();
     }
 }
 
@@ -122,6 +127,18 @@
     setFlag(QGraphicsItem::ItemIsPanel, true);
     setActive(false);
 
+    if (!rows || !columns) {
+        if (mainWindow()->orientation() == Qt::Horizontal) {
+            rows = HbLandscapeRows;
+            columns = HbLandscapeColumns;
+        } else {
+            rows = HbPortraitRows;
+            columns = HbPortraitColumns;
+        }
+    }
+    d->mView->setRowCount(rows);
+    d->mView->setColumnCount(columns);
+
     // set dialog properties
     setFocusPolicy(Qt::ClickFocus);
     setDismissPolicy(TapAnywhere);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputvirtualrocker.cpp
--- a/src/hbinput/inputwidgets/hbinputvirtualrocker.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvirtualrocker.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -43,9 +43,9 @@
 const qreal HbRockerDimOpacity = 1.0;
 const qreal HbRockerNormalOpacity = 1.0;
 const qreal HbRockerWidth = 50.0;
-const int HbIconWidth = 30;
-const int HbPointerWidth = 15;
-
+const qreal HbNormalSizeInUnits = 5;
+const qreal HbPressedSizeInUnits = 9.5;
+const qreal HbActivatedSizeInUnits = 9.5;
 
 class HbInputVirtualRockerPrivate
 {
@@ -53,30 +53,28 @@
     explicit HbInputVirtualRockerPrivate(HbInputVirtualRocker *rocker);
     ~HbInputVirtualRockerPrivate();
     int rockerEventRepeats(qreal distance);
-    void setCenter();
 
 public:
     HbInputVirtualRocker *q_ptr;
-    HbIcon *mIconNormal;
+    HbIcon mIconNormal;
+    HbIcon mIconPressed;
+    HbIcon mIconActivated;
     HbInputVirtualRocker::RockerSelectionMode mShifted;
     QPointF mLastPoint;
-    QPointF mCenterPosition;
-    QPointF mPointerPosition;
     QPointF mMousePressPoint;
     bool mPressed;
 };
 
 HbInputVirtualRockerPrivate::HbInputVirtualRockerPrivate(HbInputVirtualRocker *rocker)
     : q_ptr(rocker),
-      mIconNormal(0),
       mShifted(HbInputVirtualRocker::RockerSelectionModeOff),
       mLastPoint(0.0, 0.0),
-      mCenterPosition(0.0, 0.0),
       mMousePressPoint(0.0, 0.0),
       mPressed(false)
 {
-    mIconNormal = new HbIcon("qtg_graf_trackpoint_normal");
-    mIconNormal->setSize(QSizeF(HbIconWidth, HbIconWidth));
+    mIconNormal = HbIcon("qtg_graf_trackpoint_normal" );
+    mIconPressed = HbIcon("qtg_graf_trackpoint_pressed" );
+    mIconActivated = HbIcon("qtg_graf_trackpoint_activated" );
 
     q_ptr->grabGesture(Qt::SwipeGesture);
     q_ptr->grabGesture(Qt::TapGesture);
@@ -85,7 +83,6 @@
 
 HbInputVirtualRockerPrivate::~HbInputVirtualRockerPrivate()
 {
-    delete mIconNormal;
 }
 
 int HbInputVirtualRockerPrivate::rockerEventRepeats(qreal distance)
@@ -102,16 +99,6 @@
     return repeats;
 }
 
-void HbInputVirtualRockerPrivate::setCenter()
-{
-    if (mCenterPosition.isNull()) {
-        mCenterPosition.setX(q_ptr->pos().x() + HbRockerWidth / 2);
-        mCenterPosition.setY(q_ptr->pos().y() + HbRockerWidth / 2);
-    }
-    mPointerPosition.setX((HbRockerWidth - HbPointerWidth) / 2);
-    mPointerPosition.setY((HbRockerWidth - HbPointerWidth) / 2);
-}
-
 /// @endcond
 
 /*!
@@ -145,26 +132,33 @@
 */
 
 /*!
+\deprecated HbInputVirtualRocker::HbInputVirtualRocker(HbInputVkbWidget*)
+    is deprecated.
+
 Constructs the object.
 */
 HbInputVirtualRocker::HbInputVirtualRocker(HbInputVkbWidget *parent)
     : HbWidget(parent), d_ptr(new HbInputVirtualRockerPrivate(this))
 {
     setOpacity(HbRockerDimOpacity);
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
 }
 
 /*!
+\deprecated HbInputVirtualRocker::HbInputVirtualRocker(HbInputVirtualRockerPrivate&, QGraphicsWidget*)
+    is deprecated.
+
 Constructs the object.
 */
 HbInputVirtualRocker::HbInputVirtualRocker(HbInputVirtualRockerPrivate &dd, QGraphicsWidget *parent)
     : HbWidget(parent), d_ptr(&dd)
 {
     setOpacity(HbRockerDimOpacity);
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
 }
 
 /*!
+\deprecated HbInputVirtualRocker::~HbInputVirtualRocker()
+    is deprecated.
+
 Destroys the widget.
 */
 HbInputVirtualRocker::~HbInputVirtualRocker()
@@ -173,8 +167,8 @@
 }
 
 /*!
-    \reimp
-    \sa QGraphicsWidget.
+\deprecated HbInputVirtualRocker::mousePressEvent(QGraphicsSceneMouseEvent*)
+    is deprecated.
 */
 void HbInputVirtualRocker::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
@@ -187,7 +181,6 @@
     qreal squareRadius = HbRockerWidth * HbRockerWidth / 4;
     if (squareRadius > squareDistance) {
         // the touch point is inside circle which diameter is HbRockerWidth
-        d->setCenter();
         d->mLastPoint = position;
         d->mMousePressPoint = position;
         emit rockerDirection(HbRockerDirectionPress, d->mShifted);
@@ -201,8 +194,8 @@
 }
 
 /*!
-    \reimp
-    \sa QGraphicsWidget.
+\deprecated HbInputVirtualRocker::mouseReleaseEvent(QGraphicsSceneMouseEvent*)
+    is deprecated.
 */
 void HbInputVirtualRocker::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
@@ -213,14 +206,13 @@
     setOpacity(HbRockerDimOpacity);
     d->mPressed = false;
     update();
-    d->setCenter();
     d->mShifted = RockerSelectionModeOff;
     HbWidgetFeedback::triggered(this, Hb::InstantReleased);
 }
 
 /*!
-    \reimp
-    \sa QGraphicsWidget.
+\deprecated HbInputVirtualRocker::mouseMoveEvent(QGraphicsSceneMouseEvent*)
+    is deprecated.
 */
 void HbInputVirtualRocker::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
@@ -255,18 +247,13 @@
             emit rockerDirection(HbRockerDirectionUp, d->mShifted);
             d->mLastPoint = event->pos();
         }
-
-        d->mPointerPosition = HbIconWidth * deltaPressLoc / d->mCenterPosition.x() / 2
-                              + QPointF((HbRockerWidth - HbPointerWidth) / 2, (HbRockerWidth - HbPointerWidth) / 2);
-
         update();
-
     }
 }
 
 /*!
-    \reimp
-    \sa QGraphicsWidget.
+\deprecated HbInputVirtualRocker::mouseDoubleClickEvent(QGraphicsSceneMouseEvent*)
+    is deprecated.
 */
 void HbInputVirtualRocker::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 {
@@ -284,8 +271,8 @@
 }
 
 /*!
-    \reimp
-    \sa QGraphicsWidget.
+\deprecated HbInputVirtualRocker::paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*)
+    is deprecated.
 */
 void HbInputVirtualRocker::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
@@ -295,30 +282,22 @@
 
     painter->setRenderHint(QPainter::Antialiasing, true);
 
-    if (d->mIconNormal &&
-        !d->mIconNormal->isNull()) {
-        // We have icon, lets draw it.
-
-        d->mIconNormal->paint(painter, rect(), Qt::IgnoreAspectRatio);
-        if (d->mPressed) {
-            painter->setBrush(Qt::blue);
-            painter->setPen(Qt::blue);
-            painter->drawEllipse(static_cast<int>(d->mPointerPosition.x()),
-                                 static_cast<int>(d->mPointerPosition.y()),
-                                 HbPointerWidth, HbPointerWidth);
-        }
-
+    qreal unitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
+    if (selectionMode() == RockerSelectionModeOn) {
+        d->mIconActivated.setSize(QSizeF(HbActivatedSizeInUnits * unitValue, HbActivatedSizeInUnits * unitValue));
+        d->mIconActivated.paint(painter, rect());
+    } else if (d->mPressed) {
+        d->mIconPressed.setSize(QSizeF(HbPressedSizeInUnits * unitValue, HbPressedSizeInUnits * unitValue));
+        d->mIconPressed.paint(painter, rect());
     } else {
-        // Otherwise just draw a white ellipse as a fallback.
-        painter->setBrush(Qt::white);
-        painter->setPen(Qt::white);
-        painter->drawEllipse(boundingRect());
+        d->mIconNormal.setSize(QSizeF(HbNormalSizeInUnits * unitValue, HbNormalSizeInUnits * unitValue));
+        d->mIconNormal.paint(painter, rect());
     }
 }
 
 /*!
-Returns true if virtual rocker is in selection state, ie. it sends event with shift modifier
-on.
+\deprecated HbInputVirtualRocker::selectionMode() const
+    is deprecated.
 */
 HbInputVirtualRocker::RockerSelectionMode HbInputVirtualRocker::selectionMode() const
 {
@@ -326,6 +305,10 @@
     return d->mShifted;
 }
 
+/*!
+\deprecated HbInputVirtualRocker::gestureEvent(QGestureEvent*)
+    is deprecated.
+*/
 void HbInputVirtualRocker::gestureEvent(QGestureEvent *event)
 {
     Q_UNUSED(event);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputvkbwidget.cpp
--- a/src/hbinput/inputwidgets/hbinputvkbwidget.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvkbwidget.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -47,6 +47,7 @@
 #include <hbevent.h>
 #include <hbdataform.h>
 #include <hbinputregioncollector_p.h>
+#include <hbfeedbackmanager.h>
 
 #include <hbinputmethod.h>
 #include <hbinputsettingproxy.h>
@@ -67,19 +68,21 @@
 #include <HbSelectionDialog>
 #include <HbListWidgetItem>
 
-#include "hbinputvirtualrocker.h"
 #include "hbinputsettinglist.h"
 #include "hbinputmodeindicator.h"
-#include <hbfeedbackmanager.h>
 #include "hbinputsmileypicker.h"
 #include "hbinputscreenshotwidget.h"
 
-#define HB_DIGIT_LATIN_START_VALUE          0x0030
-#define HB_DIGIT_ARABIC_INDIC_START_VALUE   0x0660
-#define HB_DIGIT_EASTERN_ARABIC_START_VALUE 0x06F0
-#define HB_DIGIT_DEVANAGARI_START_VALUE     0x0966
+const int HB_DIGIT_LATIN_START_VALUE          = 0x0030;
+const int HB_DIGIT_ARABIC_INDIC_START_VALUE   = 0x0660;
+const int HB_DIGIT_EASTERN_ARABIC_START_VALUE = 0x06F0;
+const int HB_DIGIT_DEVANAGARI_START_VALUE     = 0x0966;
 
-const qreal HbRockerWidth = 50.0;
+const qreal HbPortraitSmileyPickerHeightInUnits = 43.7;
+const qreal HbPortraitSmileyPickerWidthInUnits = 47.8;
+const qreal HbLandscapeSmileyPickerHeightInUnits = 31.9;
+const qreal HbLandscapeSmileyPickerWidthInUnits = 83.4;
+const qreal HbSmileyPickerMarginInUnits = 0.9;
 
 
 /*!
@@ -113,11 +116,9 @@
       mInputModeIndicator(0),
       mSettingList(0),
       mButtonLayout(0),
-      mRocker(0),
       mBackgroundDrawer(0),
       mIconDrawer(0),
       mMainWinConnected(false),
-      mShowRocker(false),
       mLayout(0),
       mCurrentHost(0),
       mDrawbackground(true),
@@ -129,6 +130,7 @@
       mMostRecentlyAccessedButton(0),
       mMostRecentlyClickedLocation(0.0, 0.0),
       mFocusedObject(0),
+      mCurrentFocusedObject(0),
       mFlickAnimation(false),
       mSettingsListOpen(false),
       mAnimateWhenDialogCloses(false),
@@ -138,8 +140,7 @@
       mSettingView(0),
       mCurrentView(0),
       mKeyboardDimmed(false),
-      mImSelectionDialog(0),
-      mSettingWidget(0)
+	  mSettingWidget(0)
 {
     mScreenshotTimeLine.setUpdateInterval(16);
 }
@@ -152,8 +153,6 @@
     delete mIconDrawer;
     delete mSmileyPicker;
     delete mScreenshotWidget;
-    delete mRocker;
-    delete mImSelectionDialog;
 }
 
 void HbInputVkbWidgetPrivate::initLayout()
@@ -181,27 +180,18 @@
 void HbInputVkbWidgetPrivate::init()
 {
     Q_Q(HbInputVkbWidget);
-    q->setFlag(QGraphicsItem::ItemHasNoContents, false);
+    QGraphicsItem::GraphicsItemFlags itemFlags = q->flags();
+#if QT_VERSION >= 0x040600
+    itemFlags |= QGraphicsItem::ItemSendsGeometryChanges;
+#endif
+    // Make sure the keypad never steals focus.
+    itemFlags |= QGraphicsItem::ItemIsPanel;
+    q->setFlags(itemFlags);
 
-    mRocker = new HbInputVirtualRocker();
     HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup *>(q->contentItem());
     QObject::connect(buttonGroup, SIGNAL(aboutToActivateCustomAction(HbAction *)),
                      q, SIGNAL(aboutToActivateCustomAction(HbAction *)));
 
-    mRocker->setObjectName("VirtualRocker");
-    QSizeF rockerSize(HbRockerWidth, HbRockerWidth);
-    mRocker->resize(rockerSize);
-    mRocker->setMinimumSize(HbRockerWidth, HbRockerWidth);
-    mRocker->setMaximumSize(HbRockerWidth * 20, HbRockerWidth * 20);
-    if (q->mainWindow()) {
-        q->mainWindow()->scene()->addItem(mRocker);
-    }
-
-    QObject::connect(mRocker, SIGNAL(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)),
-                     q, SLOT(_q_handleRockerChange(int, HbInputVirtualRocker::RockerSelectionMode)));
-
-    mRocker->setVisible(false);
-
     mBackgroundDrawer = new HbFrameDrawer();
     mBackgroundDrawer->setFrameGraphicsName(backgroundGraphics);
     mBackgroundDrawer->setFrameType(HbFrameDrawer::ThreePiecesVertical);
@@ -363,12 +353,6 @@
     }
 }
 
-void HbInputVkbWidgetPrivate::setRockerPosition()
-{
-    Q_Q(HbInputVkbWidget);
-    mRocker->setPos(q->rockerPosition());
-}
-
 void HbInputVkbWidgetPrivate::captureScreenshot()
 {
     Q_Q(HbInputVkbWidget);
@@ -430,84 +414,23 @@
     return ret;
 }
 
-void HbInputVkbWidgetPrivate::showInputMethodSelectionDialog()
+void HbInputVkbWidgetPrivate::_q_activateInputMethod(const HbInputMethodDescriptor &descriptor, const QByteArray &customData)
 {
     Q_Q(HbInputVkbWidget);
 
-    delete mImSelectionDialog;
-    mImSelectionDialog = new HbSelectionDialog();
-
-    mImSelectionDialog->setObjectName("Input method dialog");
-
-    // Make sure the language dialog never steals focus.
-    mImSelectionDialog->setFlag(QGraphicsItem::ItemIsPanel, true);
-    mImSelectionDialog->setActive(false);
-
-    QList<HbInputMethodDescriptor> customList = HbInputMethod::listCustomInputMethods();
-
-    QList<HbListWidgetItem *> listItems;
-    HbListWidgetItem *item = new HbListWidgetItem();
-    QString methodName("Default");
-    item->setText(methodName);
-    listItems.append(item);
-
-    foreach(const HbInputMethodDescriptor &descriptor, customList) {
-        QString displayName = descriptor.displayName();
-        if (displayName.length() == 0) {
-            displayName = QString("Unknown");
-        }
-        item = new HbListWidgetItem();
-        item->setText(displayName);
-        listItems.append(item);
-    }
-    mImSelectionDialog->setWidgetItems(listItems, true);
-    mImSelectionDialog->setSelectionMode(HbAbstractItemView::SingleSelection);
-    mImSelectionDialog->setDismissPolicy(HbPopup::NoDismiss);
-    mImSelectionDialog->setModal(true);
-
-    q->connect(mImSelectionDialog, SIGNAL(finished(HbAction *)), q, SLOT(_q_inputMethodSelectionDialogFinished(HbAction *)));
-
-    mImSelectionDialog->open();
-}
-
-void HbInputVkbWidgetPrivate::_q_inputMethodSelectionDialogFinished(HbAction *action)
-{
-    Q_UNUSED(action);
-
-    QList<QVariant> selectedItems = mImSelectionDialog->selectedItems();
-    if (selectedItems.count()) {
-        HbInputMethodDescriptor result;
-        int selection = selectedItems.first().toInt();
-        if (selection == 0) {
-            result.setDefault();
-        } else {
-            QList<HbInputMethodDescriptor> customList = HbInputMethod::listCustomInputMethods();
-            if (customList.count() <= selection) {
-                result = customList[selection-1];
-            }
-        }
-
-        if (!result.isEmpty() && mOwner) {
-            // Set as active custom input method.
-            HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Horizontal, result);
-            HbInputSettingProxy::instance()->setPreferredInputMethod(Qt::Vertical, result);
-            // And finally activate immediately.
-            mOwner->activateInputMethod(result);
-        }
+    if (!descriptor.isEmpty() && mOwner) {
+        // Set as active input method.
+        HbInputSettingProxy::instance()->setPreferredInputMethod(q->mainWindow()->orientation(), descriptor, customData);
+        // Activate immediately.
+        mOwner->activateInputMethod(descriptor);
     }
 }
 
-void HbInputVkbWidgetPrivate::_q_handleRockerChange(int direction, HbInputVirtualRocker::RockerSelectionMode selectionMode)
+void HbInputVkbWidgetPrivate::_q_smileyPickerClosed()
 {
     Q_Q(HbInputVkbWidget);
 
-    if (direction == HbInputVirtualRocker::HbRockerDirectionRelease) {
-        q->setKeyboardDimmed(false);
-    } else if (direction == HbInputVirtualRocker::HbRockerDirectionPress ||
-               direction == HbInputVirtualRocker::HbRockerDirectionDoubleClick) {
-        q->setKeyboardDimmed(true);
-    }
-    emit q->rockerDirection(direction, selectionMode);
+    q->setKeyboardDimmed(false);
 }
 
 QChar HbInputVkbWidgetPrivate::numberCharacterBoundToKey(int key)
@@ -590,9 +513,11 @@
     HbEffect::disable(this);
 #endif // HB_EFFECTS
 
-    // Make sure the keypad never steals focus.
-    setFlag(QGraphicsItem::ItemIsPanel, true);
     setActive(false);
+
+    if (!d->mOwner) {
+        d->mOwner = HbInputMethod::activeInputMethod();
+    }
 }
 
 /*!
@@ -613,8 +538,6 @@
     HbEffect::disable(this);
 #endif // HB_EFFECTS
 
-    // Make sure the keypad never steals focus.
-    setFlag(QGraphicsItem::ItemIsPanel, true);
     setActive(false);
 }
 
@@ -633,8 +556,6 @@
     Q_D(HbInputVkbWidget);
 
     d->mCurrentHost = host;
-    d->mRocker->setVisible(d->mShowRocker);
-    d->setRockerPosition();
     d->mFlickDirection = HbFlickDirectionNone;
 }
 
@@ -648,7 +569,6 @@
     Q_UNUSED(host);
     Q_D(HbInputVkbWidget);
 
-    d->mRocker->setVisible(false);
     d->mFlickDirection = HbFlickDirectionNone;
 }
 
@@ -727,25 +647,25 @@
 }
 
 /*!
+\deprecated HbInputVkbWidget::setRockerVisible(bool)
+    is deprecated.
+
 Sets virtual rocker visibility.
 */
 void HbInputVkbWidget::setRockerVisible(bool visible)
 {
-    Q_D(HbInputVkbWidget);
-    d->mShowRocker = visible;
+    Q_UNUSED(visible);
 }
 
 /*!
+\deprecated HbInputVkbWidget::isRockerVisible() const
+    is deprecated.
+
 Returns true if virtual rocker is allowed to be visible.
 */
 bool HbInputVkbWidget::isRockerVisible() const
 {
-    Q_D(const HbInputVkbWidget);
-    if (d->mShowRocker) {
-        return d->mRocker->isVisible();
-    } else {
-        return false;
-    }
+    return false;
 }
 
 /*!
@@ -821,7 +741,6 @@
     if (d->mOwner && d->mOwner->focusObject()) {
         qreal vkbZValue = d->mOwner->focusObject()->findVkbZValue();
         setZValue(vkbZValue);
-        d->mRocker->setZValue(vkbZValue + 0.5);
     }
 
     show();
@@ -839,14 +758,13 @@
     if (d->mSmileyPicker && d->mSmileyPicker->isVisible()) {
         d->mSmileyPicker->hide();
     }
-    d->mRocker->setVisible(false);
     if (d->mSettingList) {
         d->mSettingList->close();
     }
 }
 
 /*!
-Enables or disabled all buttons in the keyboard that have not been disabled directly.
+Enables or disables all buttons in the keyboard that have not been disabled directly.
 */
 void HbInputVkbWidget::setKeyboardDimmed(bool dimmed)
 {
@@ -870,7 +788,8 @@
     if (!d->mSettingList) {
         d->mSettingList = new HbInputSettingList();
         connect(d->mSettingList, SIGNAL(inputSettingsButtonClicked()), this, SLOT(showSettingsView()));
-        connect(d->mSettingList, SIGNAL(inputMethodsButtonClicked()), this, SLOT(executeMethodDialog()));
+        connect(d->mSettingList, SIGNAL(inputMethodSelected(const HbInputMethodDescriptor &, const QByteArray &)),
+                this, SLOT(_q_activateInputMethod(const HbInputMethodDescriptor &, const QByteArray &)));
     }
 
     HbInputFocusObject *focusObject = d->mOwner->focusObject();
@@ -947,7 +866,6 @@
 {
     Q_D(HbInputVkbWidget);
 
-    //HbVkbHostBridge::instance()->minimizeKeypad(true);
     /*
     Added for vanilla input
     When settings dialog is launched, keypad is not closed.
@@ -960,9 +878,9 @@
     if (vkbHost && vkbHost->keypadStatus() != HbVkbHost::HbVkbStatusClosed) {
         vkbHost->closeKeypad();
     }
+    d->mCurrentFocusedObject = focusObject->object();
 
     closeSettingList();
-    hide();
     if(!d->mSettingView) {
         d->mSettingView = new HbView(this);
         HbAction *backAction = new HbAction(Hb::BackNaviAction, d->mSettingView);
@@ -978,7 +896,6 @@
     d->mSettingView->setTitle(tr("Input Settings"));
     mainWindow()->addView(d->mSettingView);
     d->mCurrentView = mainWindow()->currentView();
-    mainWindow()->clearFocus();
     mainWindow()->setCurrentView(d->mSettingView);
 }
 
@@ -991,30 +908,26 @@
 
     mainWindow()->setCurrentView(d->mCurrentView);
     mainWindow()->removeView(d->mSettingView);
+    if (d->mSettingView->scene()) {
+        d->mSettingView->scene()->removeItem(d->mSettingView);
+    }
     HbInputRegionCollector::instance()->detach(d->mSettingView);
     d->mSettingWidget->resetWidget();
 
-    /***** To be removed, Added for vanilla input.
-    HbInputFocusObject *focusObject = 0;
-    if (!d->mOwner || !(focusObject = d->mOwner->focusObject())) {
-        return;
+    if (d->mCurrentFocusedObject) {
+        HbInputFocusObject *focusObject = new HbInputFocusObject(d->mCurrentFocusedObject);
+        d->mOwner->setFocusObject(focusObject);
+        d->mCurrentFocusedObject = 0;
     }
-    HbVkbHost *vkbHost = focusObject->editorInterface().vkbHost();
-    if (vkbHost && vkbHost->keypadStatus() != HbVkbHost::HbVkbStatusOpened) {
-        vkbHost->openKeypad();
-    }
-    *****/
 }
 
 /*!
+\deprecated HbInputVkbWidget::executeMethodDialog()
+    is deprecated.
 Executes input method selection dialog
 */
 void HbInputVkbWidget::executeMethodDialog()
 {
-    Q_D(HbInputVkbWidget);
-
-    closeSettingList();
-    d->showInputMethodSelectionDialog();
 }
 
 /*!
@@ -1056,9 +969,6 @@
 {
     Q_UNUSED(type);
     Q_UNUSED(x);
-
-    Q_D(HbInputVkbWidget);
-    d->setRockerPosition();
 }
 
 /*!
@@ -1076,23 +986,15 @@
 }
 
 /*!
-Returns the virtual rocker position. The default psition is in the middle
+\deprecated HbInputVkbWidget::rockerPosition()
+    is deprecated.
+
+Returns the virtual rocker position. The default position is in the middle
 of keypad button area.
 */
 QPointF HbInputVkbWidget::rockerPosition()
 {
-    Q_D(const HbInputVkbWidget);
-
-    QPointF result;
-
-    if (d->mRocker) {
-        QSizeF padArea = keypadButtonAreaSize();
-        result = QPointF(scenePos().x() + (padArea.width() * 0.5) - (d->mRocker->size().width() * 0.5),
-                         scenePos().y() + (padArea.height() * 0.5) - (d->mRocker->size().height() * 0.5));
-        result.setY(result.y() + d->mCloseHandleHeight);
-    }
-
-    return result;
+    return QPointF();
 }
 
 /*!
@@ -1109,7 +1011,7 @@
 
 
 /*!
-Returns all possible keys those the user could have intended to press
+Returns all possible keys that the user could have intended to press
 for the last registered touch along with their corresponding probability.
 */
 QList<HbKeyPressProbability> HbInputVkbWidget::probableKeypresses()
@@ -1174,9 +1076,21 @@
     }
 
     if (d->mSmileyPicker) {
-        d->mSmileyPicker->setGeometry(QRectF(0, pos().y(), geometry().width(),
-                                             geometry().height()));
-        d->mSmileyPicker->show();
+        qreal unitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
+        QSizeF screenSize = HbDeviceProfile::profile(mainWindow()).logicalSize();
+
+        qreal width = HbPortraitSmileyPickerWidthInUnits * unitValue;
+        qreal height = HbPortraitSmileyPickerHeightInUnits * unitValue;
+        if (mainWindow()->orientation() == Qt::Horizontal) {
+            width = HbLandscapeSmileyPickerWidthInUnits * unitValue;
+            height = HbLandscapeSmileyPickerHeightInUnits * unitValue;
+        }
+
+        d->mSmileyPicker->setPreferredSize(QSizeF(width, height));
+        d->mSmileyPicker->setPos((screenSize.width() - width) * 0.5,
+                                 screenSize.height() - height - HbSmileyPickerMarginInUnits * unitValue);
+        d->mSmileyPicker->open(this, SLOT(_q_smileyPickerClosed()));
+        setKeyboardDimmed(true);
 
         HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup *>(contentItem());
         if (buttonGroup) {
@@ -1222,13 +1136,13 @@
 {
     Q_D(HbInputVkbWidget);
 
-    if (event.key() == HbInputButton::ButtonKeyCodeSettings) {
-        showSettingList();
-    } else if (d->mOwner && event.key() > 0) {
+    if (d->mOwner && event.key() > 0) {
         d->mOwner->filterEvent(&event);
     }
 
-    
+    if (event.key() == HbInputButton::ButtonKeyCodeSettings) {
+        showSettingList();
+    }
 }
 
 /*!
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputvkbwidget.h
--- a/src/hbinput/inputwidgets/hbinputvkbwidget.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvkbwidget.h	Tue Jul 06 14:36:53 2010 +0300
@@ -37,7 +37,7 @@
 const QString backgroundGraphics("qtg_fr_input_v_bg");
 const QString HbInputVkbHandleIcon("qtg_graf_input_v_swipe");
 const qreal HbCloseHandleHeight = 0;
-const qreal HbCloseHandleHeightInUnits = 2.23;
+const qreal HbCloseHandleHeightInUnits = 3.13;
 const qreal HbCloseHandleWidthInUnits = 18.8;
 
 class HbInputVkbWidgetPrivate;
@@ -71,7 +71,7 @@
         HbSctViewSmiley
     };
 
-    HbInputVkbWidget(QGraphicsItem *parent = 0);
+    HbInputVkbWidget(QGraphicsItem *parent = 0);  
     virtual ~HbInputVkbWidget();
 
 public: // From HbVirtualKeyboard
@@ -127,7 +127,7 @@
     void executeMethodDialog();
     void closeSettingList();
     void settingsClosed();
-    void showSmileyPicker(int rows, int columns);
+    void showSmileyPicker(int rows = 0, int columns = 0);
     void keypadLanguageChangeAnimationUpdate(qreal value);
     void keypadLanguageChangeFinished();
 
@@ -150,9 +150,9 @@
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbInputVkbWidget)
     Q_DISABLE_COPY(HbInputVkbWidget)
-    Q_PRIVATE_SLOT(d_func(), void _q_inputMethodSelectionDialogFinished(HbAction *))
-    Q_PRIVATE_SLOT(d_func(), void _q_handleRockerChange(int direction, HbInputVirtualRocker::RockerSelectionMode selectionMode))
+    Q_PRIVATE_SLOT(d_func(), void _q_activateInputMethod(const HbInputMethodDescriptor &, const QByteArray &))
     Q_PRIVATE_SLOT(d_func(), void _q_settingsClosed(HbAction *action))
+    Q_PRIVATE_SLOT(d_func(), void _q_smileyPickerClosed())
 
     friend class HbTouchKeypadButton;
     friend class HbInputUsedSymbolPane;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/hbinputvkbwidget_p.h
--- a/src/hbinput/inputwidgets/hbinputvkbwidget_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvkbwidget_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -52,7 +52,6 @@
 class QBitmap;
 class QPixmap;
 class QGraphicsGridLayout;
-class HbInputVirtualRocker;
 class HbPushButton;
 class HbFrameDrawer;
 class QAction;
@@ -67,7 +66,7 @@
 class HbInputScreenshotWidget;
 class HbInputFocusObject;
 class HbInputSettingList;
-class HbSelectionDialog;
+class HbInputMethodDescriptor;
 class HbInputSettingWidget;
 
 const qreal VerticalSpacing = 0.0, HorizontalSpacing = 0.0; //vertical and horizontal spacing for buttons in layout
@@ -104,8 +103,6 @@
     virtual void updateButtons();
     virtual void settingListPosition(QPointF &position, HbPopup::Placement &placement);
 
-    virtual void setRockerPosition();
-
     void captureScreenshot();
     void updateMouseHitItem(HbTouchKeypadButton *button, QPointF position);
     void normalizeProbabilities(QList<HbKeyPressProbability> &allProbableKeys);
@@ -114,9 +111,9 @@
     bool isKeyboardDimmed();
 
     void showInputMethodSelectionDialog();
-    void _q_inputMethodSelectionDialogFinished(HbAction *action);
-    void _q_handleRockerChange(int direction, HbInputVirtualRocker::RockerSelectionMode selectionMode);
+    void _q_activateInputMethod(const HbInputMethodDescriptor &descriptor, const QByteArray &customData);
     void _q_settingsClosed(HbAction *action);
+    void _q_smileyPickerClosed();
 
     virtual QChar numberCharacterBoundToKey(int key);
     friend class HbTouchKeypadButton;
@@ -145,13 +142,10 @@
     QSignalMapper *mReleaseMapper;
     QSignalMapper *mActionMapper;
 
-    QPointer<HbInputVirtualRocker> mRocker;
-
     HbFrameDrawer *mBackgroundDrawer;
     HbFrameDrawer *mIconDrawer;
 
     bool mMainWinConnected;
-    bool mShowRocker;
     QGraphicsLinearLayout *mLayout;
     QPointer<HbVkbHost> mCurrentHost;
     bool mDrawbackground;
@@ -165,6 +159,7 @@
     HbTouchKeypadButton *mMostRecentlyAccessedButton;
     QPointF mMostRecentlyClickedLocation;
     HbInputFocusObject  *mFocusedObject;
+    QObject *mCurrentFocusedObject;
     bool mFlickAnimation;
     bool mSettingsListOpen;
     bool mAnimateWhenDialogCloses;
@@ -175,7 +170,6 @@
     HbView *mSettingView;
     HbView *mCurrentView;
     bool mKeyboardDimmed;
-    HbSelectionDialog *mImSelectionDialog;
     HbInputSettingWidget *mSettingWidget;
 };
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbinput/inputwidgets/inputwidgets.pri
--- a/src/hbinput/inputwidgets/inputwidgets.pri	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbinput/inputwidgets/inputwidgets.pri	Tue Jul 06 14:36:53 2010 +0300
@@ -42,6 +42,7 @@
 PUBLIC_HEADERS += $$PWD/hbinputbuttongroup.h
 PUBLIC_HEADERS += $$PWD/hbinputbutton.h
 PUBLIC_HEADERS += $$PWD/hbinputsctkeyboard.h
+PUBLIC_HEADERS += $$PWD/hbinputmethodselectionlist.h
 
 # hb input widget private headers
 PRIVATE_HEADERS += $$PWD/hbinputvkbwidget_p.h
@@ -65,3 +66,4 @@
 SOURCES += $$PWD/hbinputbuttongroup.cpp
 SOURCES += $$PWD/hbinputbutton.cpp
 SOURCES += $$PWD/hbinputsctkeyboard.cpp
+SOURCES += $$PWD/hbinputmethodselectionlist.cpp
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxwidget.cpp
--- a/src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxwidget.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxwidget.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -39,17 +39,8 @@
     TRACE_ENTRY
     mLastError = NoError;
     mShowEventReceived = false;
-    QList<QAction*> actList = actions();
-    for(int i = 0; i < NumActions; i++) {
-        mActions[i].mAction = 0;
-        mActions[i].mOwned = false; // we haven't created the action
-        mActions[i].mInDialog = false; // action has not been inserted to the dialog
-        if (i < actList.count()) {
-            mActions[i].mAction = actList[i];
-            mActions[i].mInDialog = true;
-            connect(mActions[i].mAction, SIGNAL(triggered()), SLOT(actionTriggered()));
-        }
-    }
+    initActions();
+    connectToActions();
     resetProperties();
     constructDialog(parameters);
     TRACE_EXIT
@@ -58,11 +49,7 @@
 // Destructor
 HbDeviceMessageBoxWidget::~HbDeviceMessageBoxWidget()
 {
-    for(int i = 0; i < NumActions; i++) {
-        if (mActions[i].mOwned) {
-            delete mActions[i].mAction;
-        }
-    }
+    deleteActions();
 }
 
 // Set parameters
@@ -155,11 +142,27 @@
 void HbDeviceMessageBoxWidget::setProperties(const QVariantMap &parameters)
 {
     TRACE_ENTRY
+    // Set properties other than accept/reject action first
+    const char *acceptKey = "acceptAction";
+    const char *rejectKey = "rejectAction";
     QVariantMap::const_iterator i = parameters.constBegin();
-    while (i != parameters.constEnd()) {
-        QByteArray key = i.key().toAscii();
-        if (property(key.constData()).isValid()) {
-            setProperty(key.constData(), i.value());
+    while(i != parameters.constEnd()) {
+        if (i.key() != acceptKey && i.key() != rejectKey) {
+            QByteArray key = i.key().toAscii();
+            if (property(key.constData()).isValid()) {
+                setProperty(key.constData(), i.value());
+            }
+        }
+        ++i;
+    }
+    // Set accept/reject action last
+    i = parameters.constBegin();
+    while(i != parameters.constEnd()) {
+        if (i.key() == acceptKey || i.key() == rejectKey) {
+            QByteArray key = i.key().toAscii();
+            if (property(key.constData()).isValid()) {
+                setProperty(key.constData(), i.value());
+            }
         }
         ++i;
     }
@@ -180,6 +183,45 @@
     return;
 }
 
+// Delete actions we own
+void HbDeviceMessageBoxWidget::deleteActions()
+{
+    TRACE_ENTRY
+    for(int i = 0; i < NumActions; i++) {
+        if (mActions[i].mOwned) {
+            delete mActions[i].mAction;
+        }
+        mActions[i].mAction = 0;
+        mActions[i].mOwned = false; // we haven't created the action
+        mActions[i].mInDialog = false; // action has not been inserted to the dialog
+    }
+    TRACE_EXIT
+}
+
+// Initialize actions
+void HbDeviceMessageBoxWidget::initActions()
+{
+    TRACE_ENTRY
+    for(int i = 0; i < NumActions; i++) {
+        mActions[i].mAction = 0;
+        mActions[i].mOwned = false; // we haven't created the action
+        mActions[i].mInDialog = false; // action has not been inserted to the dialog
+    }
+    TRACE_EXIT
+}
+
+// Connect to message box triggered actions
+void HbDeviceMessageBoxWidget::connectToActions()
+{
+    QList<QAction*> actList = actions();
+    int count = qMin(static_cast<int>(NumActions), actList.count());
+    for(int i = 0; i < count; i++) {
+        mActions[i].mAction = actList[i];
+        mActions[i].mInDialog = true;
+        connect(mActions[i].mAction, SIGNAL(triggered()), SLOT(actionTriggered()));
+    }
+}
+
 QString HbDeviceMessageBoxWidget::iconName() const
 {
     TRACE_ENTRY
@@ -249,6 +291,21 @@
     return mAnimationDefinition;
 }
 
+void HbDeviceMessageBoxWidget::setStandardButtons(HbMessageBox::StandardButtons buttons)
+{
+    // Clear buttons first. Otherwise display doesn't get updated always.
+    HbMessageBox::setStandardButtons(HbMessageBox::NoButton);
+    HbMessageBox::setStandardButtons(buttons);
+    deleteActions();
+    initActions();
+    connectToActions();
+}
+
+HbMessageBox::StandardButtons HbDeviceMessageBoxWidget::standardButtons() const
+{
+    return HbMessageBox::standardButtons();
+}
+
 // Action (accept or reject) was triggered
 void HbDeviceMessageBoxWidget::actionTriggered()
 {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxwidget_p.h
--- a/src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxwidget_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxwidget_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -45,6 +45,7 @@
     Q_PROPERTY(QString acceptAction READ acceptAction WRITE setAcceptAction)
     Q_PROPERTY(QString rejectAction READ rejectAction WRITE setRejectAction)
     Q_PROPERTY(QString animationDefinition READ animationDefinition WRITE setAnimationDefinition)
+    Q_PROPERTY(HbMessageBox::StandardButtons standardButtons READ standardButtons WRITE setStandardButtons)
 
 public:
     HbDeviceMessageBoxWidget(HbMessageBox::MessageBoxType type, const QVariantMap &parameters);
@@ -74,6 +75,9 @@
     bool checkProperties(const QVariantMap &parameters);
     void setProperties(const QVariantMap &parameters);
     void resetProperties();
+    void initActions();
+    void deleteActions();
+    void connectToActions();
     QString iconName() const;
     void setIconName(QString &iconName);
     QString acceptAction() const;
@@ -84,6 +88,8 @@
     void showEvent(QShowEvent *event);
     void setAnimationDefinition(QString &animationDefinition);
     QString animationDefinition() const;
+    void setStandardButtons(HbMessageBox::StandardButtons buttons);
+    HbMessageBox::StandardButtons standardButtons() const;
 
     static void parseActionData(QString &data);
     QString actionData(ActionIndex index) const;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.cpp
--- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -354,7 +354,10 @@
         effect = overrider.newInstantEffect;
     } else {
         effect = HbFeedback::None;
-        if (widget->type() == Hb::ItemType_InputButtonGroup) {
+        if (widget->type() == Hb::ItemType_InputButtonGroup && modifiers() & Hb::ModifierInputFunctionButton) {
+            effect = HbFeedback::BasicKeypad;
+        }
+        else if(widget->type() == Hb::ItemType_InputButtonGroup) {
             effect = HbFeedback::SensitiveKeypad;
         }
         else {
@@ -412,7 +415,7 @@
     if(widgetOverridesEffect( widget, interaction)) {
         effect = overrider.newInstantEffect;
     } else {
-        effect = HbFeedbackEffectUtils::instantOnKeyRepeat(widget);
+        effect = HbFeedbackEffectUtils::instantOnKeyRepeat(widget, modifiers());
     }
 
     if(widgetOverridesModalities(widget,interaction)) {
@@ -708,6 +711,45 @@
             if (widget->type() == HbPrivate::ItemType_MenuListView) {
                 feedbackPlayed = true;
             }
+            if(widget->type() == Hb::ItemType_TumbleView)
+            {
+                if (const HbAbstractItemView * itemView = qobject_cast<const HbAbstractItemView *>(widget)) {
+                    feedbackPlayed = true;
+                    QList<HbAbstractViewItem *> visibleItems = itemView->visibleItems();
+                    bool newItemFound(false);
+                    int index(-1);
+                    QList<int> visibleIndexes;
+                    if (widget == activelyScrollingItemView) {
+                        foreach (HbAbstractViewItem * item, visibleItems) {
+                            index = item->modelIndex().row();
+                            if (!oldVisibleIndexes.contains(index)) {
+                                newItemFound = true;
+                            }
+                            visibleIndexes.append(index);
+                        }
+                    }
+                    if (widget != activelyScrollingItemView){
+                        activelyScrollingItemView = widget;
+                        newItemFound = false;
+                    }
+                    // To prevent the uninitialized list to cause false new item detections
+                    if (oldVisibleIndexes.empty()) {
+                        newItemFound = false;
+                    }
+                    oldVisibleIndexes.clear();
+                    oldVisibleIndexes = visibleIndexes;
+
+                    if (newItemFound) {
+                        if(!widgetOverridesModalities(widget,interaction)) {
+                            modalities = HbFeedback::Audio | HbFeedback::Tactile;
+                        }
+                        playInstantFeedback(widget, HbFeedback::ItemScroll, modalities);
+
+                    }
+                }
+            }
+
+
             
             // generic scroll areas don't emit continuous feedback
             if (const HbScrollArea* scrollArea = qobject_cast<const HbScrollArea *>(widget)) {
@@ -785,35 +827,22 @@
 void HbFeedbackEffectEngine::playContinuousFeedback(const HbWidget* widget, HbFeedback::ContinuousEffect effect, int intensity, HbFeedback::Modalities modalities)
 {
     const QGraphicsView* view = widget->mainWindow();
+    HbContinuousFeedback* feedback;
 
-    // if feedback can be played
     if (view && HbFeedbackEffectUtils::isFeedbackAllowed(widget)) {
 
-        // if this widget has been playing
         if (continuousFeedbacks.contains(widget)) {
-            HbContinuousFeedback* feedback = continuousFeedbacks.value(widget);
-
-            // if this feedback is already playing then only its effect and intensity are updated
-            feedback->setModalities(modalities);
-            feedback->setOwningWindow(view);
-            feedback->setRect(widget, view);
-            feedback->setContinuousEffect(effect);
-            feedback->setIntensity(intensity);
-            // if this feedback is not being played, play it
-            if (!feedback->isPlaying()) {
-                feedback->play();
-            }
+            feedback = continuousFeedbacks.value(widget);
         } else {
-            // this widget has not played anything before
-            HbContinuousFeedback *feedback = new HbContinuousFeedback();
-            feedback->setModalities(modalities);
-            feedback->setOwningWindow(view);
-            feedback->setRect(widget, view);
-            feedback->setContinuousEffect(effect);
-            feedback->setIntensity(intensity);
+            feedback = new HbContinuousFeedback();
             continuousFeedbacks.insert(widget, feedback);
-            feedback->play();
         }
+        feedback->setModalities(modalities);
+        feedback->setOwningWindow(view);
+        feedback->setRect(widget, view);
+        feedback->setContinuousEffect(effect);
+        feedback->setIntensity(intensity);
+        feedback->play();
     }
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp
--- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
+#include "hbfeedbackeffectutils.h"
 #include "hbnamespace_p.h"
-#include "hbfeedbackeffectutils.h"
 
 #include <hbtoolbutton.h>
 #include <hbabstractbutton.h>
@@ -156,6 +156,8 @@
  
         case Hb::ItemType_ScrollBar:
 
+        case Hb::ItemType_RatingSlider:
+
             family = HbFeedbackEffectUtils::Slider;
             break;
 
@@ -246,13 +248,17 @@
             }
             
             // input widget special case
-            if (widget->type() == Hb::ItemType_InputButtonGroup) {
+            if (widget->type() == Hb::ItemType_InputButtonGroup && modifiers & Hb::ModifierInputFunctionButton) {
+                effect = HbFeedback::BasicKeypad;
+            }
+            else if (widget->type() == Hb::ItemType_InputButtonGroup) {
                 effect = HbFeedback::SensitiveKeypad;
             } 
             else if (widget->type() == Hb::ItemType_InputFunctionButton) {
                 effect = HbFeedback::BasicKeypad;
             } 
-            else if (widget->type() == Hb::ItemType_CheckBox) {
+            
+            if (widget->type() == Hb::ItemType_CheckBox) {
                 effect = HbFeedback::BasicButton;
             }
 
@@ -355,7 +361,7 @@
                 effect = HbFeedback::BasicItem;
             }
             else if(viewItem->type() == Hb::ItemType_TumbleViewItem ) {
-                effect = HbFeedback::SensitiveItem;
+                effect = HbFeedback::BasicItem;
             }
 
             // expandable or collapsable items give a BasicItem feedback
@@ -364,15 +370,18 @@
                     effect = HbFeedback::BasicItem;
                 }
                 else {
-                    effect = HbFeedback::SensitiveItem;
+                    effect = HbFeedback::BasicItem;
                 }
             }
         }
     }
 
-    if (widget->type() == Hb::ItemType_VirtualTrackPoint) {
+    if (widget->type() == Hb::ItemType_VirtualTrackPoint || QString(widget->metaObject()->className()) == "HbSelectionControl") {
         effect = HbFeedback::BasicButton;
     }
+    else if (widget->type() == Hb::ItemType_NotificationDialog) {
+        effect = HbFeedback::BasicItem;
+    }
 
     if (modifiers & Hb::ModifierScrolling) {
         effect = HbFeedback::StopFlick;
@@ -423,10 +432,14 @@
             }
 
             // input widget special case
-            if (widget->type() == Hb::ItemType_InputButtonGroup
-             || widget->type() == Hb::ItemType_InputFunctionButton) {
+            if (widget->type() == Hb::ItemType_InputButtonGroup && modifiers & Hb::ModifierInputFunctionButton) {
+                effect = HbFeedback::BasicKeypad;
+            }
+            else if (widget->type() == Hb::ItemType_InputButtonGroup) {
                 effect = HbFeedback::SensitiveKeypad;
-            } else if (widget->type() == Hb::ItemType_CheckBox) {
+            }
+
+            if (widget->type() == Hb::ItemType_CheckBox) {
                 effect = HbFeedback::Checkbox;
             }
 
@@ -520,7 +533,10 @@
                 effect = HbFeedback::Checkbox;
             }
             else if(viewItem->type() == Hb::ItemType_TumbleViewItem ) {
-                effect = HbFeedback::SensitiveItem;
+                effect = HbFeedback::BasicItem;
+            }
+            else if (widget->type() == Hb::ItemType_NotificationDialog) {
+                effect = HbFeedback::BasicItem;
             }
 
             if (modifiers & Hb::ModifierExpandedItem || modifiers & Hb::ModifierCollapsedItem) {
@@ -529,17 +545,13 @@
         }
     }
 
-    if (widget->type() == Hb::ItemType_VirtualTrackPoint) {
-        effect = HbFeedback::Editor;
-    }
-
     return effect;
 }
 
 /*!
     Returns the instant feedback effect on key repeat interaction.
 */
-HbFeedback::InstantEffect HbFeedbackEffectUtils::instantOnKeyRepeat(const HbWidget *widget)
+HbFeedback::InstantEffect HbFeedbackEffectUtils::instantOnKeyRepeat(const HbWidget *widget, Hb::InteractionModifiers modifiers)
 {
     HbFeedback::InstantEffect effect = HbFeedback::Sensitive;
 
@@ -554,10 +566,13 @@
             effect = HbFeedback::SensitiveButton;
 
             // input widget special case
-            if (widget->type() == Hb::ItemType_InputButtonGroup
-             || widget->type() == Hb::ItemType_InputFunctionButton) {
+            if (widget->type() == Hb::ItemType_InputButtonGroup && modifiers & Hb::ModifierInputFunctionButton) {
+                effect = HbFeedback::BasicKeypad;
+            }
+            else if (widget->type() == Hb::ItemType_InputButtonGroup) {
                 effect = HbFeedback::SensitiveKeypad;
             }
+
             break;
 
         case HbFeedbackEffectUtils::List:
@@ -840,7 +855,10 @@
 
         default:
             break;
+    }
 
+    if (widget->type() == Hb::ItemType_ScrollBar) {
+        effect = HbFeedback::ContinuousNone;
     }
 
     if (interaction == Hb::ContinuousPinched) {
@@ -881,10 +899,6 @@
                 break;
        }
     }
-    else if (const HbScrollBar *scrollbar = qobject_cast<const HbScrollBar *>(widget)) {
-        Q_UNUSED(scrollbar);
-        intensity = HbFeedback::IntensitySmooth;
-    }
     else {
         // The default intensity for continuous effects
         intensity = HbFeedback::IntensityFull;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.h
--- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.h	Tue Jul 06 14:36:53 2010 +0300
@@ -60,7 +60,7 @@
     static WidgetFamily widgetFamily(const HbWidget *widget);
     static HbFeedback::InstantEffect instantOnPress(const HbWidget *widget, Hb::InteractionModifiers modifiers);
     static HbFeedback::InstantEffect instantOnRelease(const HbWidget *widget, Hb::InteractionModifiers modifiers);
-    static HbFeedback::InstantEffect instantOnKeyRepeat(const HbWidget *widget);
+    static HbFeedback::InstantEffect instantOnKeyRepeat(const HbWidget *widget, Hb::InteractionModifiers modifiers);
     static HbFeedback::InstantEffect instantOnDrag(const HbWidget *widget, Hb::InteractionModifiers modifiers);
     static HbFeedback::InstantEffect instantOnKeyPress(const HbWidget *widget, Hb::InteractionModifiers modifiers);
     static HbFeedback::InstantEffect instantOnEditorHighlight(const HbWidget *widget, int previousCursorFocus);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/common/hbinputbasichandler.cpp
--- a/src/hbplugins/inputmethods/common/hbinputbasichandler.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputbasichandler.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -155,8 +155,12 @@
     switch (event->key()) {
     case Qt::Key_Backspace:
     case HbInputButton::ButtonKeyCodeDelete: {
-        QKeyEvent keyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier);
-        sendAndUpdate(keyEvent);
+        // passing both the keypress and keyrelease events
+        // as webkit requires both the events to be delivered to them.
+        QKeyEvent keyEventPress(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier);
+        QKeyEvent keyEventRelease(QEvent::KeyRelease, Qt::Key_Backspace, Qt::NoModifier);
+        sendAndUpdate(keyEventPress);
+        sendAndUpdate(keyEventRelease);
         // pass event to auto completer.
         deleteCharacterInAutoCompleter();
         // return false since the event is sent forward
@@ -173,6 +177,10 @@
         }
         break;
     case HbInputButton::ButtonKeyCodeSettings:
+        // Hide the autocompletion popup when InputSetting dialog is launched
+        if(d->mAutoCompleter) {
+            d->mInputMethod->closeAutoCompletionPopup();
+        }
 		break;
     default:
         ret = HbInputModeHandler::filterEvent(event);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/common/hbinputmodehandler.cpp
--- a/src/hbplugins/inputmethods/common/hbinputmodehandler.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputmodehandler.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -73,34 +73,33 @@
     return -1;
 }
 
-void HbInputModeHandlerPrivate::getAndFilterCharactersBoundToKey(QStringList &spellList, Qt::Key key)
+void HbInputModeHandlerPrivate::getAndFilterCharactersBoundToKey(QString &allowedChars, HbKeyboardType type, \
+                                                                 int key, HbModifiers modifiers)
 {
-    HbInputFocusObject *focusObject = mInputMethod->focusObject();
-
-    spellList.clear();
-    // Get the functionized character
-    const HbMappedKey* mappedKey = mKeymap->keyForKeycode(mInputMethod->inputState().keyboard(), key);
+    allowedChars.clear();
+    HbInputLanguage language = mInputMethod->inputState().language();
+	
+    if (!mKeymap) {
+        mKeymap = HbKeymapFactory::instance()->keymap(language);
+    }
+    const HbMappedKey* mappedKey = mKeymap->keyForKeycode(type, key);
     if (!mappedKey) {
         return;
     }
-
-    if (!mappedKey->characters(HbModifierFnPressed).isNull() && focusObject && focusObject->characterAllowedInEditor(mappedKey->characters(HbModifierFnPressed).at(0))) {
-        spellList.append(mappedKey->characters(HbModifierFnPressed).at(0));
-    }
-
-    // Get the characters mapped to the key.
-    HbInputState inputState = mInputMethod->inputState();
-    HbTextCase textCase = inputState.textCase();
-    HbModifiers modifiers = HbModifierNone;
-	
-    if (textCase == HbTextCaseUpper || textCase == HbTextCaseAutomatic) {
-        modifiers |= HbModifierShiftPressed;
-    }
-    for (int i=0; i < mappedKey->characters(modifiers).length(); i++) {
-        if (focusObject && focusObject->characterAllowedInEditor(mappedKey->characters(modifiers).at(i))) {
-            spellList.append(mappedKey->characters(modifiers).at(i));
-        }
-    }
+    QString chars = mappedKey->characters(modifiers);
+	// check whether current input language supports native digits. if yes, replace latin digits with native digits    
+    for (int i = 0; i < chars.length(); i++) {
+        if (chars.at(i) >= '0' && chars.at(i) <= '9') {
+            chars = chars.replace(chars.at(i), HbInputUtils::findFirstNumberCharacterBoundToKey(mappedKey,
+				language, HbInputUtils::inputDigitType(language)));
+        }		
+    }		
+    // We need to see which of the characters in keyData are allowed to the editor.
+    // this looks like expensive operation, need to find out a better way/place to do it.
+    HbInputFocusObject *focusedObject = mInputMethod->focusObject();
+    if(focusedObject) {
+        focusedObject->filterStringWithEditorFilter(chars,allowedChars);
+    } 
 }
 
 
@@ -293,30 +292,10 @@
     if (type != HbKeyboardSctPortrait && (textCase == HbTextCaseUpper || textCase == HbTextCaseAutomatic)) {
         modifiers |= HbModifierShiftPressed;
     }
-    HbInputLanguage language = d->mInputMethod->inputState().language();
-	
-    if (!d->mKeymap) {
-        d->mKeymap = HbKeymapFactory::instance()->keymap(language);
-    }
-    const HbMappedKey* mappedKey = d->mKeymap->keyForKeycode(type, key);
-    if (!mappedKey) {
-        return 0;
-    }
-    QString chars = mappedKey->characters(modifiers);
-	// check whether current input language supports native digits. if yes, replace latin digits with native digits    
-    for (int i = 0; i < chars.length(); i++) {
-        if (chars.at(i) >= '0' && chars.at(i) <= '9') {
-            chars = chars.replace(chars.at(i), HbInputUtils::findFirstNumberCharacterBoundToKey(mappedKey,
-				language, HbInputUtils::inputDigitType(language)));
-        }		
-    }		
-    // We need to see which of the characters in keyData are allowed to the editor.
-    // this looks like expensive operation, need to find out a better way/place to do it.
-    QString allowedChars = chars;
-    HbInputFocusObject *focusedObject = d->mInputMethod->focusObject();
-    if(focusedObject) {
-        focusedObject->filterStringWithEditorFilter(chars,allowedChars);
-    } 
+
+    QString allowedChars;
+    getAndFilterCharactersBoundToKey(allowedChars,type,key,modifiers);
+
     QChar character = 0;
     if (!allowedChars.isNull()) {
         if (index >= allowedChars.length() || index < 0) {
@@ -324,6 +303,9 @@
         }
         character = allowedChars.at(index);
         index++;
+        if (index >= allowedChars.length() || index < 0) {
+            index = 0;
+        }
     }
     return character;
 }
@@ -331,10 +313,11 @@
 /*!
     This function gets all the characters bound to a key and filters those character based on the editor.
 */
-void HbInputModeHandler::getAndFilterCharactersBoundToKey(QStringList &spellList, Qt::Key key)
+void HbInputModeHandler::getAndFilterCharactersBoundToKey(QString &allowedChars, HbKeyboardType type, \
+                                                          int key, HbModifiers modifiers)
 {
     Q_D(HbInputModeHandler);
-    d->getAndFilterCharactersBoundToKey(spellList, key);
+    d->getAndFilterCharactersBoundToKey(allowedChars,type,key,modifiers);
 }
 
 /*!
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/common/hbinputmodehandler.h
--- a/src/hbplugins/inputmethods/common/hbinputmodehandler.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputmodehandler.h	Tue Jul 06 14:36:53 2010 +0300
@@ -85,7 +85,7 @@
 
     // Utility functions.
     void commitFirstMappedNumber(int key, HbKeyboardType type);
-    void getAndFilterCharactersBoundToKey(QStringList &list, Qt::Key key);
+    void getAndFilterCharactersBoundToKey(QString &allowedChars, HbKeyboardType type, int key, HbModifiers modifiers);
     virtual QChar getNthCharacterInKey(int &index, int key, HbKeyboardType type);
     virtual void commitAndAppendString(const QString& string);
     virtual void commitAndUpdate(const QString& string, int replaceFrom = 0, int replaceLength = 0, bool isAsync = false);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/common/hbinputmodehandler_p.h
--- a/src/hbplugins/inputmethods/common/hbinputmodehandler_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputmodehandler_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -39,7 +39,7 @@
     void init();
 
     virtual void _q_timeout();
-    void getAndFilterCharactersBoundToKey(QStringList &spellList, Qt::Key key);
+    void getAndFilterCharactersBoundToKey(QString &allowedChars, HbKeyboardType type, int key, HbModifiers modifiers);
     void updateTextCase();
 
     // HbPredictionCallback
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/common/hbinputpredictionhandler.cpp
--- a/src/hbplugins/inputmethods/common/hbinputpredictionhandler.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputpredictionhandler.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -46,7 +46,6 @@
     mCandidates(0),
     mBestGuessLocation(0),
     mShowTail(true),
-    mTailShowing(false),
     mAutoAddedSpace(true),
     mCanContinuePrediction(true),
     mShowTooltip(true),
@@ -64,13 +63,17 @@
 
 void HbInputPredictionHandlerPrivate::deleteOneCharacter()
 {
+    if (!mEngine && !mInputMethod->focusObject()) {
+        return;
+    }
     mShowTail = true;
     mShowTooltip = true;
     // A backspace in predictive means updating the engine for the delete key press
     // and get the new candidate list from the engine.
     if ( mEngine->inputLength() >= 1 ) {
-        //Only autocomplition part should be deleted when autocompliton part is enable and user pressed a delete key
-        if(false == mTailShowing) {
+        int tailLength =  mInputMethod->focusObject()->preEditString().length() - mEngine->inputLength();
+        //Only autocomplition part should be deleted when autocompliton part is shown and user pressed a delete key
+        if(tailLength <= 0) { // no autocompletion part displayed
             mEngine->deleteKeyPress( this );
         }
         //To prevent showing autocompletion part while deleting the characters using backspace key
@@ -218,12 +221,10 @@
 				list.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, mEngine->inputLength(), 0, 0));
                 QInputMethodEvent event(mCandidates->at(mBestGuessLocation), list);
                 focusedObject->sendEvent(event);
-                mTailShowing = true;
             } else {
 				list.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, mCandidates->at(mBestGuessLocation).length(), 0, 0));
                 QInputMethodEvent event(mCandidates->at(mBestGuessLocation).left(mEngine->inputLength()), list);
                 focusedObject->sendEvent(event);
-                mTailShowing = false;
             }
             if (mShowTooltip && mBestGuessLocation > 0 && mCandidates->at(0).mid(0, mEngine->inputLength()) \
                 != mCandidates->at(mBestGuessLocation).mid(0, mEngine->inputLength())) {                
@@ -273,59 +274,16 @@
 		}
         ret = true;
         break;
-    case Qt::Key_Period: // TODO: better handling for punctuation
-    case Qt::Key_Comma: { // Need to take fn, shift etc. in account
-            HbModifier modifier = HbModifierNone;
-            int currentTextCase = focusObject->editorInterface().textCase();
-            if ( HbTextCaseUpper == currentTextCase || HbTextCaseAutomatic == currentTextCase ) {
-                modifier = HbModifierShiftPressed;
-            }
-            QString qc;
-            const HbMappedKey* mappedKey = mKeymap->keyForKeycode(mInputMethod->inputState().keyboard(), event->key());
-
-            if (mappedKey) {
-                if (modifier == HbModifierNone) {
-                    qc = mappedKey->characters(HbModifierNone).left(1);
-                } else if (modifier == HbModifierShiftPressed) {
-                    qc = mappedKey->characters(HbModifierShiftPressed).left(1);
-                }
-            }
-
-            if (mEngine->inputLength() == 0) {
-                QList<QInputMethodEvent::Attribute> list;
-                QInputMethodEvent event(QString(), list);
-                if (mAutoAddedSpace) {
-                    int cursorPos = mInputMethod->focusObject()->inputMethodQuery(Qt::ImCursorPosition).toInt();
-                    QString text = mInputMethod->focusObject()->inputMethodQuery(Qt::ImSurroundingText).toString();
-                    if (cursorPos > 0 && text.at(cursorPos-1).isSpace()) {
-                        event.setCommitString(qc, -1, 1);
-                    } else {
-                        event.setCommitString(qc);
-                    }
-                } else {
-                    event.setCommitString(qc);
-                }
-                mAutoAddedSpace = false;
-                q->sendAndUpdate(event);
-            } else {
-                // Fix for input stopping after ,. keys in qwerty predictive
-                commitAndAppendCharacter(qc.at(0));
-                QString empty;
-                q->processExactWord(empty);
-            }
-            ret = true;
-        }
-        break;
+    
     case HbInputButton::ButtonKeyCodeEnter:
     case HbInputButton::ButtonKeyCodeSpace:
-    case Qt::Key_0: {//Space
+    
+        {
             // A space means we have to commit the candidates when we are in predictive mode.
             QChar qc(event->key());
             if (qc == Qt::Key_Enter) {
                 qc = QChar('\n');  // Editor expects normal line feed.
-            } else if (qc == Qt::Key_0) {
-                qc = QChar(' ');
-            }
+            } 
             commitAndAppendCharacter(qc);
             // if exact word popup functionality is on then we should inform exact word popup
             // about the space.//++TODO
@@ -443,8 +401,6 @@
     if (mCandidates) {
         mCandidates->clear();
     }
-
-    mTailShowing = false;
 }
 
 void HbInputPredictionHandlerPrivate::commit()
@@ -511,7 +467,6 @@
 
     //Enable the flag after commit
     mCanContinuePrediction = true;
-	mTailShowing = false;
 }
 
 /*!
@@ -540,8 +495,6 @@
 
     //Enable the flag after commit
     mCanContinuePrediction = true;
-	mTailShowing = false;
-
 }
 
 void HbInputPredictionHandlerPrivate::commitExactWord()
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/common/hbinputpredictionhandler_p.h
--- a/src/hbplugins/inputmethods/common/hbinputpredictionhandler_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputpredictionhandler_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -64,7 +64,6 @@
     QStringList         *mCandidates;
     int                 mBestGuessLocation;
     bool                mShowTail;
-    bool                mTailShowing;
     bool                mAutoAddedSpace;
     bool                mCanContinuePrediction;
     bool                mShowTooltip;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/common/hbinputspellquerydialog.cpp
--- a/src/hbplugins/inputmethods/common/hbinputspellquerydialog.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputspellquerydialog.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -95,7 +95,15 @@
     mDidHandleFinish = false;
     mainWindow()->setProperty("SpellQueryLaunched", true);
     open(this,SLOT(dialogClosed(HbAction*)));
-    mPrimaryAction = qobject_cast<HbAction*>(actions().first()); 
+    mPrimaryAction = qobject_cast<HbAction*>(actions().first());
+
+    // Open keypad for the spell query
+    QInputContext *ic = qApp->inputContext();
+    if (ic) {
+        QEvent *event = new QEvent(QEvent::RequestSoftwareInputPanel);
+        ic->filterEvent(event);
+        delete event;
+    }
 }
 
 void HbInputSpellQuery::dialogClosed(HbAction* action)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/hbim/hbim.cpp
--- a/src/hbplugins/inputmethods/hbim/hbim.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/hbim/hbim.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -28,6 +28,7 @@
 #include <private/hbmainwindow_p.h>
 #include <hbinputmethod.h>
 #include <hbinputmethod_p.h>
+#include <hbapplication.h>
 
 bool HbInputInitializer::mRecursive = false;
 // ---------------------------------------------------------------------------
@@ -51,29 +52,33 @@
 }
 
 // ---------------------------------------------------------------------------
-// Virtual12KeyImpl::create
+// HbInputInitializer::create
 // 
 // ---------------------------------------------------------------------------
 //
 QInputContext* HbInputInitializer::create(const QString& key)
 {
     if (key == QString("hbim")) {
-        // this function is called from Qt framework's QApplication::inputContext()
-        // now if inside this function or any function which is called from this function.
+        // This function is called from Qt framework's QApplication::inputContext().
+        // Now if this function or any function which is called from this function
         // calls QApplication::inputContext() it will result in infinite recursion.
-        // to guard this we are using this with mRecursive.
-        // also setting HbMainWindowPrivate::initializeInputs to false will avoid 
-        // re-initialization of inputfw when HbMainWindow is launched.
+        // To guard this we are using mRecursive.
+        // Also setting HbMainWindowPrivate::initializeInputs to false will avoid 
+        // re-initialization of inputfw if HbMainWindow is launched.
+        // If the app is HbApplication, we don't do the initialization yet,
+        // but let HbMainWindow do deferred construction later.
         if (!mRecursive) {
-            HbMainWindowPrivate::initializeInputs = false;
             mRecursive = true;
-            HbInputMethod::initializeFramework(*qApp);
+            if (!qobject_cast<HbApplication*>(qApp)) {
+                HbMainWindowPrivate::initializeInputs = false;
+                HbInputMethod::initializeFramework(*qApp);
+            }
             QInputContext *ic = qApp->inputContext();
             mRecursive = false;
             return ic;
         } else {
-            // it was a recursive call, so for clarity return 0 from here.
-            // this function is called only when QApplicaion's inputContext is null.
+            // It was a recursive call, so for clarity return 0 from here.
+            // This function is called only when QApplication's inputContext is null,
             // so returning a null for a recursive call.
             return 0;
         }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/hbim/hbim.h
--- a/src/hbplugins/inputmethods/hbim/hbim.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/hbim/hbim.h	Tue Jul 06 14:36:53 2010 +0300
@@ -31,7 +31,7 @@
 class HbInputInitializer : public QInputContextPlugin
 {
     Q_OBJECT
-    
+
 public:
     HbInputInitializer(QObject *parent = 0);
     ~HbInputInitializer();
@@ -43,7 +43,7 @@
     QStringList keys() const;
     QStringList languages(const QString& key);
 private:
-    static bool mRecursive;    
+    static bool mRecursive;
 };
 
 #endif  //HB_IM
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/touchinput/hbinput12keytouchkeyboard.cpp
--- a/src/hbplugins/inputmethods/touchinput/hbinput12keytouchkeyboard.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinput12keytouchkeyboard.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -36,7 +36,7 @@
 #include "hbinputbutton.h"
 #include "hbinputmodeindicator.h"
 
-const qreal HbKeyboardHeightInUnits = 37.8;
+const qreal HbKeyboardHeightInUnits = 36.9;
 const qreal HbKeyboardWidthInUnits = 53.8;
 
 const int HbFirstRowIndex = 0;
@@ -254,10 +254,21 @@
                 ++key;
             } else if (keyCode(i) == HbInputButton::ButtonKeyCodeShift) {
                 if (mMode == EModeNumeric) {
-                    item->setText(QString("#"), HbInputButton::ButtonTextIndexSecondaryFirstRow);
+                    item->setIcon(HbIcon(), HbInputButton::ButtonIconIndexPrimary);
+                    item->setText(QString("#"), HbInputButton::ButtonTextIndexPrimary);
+                    item->setText(QString(), HbInputButton::ButtonTextIndexSecondaryFirstRow);
                 } else if (mMode == EModeAbc) {
+                    item->setIcon(HbIcon(HbInputButtonIconShift), HbInputButton::ButtonIconIndexPrimary);
                     item->setText(QString(" "), HbInputButton::ButtonTextIndexSecondaryFirstRow);
                 }
+            } else if (keyCode(i) == HbInputButton::ButtonKeyCodeAsterisk) {
+                if (mMode == EModeNumeric) {
+                    item->setText(QString("*"), HbInputButton::ButtonTextIndexPrimary);
+                    item->setText(QString(""), HbInputButton::ButtonTextIndexSecondaryFirstRow);
+                } else if (mMode == EModeAbc) {
+                    item->setText(QString("*"), HbInputButton::ButtonTextIndexPrimary);
+                    item->setText(QString("+"), HbInputButton::ButtonTextIndexSecondaryFirstRow);
+                }
             }
         }
         buttonGroup->setButtons(buttons);
@@ -344,4 +355,19 @@
     return QSizeF(result);
 }
 
+/*!
+Sends key event to owning input method.
+*/
+void Hb12KeyTouchKeyboard::sendLongPressEvent(const QKeyEvent &event)
+{
+    Q_D(Hb12KeyTouchKeyboard);
+    if (d->mMode == EModeAbc) {
+        HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(contentItem());
+        if (buttonGroup) {
+            buttonGroup->cancelButtonPress();
+        }
+    }
+    HbInputVkbWidget::sendLongPressEvent(event);
+}
+
 // End of file
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/touchinput/hbinput12keytouchkeyboard.h
--- a/src/hbplugins/inputmethods/touchinput/hbinput12keytouchkeyboard.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinput12keytouchkeyboard.h	Tue Jul 06 14:36:53 2010 +0300
@@ -46,6 +46,9 @@
 public: // From HbInputVkbWidget
     QSizeF preferredKeyboardSize();
 
+public slots:
+    void sendLongPressEvent(const QKeyEvent &event);
+
 protected:
     Hb12KeyTouchKeyboard(Hb12KeyTouchKeyboardPrivate &dd, HbInputMethod *owner, const HbKeymap *keymap, QGraphicsItem* parent);
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.cpp
--- a/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -61,23 +61,25 @@
 
     int index = mNumChr;
     do {
+        int currCharIndex = 0;
+        mCurrentChar = 0;
 	    //This condition is to avoid get the characters mapped to Asterisk
 	    //Especially for Thai language we have mapped character to Asterisk
         if (buttonId != HbInputButton::ButtonKeyCodeAsterisk ||
             mInputMethod->currentKeyboardType() == HbKeyboardSctPortrait) {
+            currCharIndex = mNumChr ;
             mCurrentChar = q->getNthCharacterInKey(mNumChr, buttonId, type);
 	    }
 
         if (mCurrentChar != 0) {
             if (focusObject->characterAllowedInEditor(mCurrentChar)) {
-                QString str;
-                str += mCurrentChar;
-                
-                //If the keypad is SCT, we can commit the character immidiately
-                if (mInputMethod->currentKeyboardType() == HbKeyboardSctPortrait) {
-                    focusObject->filterAndCommitCharacter(mCurrentChar);
-                    mCurrentChar = 0;
+                //If the keypad is SCT or button has only one character that is allowed to editor,
+                //we can commit the character immidiately
+                if (mInputMethod->currentKeyboardType() == HbKeyboardSctPortrait || currCharIndex == mNumChr) {
+                    _q_timeout();
                 } else {
+                    QString str;
+                    str += mCurrentChar;
                     QList<QInputMethodEvent::Attribute> list;
                     QInputMethodEvent event(str, list);
                     focusObject->sendEvent(event);
@@ -106,11 +108,16 @@
         if (mDownKey == HbInputButton::ButtonKeyCodeShift) {
             mLongPressHappened = true;
             mInputMethod->switchMode(HbInputButton::ButtonKeyCodeShift);                
-        } else if (mDownKey == HbInputButton::ButtonKeyCodeSymbol ||
-            (mDownKey == HbInputButton::ButtonKeyCodeAsterisk &&
-            mInputMethod->currentKeyboardType() != HbKeyboardSctPortrait)) {
+        } else if (mDownKey == HbInputButton::ButtonKeyCodeSymbol) {
+            // launch the smiley popup when long press of Sym key is received
             mLongPressHappened = true;
             mInputMethod->selectSpecialCharacterTableMode();
+        } else if (mDownKey == HbInputButton::ButtonKeyCodeAsterisk &&
+            // launch the SCT keypad when long press of Asterisk key is 
+			// received in non-SCT mode
+            !mInputMethod->isSctModeActive()) {
+            mLongPressHappened = true;
+            mInputMethod->switchMode(mDownKey);
         } else if (mDownKey != HbInputButton::ButtonKeyCodeDelete &&
                    mInputMethod->currentKeyboardType() != HbKeyboardSctPortrait) {
             mLongPressHappened = true;
@@ -169,12 +176,12 @@
             return false;
         }
         mDownKey = 0;
-		if ( mLongPressHappened ){
+        if ( mLongPressHappened ){
             mLongPressHappened = false;
             return false;
         }
 
-		if(mTimer->isActive() && mLastKey != buttonId) {
+        if(mTimer->isActive() && mLastKey != buttonId) {
             mNumChr = 0;
 
             // For QLineEdit it works fine. For HbLineEdit, need to set the state 
@@ -191,11 +198,7 @@
             refreshAutoCompleter();
         }
 
-        if (buttonId == HbInputButton::ButtonKeyCodeEnter) {
-            mInputMethod->closeKeypad();
-            mLastKey = buttonId;
-            return true;
-        } else if (buttonId == HbInputButton::ButtonKeyCodeShift) {
+        if (buttonId == HbInputButton::ButtonKeyCodeShift) {
             // single tap of shift key toggles prediction status in case insensitive languages
             // The Editor should not be Web or URL which allows only Latin Alphabet
             if (!HbInputSettingProxy::instance()->globalInputLanguage().isCaseSensitiveLanguage() &&
@@ -254,10 +257,11 @@
         if (!mTimer->isActive() && buttonId == HbInputButton::ButtonKeyCodeSymbol) {
             return true;
         }
-        if (buttonId == HbInputButton::ButtonKeyCodeAsterisk || buttonId == HbInputButton::ButtonKeyCodeSymbol ||
+        // switch the keypad mode when the short key press of Asterisk key in non-SCT mode
+        // or SYM button or Alphabet button is received		
+        if ((buttonId == HbInputButton::ButtonKeyCodeAsterisk &&
+            !mInputMethod->isSctModeActive()) || buttonId == HbInputButton::ButtonKeyCodeSymbol ||
             buttonId == HbInputButton::ButtonKeyCodeAlphabet) {
-            //Same asterisk key is used for launching candidate list (long key press)
-            //and also for SCT. So, do not launch SCT if candidate list is already launched.            
             mInputMethod->switchMode(buttonId);
             return true;
         }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.cpp
--- a/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -82,7 +82,10 @@
     int buttonId = keyEvent->key();
 
     if (keyEvent->isAutoRepeat() && mLastKey == buttonId) {
-        if (buttonId == HbInputButton::ButtonKeyCodeAsterisk) {
+        // mode switch should happen only when Qt::Key_Asterisk key is pressed in non-SCT
+        // keypad.			
+        if (buttonId == HbInputButton::ButtonKeyCodeAsterisk &&
+            !mInputMethod->isSctModeActive()) {
             //Remove the "?" mark if present
             if (!mCanContinuePrediction) {
                 chopQMarkAndUpdateEditor();
@@ -108,7 +111,10 @@
                 deleteOneCharacter();
                 mLongPressHappened = true;
             }
-            if (buttonId != HbInputButton::ButtonKeyCodeDelete) {
+            // commit the first mapped number character when long key press
+            // of character key received in alphanumeric mode						
+            if (buttonId != HbInputButton::ButtonKeyCodeDelete &&
+                !mInputMethod->isSctModeActive()) {
                 q->commitFirstMappedNumber(buttonId, mInputMethod->currentKeyboardType());
                 mLongPressHappened = true;
             }
@@ -169,8 +175,11 @@
         - Should launch Spell Query Dialog if we cannot continue with prediction 
     - Behavior of Short Press of Asterisk Key when not in inline editing state 
         - Should launch SCT
+    - Behaviour of Short Press of Asterisk Key in SCT keypad
+        - Should input the * character and should not change the keypad mode			
     */
-    else if (buttonId == HbInputButton::ButtonKeyCodeAsterisk ) {
+    else if (buttonId == HbInputButton::ButtonKeyCodeAsterisk &&
+        !mInputMethod->isSctModeActive()) {
         if(!mCanContinuePrediction && (*mCandidates)[mBestGuessLocation].endsWith('?')) {			
             //Remove the "?" mark
             (*mCandidates)[mBestGuessLocation].chop(1);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.cpp
--- a/src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -133,6 +133,7 @@
     case HbInputButton::ButtonKeyCodeSymbol: { // Ctrl/Chr
     case HbInputButton::ButtonKeyCodeAlphabet:
         mInputMethod->switchSpecialCharacterTable();
+        q->HbInputPredictionHandler::actionHandler(HbInputModeHandler::HbInputModeActionSetKeypad);
         }		
         break;
     case HbInputButton::ButtonKeyCodeSettings:
@@ -152,12 +153,6 @@
                 modifiers |= Qt::ShiftModifier;
             }
 
-            if (key != HbInputButton::ButtonKeyCodeDelete &&
-                key != HbInputButton::ButtonKeyCodeEnter &&
-                mInputMethod->currentKeyboardType() == HbKeyboardSctLandscape) {
-                q->sctCharacterSelected(QChar(key));
-                return true;
-            }
 
             // let's pass it to the base class.
             ret = q->HbInputPredictionHandler::filterEvent(event);
@@ -253,7 +248,6 @@
     HbInputModeHandler::commitAndUpdate(string, replaceFrom, replaceLength);
     d->mInputMethod->closeExactWordPopup();
     d->mExactPopupLaunched = false;  
-    d->mTailShowing = false;
 }
 
 /*!
@@ -315,6 +309,9 @@
 
 void HbInputPredictionQwertyHandlerPrivate::deleteOneCharacter()
 {
+    if (!mEngine && !mInputMethod->focusObject()) {
+        return;
+    }
     mShowTail = true;
     mShowTooltip = true;
     // A backspace in predictive means updating the engine for the delete key press
@@ -329,19 +326,16 @@
         //we actually reduce ambiguity in the engine and hence we should have
         //some word getting predicted as a result to that.
         mCanContinuePrediction = true;
- 
-        if(false == mTailShowing && true == mExactPopupLaunched) {
-                mEngine->deleteKeyPress();
-                mEngine->updateCandidates(mBestGuessLocation);
+
+        int tailLength =  mInputMethod->focusObject()->preEditString().length() - mEngine->inputLength();
+        if(tailLength <= 0 && true == mExactPopupLaunched) {
+            mEngine->deleteKeyPress();
+            mEngine->updateCandidates(mBestGuessLocation);
         }
 
-        mBestGuessLocation = 0 ;
-        if(mCandidates->count() && (mCandidates->count()>mBestGuessLocation) && false == mTailShowing && false == mExactPopupLaunched) {
+        mBestGuessLocation = 0;
+        if(mCandidates->count() && (mCandidates->count()>mBestGuessLocation) && tailLength <= 0 && false == mExactPopupLaunched) {
             QString currentWord = mCandidates->at(mBestGuessLocation);
-            if(currentWord.length() > mEngine->inputLength()) {
-                //chop off the autocompletion part
-                currentWord = currentWord.left(mEngine->inputLength());
-            }
             if(currentWord.length()) {
                 currentWord.chop(1);
                 mEngine->deleteKeyPress();
@@ -352,7 +346,7 @@
             } else {
                 commit(QString(""),false);
             }
-                
+
         } else if(!mCandidates->count() && mEngine->inputLength() >= 1) {
             //If Input length greater or equal to one then Append the current word to candidate 
             mCandidates->append(mEngine->currentWord());
@@ -446,14 +440,12 @@
                 // the best guess word is sent to the editor
                 QInputMethodEvent event(bestGuessWord, list);
                 focusedObject->sendEvent(event);
-                mTailShowing = true;
             } else {
                 QInputMethodEvent::Attribute textstyle(QInputMethodEvent::TextFormat, 0, mCandidates->at(mPrimaryCandidateIndex).length(), underlined);
                 list.append(textstyle);
                 list.append(QInputMethodEvent::Attribute(QInputMethodEvent::Cursor, mCandidates->at(mPrimaryCandidateIndex).length(), 0, 0));
                 QInputMethodEvent event(mCandidates->at(mPrimaryCandidateIndex), list);
                 focusedObject->sendEvent(event);
-                mTailShowing = false;
             }
 
             if (mShowTooltip && mPrimaryCandidateIndex != mSecondaryCandidateIndex) {                
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/touchinput/hbinputqwerty10x4touchkeyboard.cpp
--- a/src/hbplugins/inputmethods/touchinput/hbinputqwerty10x4touchkeyboard.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputqwerty10x4touchkeyboard.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -36,7 +36,7 @@
 #include "hbinputbutton.h"
 #include "hbinputmodeindicator.h"
 
-const qreal HbKeyboardHeightInUnits = 34.6;
+const qreal HbKeyboardHeightInUnits = 33.7;
 const qreal HbKeyboardWidthInUnits = 95.5;
 
 const int HbVirtualQwertyNumberOfRows = 4;
@@ -148,18 +148,26 @@
     if (buttonGroup) {
         QList<HbInputButton*> buttons = buttonGroup->buttons();
         for (int i = 0; i < buttons.count(); ++i) {
-            if (keyCode(i) == HbInputButton::ButtonKeyCodeCharacter) {
-                HbInputButton *item = buttons.at(i);
-
-                HbInputButton::HbInputButtonState state = item->state();
+            HbInputButton *item = buttons.at(i);
+            HbInputButton::HbInputButtonState state = item->state();
+            if (keyCode(i) == HbInputButton::ButtonKeyCodeCharacter) {        
                 QString data = item->text(HbInputButton::ButtonTextIndexPrimary);
                 if (data.isEmpty() || !focusedObject->characterAllowedInEditor(data.at(0))) {
                     state = HbInputButton::ButtonStateDisabled;
                 } else if (item->state() == HbInputButton::ButtonStateDisabled) {
                     state = HbInputButton::ButtonStateReleased;
                 }
-                item->setState(state);
             }
+            else if (keyCode(i) == HbInputButton::ButtonKeyCodeSpace) {
+                bool allowed = focusedObject->characterAllowedInEditor(QChar(' '));
+                if (!allowed) {
+                    state = HbInputButton::ButtonStateDisabled;
+                }
+                else if (item->state() == HbInputButton::ButtonStateDisabled) {
+                    state = HbInputButton::ButtonStateReleased; 
+                }
+            }
+            item->setState(state);
         }
         buttonGroup->setButtons(buttons);
     }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/touchinput/hbinputqwerty11x4touchkeyboard.cpp
--- a/src/hbplugins/inputmethods/touchinput/hbinputqwerty11x4touchkeyboard.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputqwerty11x4touchkeyboard.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -36,7 +36,7 @@
 #include "hbinputbutton.h"
 #include "hbinputmodeindicator.h"
 
-const qreal HbKeyboardHeightInUnits = 34.6;
+const qreal HbKeyboardHeightInUnits = 33.7;
 const qreal HbKeyboardWidthInUnits = 95.5;
 
 const int HbVirtualQwertyNumberOfRows = 4;
@@ -139,21 +139,6 @@
     return HbButtonKeyCodeTable[buttonId];
 }
 
-void HbQwerty11x4KeyboardPrivate::setRockerPosition()
-{
-    Q_Q(HbQwerty11x4Keyboard);
-
-    HbInputVkbWidgetPrivate::setRockerPosition();
-
-    HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
-    if (buttonGroup) {
-        QPointF position = mRocker->pos();
-        position.setX(position.x() + 0.5 * buttonGroup->size().width() / HbVirtualQwertyNumberOfColumns);
-
-        mRocker->setPos(position);
-    }
-}
-
 /*!
 Constructs the object. owner is the owning input method implementation. Keymap
 is key mapping data to be used to display button texts. Key mapping data can be
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/touchinput/hbinputqwerty11x4touchkeyboard_p.h
--- a/src/hbplugins/inputmethods/touchinput/hbinputqwerty11x4touchkeyboard_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputqwerty11x4touchkeyboard_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -51,7 +51,6 @@
 
     void init();
     int keyCode(int buttonId);
-    void setRockerPosition();
 };
 
 #endif // HB_INPUT_QWERTY_11x4_TOUCH_KEYBOARD_PRIVATE_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/touchinput/hbinputqwertynumerictouchkeyboard.cpp
--- a/src/hbplugins/inputmethods/touchinput/hbinputqwertynumerictouchkeyboard.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputqwertynumerictouchkeyboard.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -36,7 +36,7 @@
 #include "hbinputbutton.h"
 #include "hbinputmodeindicator.h"
 
-const qreal HbKeyboardHeightInUnits = 17.3;
+const qreal HbKeyboardHeightInUnits = 16.4;
 const qreal HbKeyboardWidthInUnits = 95.5;
 
 const int HbVirtualQwertyNumberOfRows = 2;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/touchinput/touchinputplugin.cpp
--- a/src/hbplugins/inputmethods/touchinput/touchinputplugin.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/touchinputplugin.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -31,31 +31,22 @@
 #include "virtualqwerty.h"
 #include "hbinputmodeproperties.h"
 
-// ---------------------------------------------------------------------------
-// HbTouchInputPlugin::HbTouchInputPlugin
-// 
-// Constructs HbTouchInputPlugin
-// ---------------------------------------------------------------------------
-//
+const QString HbTouchInput12KeyIcon("qtg_small_itut");
+const QString HbTouchInputQwertyIcon("qtg_small_keyboard");
+
 HbTouchInputPlugin::HbTouchInputPlugin(QObject *parent)
-    : QInputContextPlugin(parent)
+    : HbInputContextPlugin(parent)
 {
 }
 
-// ---------------------------------------------------------------------------
-// HbTouchInputPlugin::~HbTouchInputPlugin
-// 
-// ---------------------------------------------------------------------------
-//
+
 HbTouchInputPlugin::~HbTouchInputPlugin()
 {
 }
 
-// ---------------------------------------------------------------------------
-// Virtual12KeyImpl::create
-// 
-// ---------------------------------------------------------------------------
-//
+/*!
+\reimp
+*/
 QInputContext* HbTouchInputPlugin::create(const QString& key)
 {
     if (key == QString("HbVirtual12Key")) {
@@ -67,11 +58,9 @@
     }
 }
 
-// ---------------------------------------------------------------------------
-// HbTouchInputPlugin::description
-// 
-// ---------------------------------------------------------------------------
-//
+/*!
+\reimp
+*/
 QString HbTouchInputPlugin::description(const QString& key)
 {
     if (key == QString("HbVirtual12Key")) {
@@ -83,11 +72,9 @@
     }
 }
 
-// ---------------------------------------------------------------------------
-// HbTouchInputPlugin::displayName
-// 
-// ---------------------------------------------------------------------------
-//
+/*!
+\reimp
+*/
 QString HbTouchInputPlugin::displayName(const QString& key)
 {
     if (key == QString("HbVirtual12Key")) {
@@ -99,11 +86,9 @@
     }
 }
 
-// ---------------------------------------------------------------------------
-// HbTouchInputPlugin::keys
-// 
-// ---------------------------------------------------------------------------
-//
+/*!
+\reimp
+*/
 QStringList HbTouchInputPlugin::keys() const
 {
     QStringList keys;
@@ -112,11 +97,9 @@
     return keys;
 }
 
-// ---------------------------------------------------------------------------
-// HbTouchInputPlugin::languages
-// 
-// ---------------------------------------------------------------------------
-//
+/*!
+\reimp
+*/
 QStringList HbTouchInputPlugin::languages(const QString& key)
 {
     QStringList result;
@@ -139,6 +122,38 @@
     return QStringList(result);
 }
 
+/*!
+\reimp
+*/
+QStringList HbTouchInputPlugin::displayNames(const QString &key)
+{
+    Q_UNUSED(key);
+    return QStringList();
+}
+
+/*!
+\reimp
+*/
+HbIcon HbTouchInputPlugin::icon(const QString &key)
+{
+    if (key == "HbVirtual12Key") {
+        return HbIcon(HbTouchInput12KeyIcon);
+    } else if (key == "HbVirtualQwerty") {
+        return HbIcon(HbTouchInputQwertyIcon);
+    }
+
+    return HbIcon();
+}
+
+/*!
+\reimp
+*/
+QList<HbIcon> HbTouchInputPlugin::icons(const QString &key)
+{
+    Q_UNUSED(key);
+    return QList<HbIcon>();
+}
+
 //
 // Make plugin loadable.
 //
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/touchinput/touchinputplugin.h
--- a/src/hbplugins/inputmethods/touchinput/touchinputplugin.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/touchinputplugin.h	Tue Jul 06 14:36:53 2010 +0300
@@ -26,9 +26,9 @@
 #ifndef TouchInputPlugin_IMPL_H
 #define TouchInputPlugin_IMPL_H
 
-#include <QInputContextPlugin>
+#include <hbinputcontextplugin.h>
 
-class HbTouchInputPlugin : public QInputContextPlugin
+class HbTouchInputPlugin : public HbInputContextPlugin
 {
     Q_OBJECT
 
@@ -42,6 +42,9 @@
     QString displayName(const QString& key);
     QStringList keys() const;
     QStringList languages(const QString& key);
+    QStringList displayNames(const QString &key);
+    HbIcon icon(const QString &key);
+    QList<HbIcon> icons(const QString &key);
 };
 
 #endif // TouchInputPlugin_IMPL_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/touchinput/virtual12key.cpp
--- a/src/hbplugins/inputmethods/touchinput/virtual12key.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/virtual12key.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -51,9 +51,6 @@
 #include "hbinputprediction12keyhandler.h"
 #include "hbinputnumeric12keyhandler.h"
 
-const int HbSmileyNumberOfRows = 5;
-const int HbSmileyNumberOfColumns = 5;
-
 /*!
 \class HbVirtual12Key
 \brief Input method implementations for virtual ITU-T mode in HbInputs framework.
@@ -385,9 +382,7 @@
 */
 void HbVirtual12Key::keypadClosed()
 {
-    if (mOrientationAboutToChange) {
-        mOrientationAboutToChange = false;
-    }
+    mOrientationAboutToChange = false;
 }
 
 /*!
@@ -411,7 +406,14 @@
                 if (mCandidatePopup) {
                     mCandidatePopup->hide();
                 }
-                mVkbHost->minimizeKeypad(!stateChangeInProgress());
+
+                // Close input.
+                QInputContext* ic = qApp->inputContext();
+                if (ic) {
+                    QEvent *closeEvent = new QEvent(QEvent::CloseSoftwareInputPanel);
+                    ic->filterEvent(closeEvent);
+                    delete closeEvent;
+                }
             }
         }
     }
@@ -758,7 +760,7 @@
 void HbVirtual12Key::selectSpecialCharacterTableMode()
 {
     if (mItutKeypad) {
-        mItutKeypad->showSmileyPicker(HbSmileyNumberOfRows, HbSmileyNumberOfColumns);
+        mItutKeypad->showSmileyPicker();
     }
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbplugins/inputmethods/touchinput/virtualqwerty.cpp
--- a/src/hbplugins/inputmethods/touchinput/virtualqwerty.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/virtualqwerty.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -277,6 +277,8 @@
 
     // assign new keypad to be opened to varable mCurrentKeypad
     mCurrentKeypad =  keypadToOpen;
+    activeKeyboardChanged(currentKeyboardType());
+
 
     if (mVkbHost && mVkbHost->keypadStatus() != HbVkbHost::HbVkbStatusOpened) {
         connect(mVkbHost, SIGNAL(keypadClosed()), this, SLOT(keypadClosed()));
@@ -342,9 +344,8 @@
 
 void HbVirtualQwerty::keypadClosed()
 {
-    if (mOrientationAboutToChange) {
-        mOrientationAboutToChange = false;
-    }
+    mOrientationAboutToChange = false;
+    
     if (mVkbHost->keypadStatus() == HbVkbHost::HbVkbStatusMinimized) {
         closeExactWordPopup();
     }	
@@ -360,7 +361,14 @@
             if (mCandidatePopup) {
                 mCandidatePopup->hide();
             }
-            mVkbHost->minimizeKeypad(!stateChangeInProgress());
+
+            // Close input.
+            QInputContext* ic = qApp->inputContext();
+            if (ic) {
+                QEvent *closeEvent = new QEvent(QEvent::CloseSoftwareInputPanel);
+                ic->filterEvent(closeEvent);
+                delete closeEvent;
+            }
         }
     }
 }
@@ -518,7 +526,7 @@
 void HbVirtualQwerty::selectSpecialCharacterTableMode()
 {
     mQwertyAlphaKeypad = constructKeyboard(EModeAbc);
-    mQwertyAlphaKeypad->showSmileyPicker(4, 10);
+    mQwertyAlphaKeypad->showSmileyPicker();
 }
 
 /*!
@@ -745,7 +753,19 @@
 QPointF HbVirtualQwerty::getCursorCoordinatePosition()
 {
     QRectF microRect = focusObject()->microFocus();
-    return microRect.topLeft();
+    QPointF cursorPos = microRect.topLeft();
+	
+    if (mVkbHost) {
+        QSizeF exactPopupSize = mExactWordPopup->size();
+        QRectF activeViewRect = mVkbHost->applicationArea();
+        // if the exact word doesnt fit inside the visible area, then show it on the right side of
+        // the current cursor position        
+        if (microRect.left() + exactPopupSize.width() > activeViewRect.width()) {
+            qreal startPos = microRect.left() - exactPopupSize.width();
+			cursorPos.setX((startPos > activeViewRect.left()) ? startPos : activeViewRect.left());
+		} 		
+    }
+    return cursorPos;
 }
 
 /*!
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbdevicedialogappserver/hbddappfactorysymbian.cpp
--- a/src/hbservers/hbdevicedialogappserver/hbddappfactorysymbian.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbdevicedialogappserver/hbddappfactorysymbian.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -23,11 +23,13 @@
 **
 ****************************************************************************/
 
-#include "hbddappfactorysymbian.h"
+#include "hbddappfactorysymbian_p.h"
 
+#include <QApplication>
 #include <qs60mainapplication.h>
 #include <qs60maindocument.h>
 #include <qs60mainappui.h>
+#include <QSymbianEvent>
 
 // In order to override CCoeAppUi::FrameworkCallsRendezvous() Application/Document/AppUi needs to be
 // derived from.
@@ -50,10 +52,33 @@
 {
 protected:
     CApaDocument *CreateDocumentL()
-      {return new (ELeave) DeviceDialogMainDocument(*this);}
+        {return new (ELeave) DeviceDialogMainDocument(*this);}
 };
 
 CApaApplication *deviceDialogAppFactory()
 {
     return new DeviceDialogMainApplication;
 }
+
+HbDeviceDialogServerApp::HbDeviceDialogServerApp(QApplication::QS60MainApplicationFactory factory,
+    int &argc, char *argv[], Hb::ApplicationFlags flags) :
+    HbApplication(factory, argc, argv, flags)
+{
+}
+
+// Event filter to block exit
+bool HbDeviceDialogServerApp::symbianEventFilter(const QSymbianEvent *event)
+{
+    if (event->type() == QSymbianEvent::CommandEvent) {
+        int command = event->command();
+        if (command == EAknSoftkeyExit || command == EEikCmdExit) {
+            return true; // block exit commands
+        }
+    }
+    return false;
+}
+
+// Block application quit() slot
+void HbDeviceDialogServerApp::quit()
+{
+}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbdevicedialogappserver/hbddappfactorysymbian.h
--- a/src/hbservers/hbdevicedialogappserver/hbddappfactorysymbian.h	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbServers module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-#ifndef HBDDAPPFACTORYSYMBIAN_H
-#define HBDDAPPFACTORYSYMBIAN_H
-
-#include <hbglobal.h>
-
-class CApaApplication;
-#include <qs60mainapplication.h>
-
-// Device dialog server application needs a custom application factory in order to override
-// CCoeAppUi::FrameworkCallsRendezvous()
-
-CApaApplication *deviceDialogAppFactory();
-
-#endif // HBDDAPPFACTORYSYMBIAN_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbdevicedialogappserver/hbddappfactorysymbian_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbdevicedialogappserver/hbddappfactorysymbian_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbServers module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+#ifndef HBDDAPPFACTORYSYMBIAN_P_H
+#define HBDDAPPFACTORYSYMBIAN_P_H
+
+#include <hbglobal.h>
+#include <hbapplication.h>
+
+class CApaApplication;
+
+// Device dialog server application needs a custom application factory in order to override
+// CCoeAppUi::FrameworkCallsRendezvous()
+CApaApplication *deviceDialogAppFactory();
+
+// Derive from HbApplication to block exit
+class HbDeviceDialogServerApp : public HbApplication
+{
+    Q_OBJECT
+
+public:
+    HbDeviceDialogServerApp(QApplication::QS60MainApplicationFactory factory,
+        int &argc, char *argv[], Hb::ApplicationFlags flags = Hb::DefaultApplicationFlags);
+    bool symbianEventFilter(const QSymbianEvent *event);
+
+public slots:
+  static void quit();
+};
+
+#endif // HBDDAPPFACTORYSYMBIAN_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbdevicedialogappserver/hbdevicedialogappserver.pro
--- a/src/hbservers/hbdevicedialogappserver/hbdevicedialogappserver.pro	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbdevicedialogappserver/hbdevicedialogappserver.pro	Tue Jul 06 14:36:53 2010 +0300
@@ -38,6 +38,7 @@
 
 symbian {
     SOURCES += $$PWD/hbddappfactorysymbian.cpp
+    HEADERS += $$PWD/hbddappfactorysymbian_p.h
 
     TARGET.CAPABILITY = ProtServ SwEvent TrustedUI ReadDeviceData
     TARGET.UID3 = 0x20022FC5
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbdevicedialogappserver/main.cpp
--- a/src/hbservers/hbdevicedialogappserver/main.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbdevicedialogappserver/main.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -31,13 +31,12 @@
 #include <hbview.h>
 #include <hbtransparentwindow.h>
 #include <hbstackedlayout.h>
-#include <QTranslator>
 #if defined (Q_OS_SYMBIAN)
 #include <aknappui.h>
 #include <eikenv.h>
 #include <apgwgnam.h>
 #include <hbdevicedialogserverdefs_p.h>
-#include "hbddappfactorysymbian.h"
+#include "hbddappfactorysymbian_p.h"
 #endif // Q_OS_SYMBIAN
 
 #if defined (Q_OS_SYMBIAN)
@@ -99,7 +98,6 @@
     TFullName name;
     return findHbServer.Next(name) == KErrNone;
 }
-
 #endif // Q_OS_SYMBIAN
 
 #define USE_LOCKER 1
@@ -136,7 +134,7 @@
     RThread().RenameMe(KThreadName); // nicer panic info
     RThread().SetProcessPriority(EPriorityHigh);
     
-    HbApplication app(deviceDialogAppFactory, arg, args, Hb::NoSplash);
+    HbDeviceDialogServerApp app(deviceDialogAppFactory, arg, args, Hb::NoSplash);
 #else // Q_OS_SYMBIAN
     HbApplication app(arg, args);
 #endif // Q_OS_SYMBIAN
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbservers.pro
--- a/src/hbservers/hbservers.pro	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbservers.pro	Tue Jul 06 14:36:53 2010 +0300
@@ -27,10 +27,10 @@
 
 TEMPLATE = subdirs
 
-SUBDIRS += hbdevicedialogappserver hbthemeserver hbsplashgenerator
+SUBDIRS += hbdevicedialogappserver hbsplashgenerator
 
 symbian {
-    SUBDIRS += hbthemeserveroogmplugin
+    SUBDIRS += hbthemeserver hbthemeserveroogmplugin
 }
 
 include($${HB_SOURCE_DIR}/src/hbcommon.pri)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbsplashgenerator/hbsplashgenerator.cpp
--- a/src/hbservers/hbsplashgenerator/hbsplashgenerator.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashgenerator.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -74,7 +74,8 @@
                           .arg(QString::number(hbsplash_server_uid3.iUid, 16));
     mSettings = new QSettings(iniFileName, QSettings::IniFormat, this);
 #else
-    mSettings = new QSettings("Nokia", "HbSplash", this);
+    mSettings = new QSettings("Nokia", "Hb", this);
+    mSettings->beginGroup("Splash");
 #endif
     // Effects on decorators (started when they are shown) would ruin
     // the screenshot. So disable everything (except the orientation
@@ -158,6 +159,7 @@
     qDebug() << PRE << "last regen:" << lastTheme << lastLang << lastFileCount << lastOutputDir
              << "current:" << currentTheme << currentLang << currentFileCount << currentOutputDir;
     if (mForceRegen
+            || currentFileCount == 0 // not having any files is wrong for sure
             || currentTheme != lastTheme
             || currentLang != lastLang
             || currentFileCount != lastFileCount
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbsplashgenerator/hbsplashgenerator.pro
--- a/src/hbservers/hbsplashgenerator/hbsplashgenerator.pro	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashgenerator.pro	Tue Jul 06 14:36:53 2010 +0300
@@ -38,6 +38,7 @@
 HEADERS += $$PWD/hbsplashcompositor_p.h
 HEADERS += $$PWD/hbsplashindicompositor_p.h
 HEADERS += $$PWD/hbsplashblacklist_p.h
+HEADERS += $$PWD/hbwidgetenabler_p.h
 symbian: HEADERS += $$PWD/hbsplashgen_server_symbian_p.h
 
 symbian {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbsplashgenerator/hbsplashindicompositor.cpp
--- a/src/hbservers/hbsplashgenerator/hbsplashindicompositor.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashindicompositor.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -28,12 +28,10 @@
 #include "hbsplashdefs_p.h"
 #include "hbmainwindow.h"
 #include "hbmainwindow_p.h"
-#include "hbstatusbar_p.h"
 #include "hbsleepmodelistener_p.h"
 #include "hbevent.h"
 #include <QTimer>
 #include <QApplication>
-#include <QDebug>
 
 #ifdef Q_OS_SYMBIAN
 #include <fbs.h>
@@ -48,28 +46,24 @@
 // This ensures that there will be relatively up-to-date indicators in
 // the splash screens.
 
-#define PRE "[hbsplashgenerator] [indicompositor]"
-
 HbSplashIndicatorCompositor::HbSplashIndicatorCompositor(HbSplashGenerator *gen)
-    : mGenerator(gen)
+    : mGenerator(gen), mSleeping(false), mSignalsConnected(false)
 {
-#ifdef HB_SPLASH_STATUSBAR_ENABLED
     // When the splash screens are regenerated the statusbar must be rendered
     // again too because the theme or the splashml files may have changed.
     connect(mGenerator, SIGNAL(finished()), SLOT(renderStatusBar()), Qt::QueuedConnection);
 
-    // Regenerate every minute to have an up-to-date clock.
-    // ### replace with notifications from indicator fw
+    // Regenerate once using a singleshot timer (to have a little delay) but
+    // then start listening to change notifications from the statusbar instead.
     mRenderTimer = new QTimer(this);
+    mRenderTimer->setSingleShot(true);
     connect(mRenderTimer, SIGNAL(timeout()), SLOT(renderStatusBar()));
-    mRenderTimer->setInterval(60000); // 1 min
-    mRenderTimer->start();
+    mRenderTimer->start(5000); // 5 sec
 
     // There must be no activity while the device is sleeping so listen to sleep
     // mode events too.
     HbSleepModeListener::instance(); // just to make sure it is created
     QApplication::instance()->installEventFilter(this);
-#endif
 }
 
 void HbSplashIndicatorCompositor::release()
@@ -77,16 +71,50 @@
     delete this;
 }
 
+void HbSplashIndicatorCompositor::connectSignals()
+{
+    HbStatusBar *sb = HbMainWindowPrivate::d_ptr(mGenerator->ensureMainWindow())->mStatusBar;
+    connect(sb, SIGNAL(contentChanged(HbStatusBar::ContentChangeFlags)),
+            SLOT(handleStatusBarContentChange(HbStatusBar::ContentChangeFlags)));
+    mSignalsConnected = true;
+}
+
+void HbSplashIndicatorCompositor::handleStatusBarContentChange(
+    HbStatusBar::ContentChangeFlags changeType)
+{
+    // No need to rush when battery level changes while charging
+    // because it is not the real level, just the animation.
+    queueRender(changeType.testFlag(HbStatusBar::BatteryCharging));
+}
+
+void HbSplashIndicatorCompositor::queueRender(bool lazy)
+{
+    // Compress subsequent change notifications into one update.
+    if (!mRenderTimer->isActive() && !mSleeping) {
+        mRenderTimer->start(lazy ? 10000 : 100); // 10 sec or 0.1 sec
+    }
+}
+
 void HbSplashIndicatorCompositor::renderStatusBar()
 {
+    // Do nothing in sleep mode.
+    if (mSleeping) {
+        return;
+    }
     // Try again later if a screen is just being generated. We share the same
     // mainwindow and our changes done here (orientation, statusbar visibility)
     // could possibly ruin the output.
     if (!mGenerator->lockMainWindow()) {
-        QTimer::singleShot(1000, this, SLOT(renderStatusBar()));
+        mRenderTimer->start(1000); // 1 sec
         return;
     }
     try {
+        if (!mSignalsConnected) {
+            connectSignals();
+            // The first rendering may be wrong due to the deferred
+            // polish/layout handling.  So issue a regenerate request.
+            queueRender();
+        }
         HbMainWindow *mw = mGenerator->ensureMainWindow();
         HbSplashGenerator::setStatusBarElementsVisible(mw, true);
         mw->setOrientation(Qt::Vertical, false);
@@ -105,7 +133,6 @@
 {
     *statusBarRect = mw->mapFromScene(HbMainWindowPrivate::d_ptr(mw)->mStatusBar->geometry())
                      .boundingRect().intersected(QRect(QPoint(0, 0), mw->size()));
-    qDebug() << PRE << "rendering status bar" << *statusBarRect;
     *statusBarImage = QImage(statusBarRect->size(), QImage::Format_ARGB32_Premultiplied);
     statusBarImage->fill(QColor(Qt::transparent).rgba());
     QPainter painter(statusBarImage);
@@ -123,7 +150,6 @@
         const QRect *sbRect = orientation == Qt::Horizontal ? &mStatusBarRectLsc
                               : &mStatusBarRectPrt;
         if (!srcImg->isNull()) {
-            qDebug() << PRE << "composeToBitmap" << bitmap << orientation << splashExtraFlags;
             CFbsBitmap *bmp = static_cast<CFbsBitmap *>(bitmap);
             uchar *dst = reinterpret_cast<uchar *>(bmp->DataAddress());
             const int dstBpl = CFbsBitmap::ScanLineLength(bmp->SizeInPixels().iWidth,
@@ -149,12 +175,11 @@
 
 bool HbSplashIndicatorCompositor::eventFilter(QObject *obj, QEvent *event)
 {
-    if (event->type() == HbEvent::SleepModeEnter && mRenderTimer->isActive()) {
-        qDebug() << PRE << "entering sleep mode";
-        mRenderTimer->stop();
-    } else if (event->type() == HbEvent::SleepModeExit && !mRenderTimer->isActive()) {
-        qDebug() << PRE << "leaving sleep mode";
-        mRenderTimer->start();
+    if (event->type() == HbEvent::SleepModeEnter && !mSleeping) {
+        mSleeping = true;
+    } else if (event->type() == HbEvent::SleepModeExit && mSleeping) {
+        mSleeping = false;
+        queueRender();
     }
     return QObject::eventFilter(obj, event);
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbsplashgenerator/hbsplashindicompositor_p.h
--- a/src/hbservers/hbsplashgenerator/hbsplashindicompositor_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashindicompositor_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -27,6 +27,7 @@
 #define HBSPLASHINDICOMPOSITOR_P_H
 
 #include "hbsplashcompositor_p.h"
+#include "hbstatusbar_p.h"
 #include <QObject>
 #include <QImage>
 #include <QRect>
@@ -49,12 +50,17 @@
 
 private slots:
     void renderStatusBar();
+    void handleStatusBarContentChange(HbStatusBar::ContentChangeFlags changeType);
 
 private:
+    void connectSignals();
+    void queueRender(bool lazy = false);
     void doRender(HbMainWindow *mw, QImage *statusBarImage, QRect *statusBarRect);
     bool eventFilter(QObject *obj, QEvent *event);
 
     HbSplashGenerator *mGenerator;
+    bool mSleeping;
+    bool mSignalsConnected;
     QImage mStatusBarImagePrt;
     QImage mStatusBarImageLsc;
     QRect mStatusBarRectPrt;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbsplashgenerator/hbwidgetenabler_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbsplashgenerator/hbwidgetenabler_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbServers module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBWIDGETENABLER_P_H
+#define HBWIDGETENABLER_P_H
+
+#include <QWidget>
+
+class WidgetEnabler : public QObject
+{
+    Q_OBJECT
+public:
+    WidgetEnabler(QWidget *widget) : mWidget(widget) { }
+public slots:
+    void enable() { mWidget->setEnabled(true); }
+private:
+    QWidget *mWidget;
+};
+
+#endif
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbsplashgenerator/main.cpp
--- a/src/hbservers/hbsplashgenerator/main.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/main.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -29,6 +29,7 @@
 #include "hbsplashgenerator_p.h"
 #include "hbsplashdefs_p.h"
 #include "hbsplashindicompositor_p.h"
+#include "hbwidgetenabler_p.h"
 
 #if defined(Q_OS_SYMBIAN)
 #include "hbsplashgen_server_symbian_p.h"
@@ -83,6 +84,10 @@
     QMainWindow mw;
     QPushButton *btnRegen = new QPushButton("Regenerate");
     gen.connect(btnRegen, SIGNAL(clicked()), SLOT(uncachedRegenerate()));
+    btnRegen->setEnabled(false); // will be enabled only when the generator is really ready
+    WidgetEnabler widgetEnabler(btnRegen);
+    QObject::connect(&gen, SIGNAL(outputDirContentsUpdated(QString, QStringList)),
+                     &widgetEnabler, SLOT(enable()), Qt::QueuedConnection);
     mw.setCentralWidget(btnRegen);
     mw.show();
 #endif
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbthemeserver/hbicondatacache_p.cpp
--- a/src/hbservers/hbthemeserver/hbicondatacache_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbicondatacache_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -955,17 +955,16 @@
     }
 }
 
+int HbIconDataCache::gpuLRUSize() const
+{
+    return gpuLruListSize;
+}
 #ifdef HB_ICON_CACHE_DEBUG
 int HbIconDataCache::count() const
 {
     return cache->count();
 }
 
-int HbIconDataCache::gpuLRUSize() const
-{
-    return gpuLruListSize;
-}
-
 int HbIconDataCache::freeVectorMemory()
 {
     return (maxCpuCacheLimit - currentCpuCacheSize);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbthemeserver/hbicondatacache_p.h
--- a/src/hbservers/hbthemeserver/hbicondatacache_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbicondatacache_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -53,6 +53,7 @@
     void freeUnusedGpuResources();
     QVector<const HbIconKey *> getKeys(const QString &filename) const;
 
+    int gpuLRUSize() const;
 //Debug Code for Test Purpose
 #ifdef HB_ICON_CACHE_DEBUG
     void cleanVectorLRUList();
@@ -69,7 +70,6 @@
     int cacheMissCount();
     int rasterLruCount();
     int vectorLruCount();
-    int gpuLRUSize() const;
 #endif
 
 private:
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.cpp
--- a/src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -36,12 +36,6 @@
 #include "hbiconsource_p.h"
 #include "hbthemeserverutils_p.h"
 
-#if defined (Q_OS_SYMBIAN)
-// Note: Cases of the following two directory names intentionally differ to
-//       match the cases of the corresponding directories in Symbian 4.
-#include <VG/openvg.h>
-#include <vg/vgcontext_symbian.h>
-#endif //Q_OS_SYMBIAN
 
 /*!
     @hbserver
@@ -133,9 +127,9 @@
     } else if (iconType == "PIC") {
         isIconCreated = renderPicToPixmap(iconPath);
     } else if (iconType == "NVG") {
-#if defined (Q_OS_SYMBIAN)    
+#if defined (HB_NVG_CS_ICON)    
 		isIconCreated = renderNvgToPixmap(iconPath);
-#endif //Q_OS_SYMBIAN
+#endif //HB_NVG_CS_ICON
     } else {
         isIconCreated = renderOtherFormatsToPixmap(iconPath);
     }
@@ -369,7 +363,39 @@
     return true;
 }
 
-#if defined (Q_OS_SYMBIAN)
+#if defined (HB_NVG_CS_ICON)
+
+VGIColorBufferFormat HbPixmapIconProcessor::mapToVgiDisplayFormat( QImage::Format imageFormat ) const
+{ 
+    VGIColorBufferFormat format; 
+    switch(imageFormat) 
+    { 
+    case QImage::Format_Mono:                  
+    case QImage::Format_RGB32:                 
+    case QImage::Format_ARGB32:       
+            format = VGI_COLOR_BUFFER_FORMAT_ARGB8888;
+            break;
+    case QImage::Format_ARGB32_Premultiplied: 
+            format = VGI_COLOR_BUFFER_FORMAT_ARGB8888_PRE;
+            break;
+    case QImage::Format_RGB16:                 
+    case QImage::Format_ARGB8565_Premultiplied: 
+    case QImage::Format_RGB666:                
+    case QImage::Format_ARGB6666_Premultiplied: 
+    case QImage::Format_RGB555:                
+    case QImage::Format_ARGB8555_Premultiplied: 
+            break; 
+    case QImage::Format_RGB888: 
+            format = VGI_COLOR_BUFFER_FORMAT_RGB888; 
+            break;                
+    case QImage::Format_RGB444:                
+    case QImage::Format_ARGB4444_Premultiplied: 
+    case QImage::Format_Invalid:               
+        break; 
+    } 
+    return format; 
+}
+
 /**
  * HbNvgIconProcessor::renderNvgToPixmap()
  * This is used to render NVG data to a pixmap using the Software OpenVG
@@ -378,6 +404,14 @@
 bool HbPixmapIconProcessor::renderNvgToPixmap(const QString& iconPath)
 {
     bool isIconCreated = false;
+    
+    CNvgEngine* nvgengine = 0;
+    TRAPD(error, nvgengine = CNvgEngine::NewL());
+    if (error != KErrNone) {
+        return isIconCreated;
+    }
+    QScopedPointer<CNvgEngine> nvgEngine(nvgengine); 
+    
     bool isDefaultSize =  iconKey.size.isNull();
     HbIconSource *source = HbThemeServerUtils::getIconSource(iconPath);
     QByteArray *sourceByteArray = source->byteArray();
@@ -393,6 +427,15 @@
     size = renderSize.toSize();          
     TSize surfaceSize(TSize(size.width(), size.height()));
 
+/*    QImage img(size,QImage::Format_ARGB32_Premultiplied);
+    
+    VGIColorBufferFormat format;
+    TInt stride = img.bytesPerLine(); 
+    TUint8* imageBuffer = img.bits(); // get the pointer to image buffer. 
+    // Map Qimage display modes to the VGI display modes. 
+    format = mapToVgiDisplayFormat(img.format()); 
+    qDebug()<<"Format = " <<format; */
+    
     QScopedPointer<CFbsBitmap> bitmapData(new CFbsBitmap());    
     
     TInt err = bitmapData.data()->Create(surfaceSize, EColor16MA);    
@@ -400,33 +443,40 @@
         return isIconCreated;
     }
     
+    
     //Reset the surface incase already present
     VGISymbianTerminate();
     
     // Surface creation
-    err =  VGISymbianInitialize( surfaceSize, VGI_COLORSPACE_SRGB );
+    /*TInt*/ err =  VGISymbianInitialize( surfaceSize, VGI_COLORSPACE_SRGB );
     if( err != KErrNone) {
         return isIconCreated;
     }
     
-    QScopedPointer<CNvgEngine> nvgEngine(CNvgEngine::NewL());
-    //CNvgEngine* nvgEngine = CNvgEngine::NewL();
     HbNvgAspectRatioSettings settings = mapKeyAspectRatioToNvgAspectRatio(iconKey.aspectRatioMode);
     nvgEngine.data()->SetPreserveAspectRatio(settings.nvgAlignStatusAndAspectRatio, settings.type);
     // Rendering onto active surface
     TPtr8 data ((unsigned char*)byteArray.data(), byteArray.length(), byteArray.length());
-    err = nvgEngine.data()->DrawNvg(data, surfaceSize, bitmapData.data(), 0);    
+    err = nvgEngine.data()->DrawNvg(data, surfaceSize, 0, 0);    
     if(err !=KErrNone) {  
         return isIconCreated;
     }
     
     //Copy the data from the surface
+/*    err = VGICopyToTarget(format, stride, imageBuffer, 0, NULL, VGI_COPY_TRANSPARENT_PIXELS); 
+#ifdef __DEBUG    
+	qDebug() << "error code for VGICopyToTarget()"<< err;
+#endif
+    //Get Pixmap from the Qimage.
+    pixmap = QPixmap::fromImage(img); */
+
     err = VGISymbianCopyToBitmap(bitmapData.data(), 0, VGI_COPY_TRANSPARENT_PIXELS);
     if(err !=KErrNone) { 
         return isIconCreated;
     }
     //Get Pixmap from the Symbian Native format.
     pixmap = QPixmap::fromSymbianCFbsBitmap(bitmapData.data());
+    
     isIconCreated = true;    
         
     //Clean Up
@@ -467,5 +517,5 @@
     }
     return settings;
 }
-#endif //Q_OS_SYMBIAN
+#endif //HB_NVG_CS_ICON
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.h
--- a/src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbpixmapiconprocessor_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -29,9 +29,14 @@
 #include "hbiconprocessor_p.h"
 #include <QPixmap>
 
-#if defined (Q_OS_SYMBIAN)
+#if defined (HB_NVG_CS_ICON) 
 #include <nvg.h>
-#endif //Q_OS_SYMBIAN
+
+// Note: Cases of the following two directory names intentionally differ to
+//       match the cases of the corresponding directories in Symbian 4.
+#include <VG/openvg.h>
+#include <vg/vgcontext_symbian.h>
+#endif //HB_NVG_CS_ICON
 
 QT_BEGIN_NAMESPACE
 class QSvgRenderer;
@@ -41,13 +46,13 @@
 
 class HbThemeServerSymbian;
 
-#if defined (Q_OS_SYMBIAN)
+#if defined (HB_NVG_CS_ICON)
 struct HbNvgAspectRatioSettings
 {
     TNvgAlignStatusType nvgAlignStatusAndAspectRatio;
     TNvgMeetOrSliceType type;
 };
-#endif //Q_OS_SYMBIAN
+#endif //HB_NVG_CS_ICON
 
 class HbPixmapIconProcessor : public HbIconProcessor
 {
@@ -71,11 +76,12 @@
     bool renderPicToPixmap(const QString& iconPath);
     bool renderOtherFormatsToPixmap(const QString& iconPath);
 
-#if defined (Q_OS_SYMBIAN)
+#if defined (HB_NVG_CS_ICON)
+    VGIColorBufferFormat mapToVgiDisplayFormat(QImage::Format imageFormat) const;
     bool renderNvgToPixmap(const QString& iconPath);
     HbNvgAspectRatioSettings mapKeyAspectRatioToNvgAspectRatio(
 	                                                Qt::AspectRatioMode aspectRatio) const;
-#endif //Q_OS_SYMBIAN
+#endif //HB_NVG_CS_ICON
 private:
     QPixmap pixmap;
 };
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbthemeserver/hbthemeserver.pro
--- a/src/hbservers/hbthemeserver/hbthemeserver.pro	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver.pro	Tue Jul 06 14:36:53 2010 +0300
@@ -98,11 +98,8 @@
 
     # AllFiles is needed to be able to access icon and effect files in
     # an application's private folder for example.
-    TARGET.CAPABILITY = CAP_SERVER AllFiles ProtServ
+    TARGET.CAPABILITY = CAP_SERVER ProtServ
     
-} else {
-    SOURCES  += $$PWD/hbthemeserver_generic.cpp
-    HEADERS += $$PWD/hbthemeserver_generic_p_p.h
 }
 
 QT = core gui svg network
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbthemeserver/hbthemeserver_generic.cpp
--- a/src/hbservers/hbthemeserver/hbthemeserver_generic.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1626 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbServers module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include "hbthemeserver_generic_p_p.h"
-#include "hbthemeserverapplication_p.h"
-
-#include <QLabel>
-#include <QLocalServer>
-#include <QLocalSocket>
-#include <QSharedMemory>
-#include <QDebug>
-#include <QList>
-#include <QIcon>
-#include <QFile>
-#include <QCoreApplication>
-#include <QPainter>
-#include <QStringList>
-#include <QPixmap>
-#include <QTimer>
-
-#include <hbinstance.h>
-
-#include "hbthemecommon_p.h"
-#include "hbmemoryutils_p.h"
-#include "hbthemeserverutils_p.h"
-#include "hbiconcacheitemcreator_p.h"
-#include "hbiconloader_p.h"
-#include "hbcache_p.h"
-#include "hbdeviceprofiledatabase_p.h"
-#include "hbpixmapiconimpl_p.h"
-#include "hbpixmapiconprocessor_p.h"
-#include "hblayeredstyleloader_p.h"
-#include "hbthemesystemeffect_p.h"
-#include "hbsharedmemorymanager_p.h"
-#include "hbtypefaceinfodatabase_p.h"
-#include "hbthemeutils_p.h"
-
-static const int CLOSE_TIMEOUT = 3000;
-
-/*!
-  @hbserver
-  \class HbThemeServerPrivate
-  \brief HbThemeServerPrivate implements the theme server
-*/
-
-#ifdef THEME_SERVER_TRACES
-extern QLabel *testLabel;
-#endif
-
-// 5 MB GPU & CPU cache size
-#define GPU_CACHE_SIZE 0x500000
-#define CPU_CACHE_SIZE 0x500000
-
-/*!
-  \fn HbThemeServerPrivate::HbThemeServerPrivate()
-  Constructor
-  \a parent
-*/
-#ifdef QT_DEBUG
-HbThemeServerPrivate::HbThemeServerPrivate(QWidget *parent)
-    : QMainWindow(parent), server(new QLocalServer(this))
-#else
-HbThemeServerPrivate::HbThemeServerPrivate(): server(new QLocalServer(this))
-#endif
-{
-    sessionList.clear();
-#ifdef QT_DEBUG
-    setWindowTitle("Theme Server");
-    setCentralWidget(&statusLabel);
-#endif
-    renderMode = ESWRendering;
-    QScopedPointer <HbIconDataCache> tempIconCache(new HbIconDataCache());
-    QScopedPointer <HbCache> tempCssCache(new HbCache());
-    iconCache = tempIconCache.take();
-    cssCache = tempCssCache.take();
-    setMaxGpuCacheSize(GPU_CACHE_SIZE);
-    setMaxCpuCacheSize(CPU_CACHE_SIZE);
-
-    // Store the active theme name in a member string
-    iCurrentThemeName = HbThemeUtils::getThemeSetting(HbThemeUtils::CurrentThemeSetting);    
-
-    if (iCurrentThemeName.isEmpty()) {
-        iCurrentThemeName = HbThemeUtils::defaultTheme().name;
-    }
-    
-    // Resolve the path of the current theme
-    QDir path(iCurrentThemeName);
-    if (!path.isAbsolute()) {
-        // Resolve the path of the current theme
-        resolveThemePath(iCurrentThemeName, iCurrentThemePath);
-    } else {
-        iCurrentThemeName = path.dirName();
-        iCurrentThemePath = path.absolutePath();
-    }          
-    // Process base theme index, it is used as parent index also when the current theme is something else
-    QString basePath;
-    resolveThemePath(HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting), basePath);
-    HbThemeServerUtils::createThemeIndex(basePath, BaseTheme);
-    // Process operator theme indexes
-    QString operatorName = HbThemeUtils::getThemeSetting(HbThemeUtils::OperatorNameSetting);
-    if (!operatorName.isEmpty()) {
-        QString operatorPath( HbThemeUtils::baseTheme().rootDir + '/' +
-            QLatin1String(HbThemeUtils::operatorHierarchy) + '/' +
-            QLatin1String(HbThemeUtils::iconsResourceFolder) + '/' +
-            operatorName );
-        
-        HbThemeServerUtils::createThemeIndex(operatorPath, OperatorC);
-        // Operator Z not used in generic themeserver.
-    }
-    // Process current theme index
-    HbThemeServerUtils::createThemeIndex(iCurrentThemePath, ActiveTheme);
-
-    // Register theme system effects in construction
-    // TODO: fix parameter
-    HbThemeSystemEffect::handleThemeChange(iCurrentThemeName);
-
-    connect(server, SIGNAL(newConnection()), this, SLOT(newClientConnected()));
-    HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting, iCurrentThemePath);    
-}
-
-/*!
-  \fn HbThemeServerPrivate::~HbThemeServerPrivate()
-  Destructor
-*/
-HbThemeServerPrivate::~HbThemeServerPrivate()
-{
-    server->close();
-    // QLocalServer should be deleted first before deleting Server data
-    // so all sessions will be cleaned up first.
-    delete server;
-    delete iconCache;
-    delete cssCache;
-}
-
-/*!
-  \fn HbThemeServerPrivate::start()
-  start the themeserver
-*/
-bool HbThemeServerPrivate::start()
-{
-    // try max 2 times
-    bool success = listen() || listen();
-    if (!success) {
-        qWarning() << "HbThemeServer: unable to start the server.";
-    } else {
-#ifdef QT_DEBUG
-        statusLabel.setText("Theme Server Started");
-#endif
-    }
-    return success;
-}
-
-bool HbThemeServerPrivate::listen()
-{
-    bool success = server->listen(THEME_SERVER_NAME);
-    if (!success) {
-        qWarning() << "HbThemeServer:" << server->errorString();
-        if (server->serverError() == QAbstractSocket::AddressInUseError) {
-            stop();
-        }
-    }
-    return success;
-}
-
-/*!
-  \fn HbThemeServerPrivate::stop()
-  stop the themeserver
-*/
-void HbThemeServerPrivate::stop()
-{
-    if (server) {
-        server->close();
-    }
-    QLocalServer::removeServer(THEME_SERVER_NAME);
-#ifdef QT_DEBUG
-    statusLabel.setText("Theme Server Stopped");
-#endif
-}
-
-/*!
-  \fn HbThemeServerPrivate::insertIconCacheItem()
-  Insert item into the icon cache
-  \a key denotes the unique identifier for the cache item that is to be inserted into the cache.
-  \a item denotes the cache item that is to be inserted
-*/
-bool HbThemeServerPrivate::insertIconCacheItem(const HbIconKey &key, HbIconCacheItem *item)
-{
-    return (iconCache->insert(key, item));
-}
-
-/*!
-  \fn HbThemeServerPrivate::insertCssCacheItem()
-  Insert item into the css cache
-  \a key denotes the unique identifier for the cache item that is to be inserted into the cache.
-  \a item denotes the cache item that is to be inserted
-*/
-bool HbThemeServerPrivate::insertCssCacheItem(const QString &key, HbCacheItem *item)
-{
-    return (cssCache->insert(key, item));
-}
-
-/*!
-  \fn HbThemeServerPrivate::iconCacheItem()
-  Find an item in the icon cache
-  \a key denotes the unique identifier for the cache item that is to be found in the cache.
-*/
-HbIconCacheItem *HbThemeServerPrivate::iconCacheItem(const HbIconKey &key)
-{
-    return(iconCache->getCacheItem(key, renderMode, false));
-}
-
-/*!
-  \fn HbThemeServerPrivate::cssCacheItem()
-  Find an item in the css cache
-  \a key denotes the unique identifier for the cache item that is to be found in the cache.
-*/
-HbCacheItem *HbThemeServerPrivate::cssCacheItem(const QString &key)
-{
-    return(cssCache->cacheItem(key));
-}
-
-/*!
-  \fn HbThemeServerPrivate::setMaxGpuCacheSize()
-  Provides a mechanism for setting the Gpu cache limit
-  \a size denotes the cache limit in bytes e.g. size = 0x500000
-*/
-void HbThemeServerPrivate::setMaxGpuCacheSize(int size)
-{
-    iconCache->setMaxGpuCacheSize(size);
-}
-
-/*!
-  \fn HbThemeServerPrivate::setMaxCpuCacheSize()
-  Provides a mechanism for setting the Cpu cache limit
-  \a size denotes the cache limit in bytes e.g. size = 0x500000
-*/
-void HbThemeServerPrivate::setMaxCpuCacheSize(int size)
-{
-    iconCache->setMaxCpuCacheSize(size);
-}
-
-/*!
-  \fn HbThemeServerPrivate::removeIconCacheItem()
-  Remove an item from iconcache corresponding to key.
-  \a key denotes the unique identifier for the cache item that is to be removed from the cache.
-*/
-void HbThemeServerPrivate::removeIconCacheItem(const HbIconKey &key)
-{
-    iconCache->remove(key);
-}
-
-/*!
-  \fn HbThemeServerPrivate::removeCssCacheItem()
-  Remove item from css cache corresponding to key.
-  \a key denotes the unique identifier for the cache item that is to be removed from the cache.
-*/
-void HbThemeServerPrivate::removeCssCacheItem(const QString &key)
-{
-    cssCache->remove(key);
-}
-
-/*!
-  \fn HbThemeServerPrivate::clearIconCache()
-  Clears the icon cache
-*/
-void HbThemeServerPrivate::clearIconCache()
-{
-    iconCache->clear();
-}
-
-/*!
-  \fn HbThemeServerPrivate::clearCssCache()
-  Clears the css cache
-*/
-void HbThemeServerPrivate::clearCssCache()
-{
-    cssCache->clear();
-}
-
-
-/*!
-  data.type = INVALID_FORMAT;
-  \fn HbThemeServerPrivate::handleThemeSelection()
-  Handle change of theme
-  \a newTheme
-*/
-void HbThemeServerPrivate::handleThemeSelection(const QString &newTheme)
-{
-#ifdef THEME_SERVER_TRACES
-    qDebug() << Q_FUNC_INFO << "  theme=" << newTheme;
-#endif
-
-    // Clear cached icons and session data
-    clearIconCache();
-    HbThemeServerSession *session;
-    foreach(session, sessionList) {
-        session->clearSessionIconData();
-    }
-
-    iCurrentThemeName = newTheme.trimmed();
-
-    // Resolve the path of the current theme
-    QDir path(iCurrentThemeName);
-    if (!path.isAbsolute()) {
-        // Resolve the path of the current theme
-        resolveThemePath(iCurrentThemeName, iCurrentThemePath);
-    } else {
-        iCurrentThemeName = path.dirName();
-        iCurrentThemePath = path.absolutePath();
-    }          
-
-    // Set the new theme in theme settings
-    HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting, iCurrentThemeName);    
-
-    // Process operator Drive C theme index
-    QString operatorName = HbThemeUtils::getThemeSetting(HbThemeUtils::OperatorNameSetting);
-    if (!operatorName.isEmpty()) {
-        QString operatorPath( HbThemeUtils::baseTheme().rootDir + '/' +
-            QLatin1String(HbThemeUtils::operatorHierarchy) + '/' +
-            QLatin1String(HbThemeUtils::iconsResourceFolder) + '/' +
-            operatorName );
-        
-        HbThemeServerUtils::createThemeIndex(operatorPath, OperatorC);
-    }
-    // Process current theme index
-    HbThemeServerUtils::createThemeIndex(iCurrentThemePath, ActiveTheme);
-
-    // Register new system effects
-    HbThemeSystemEffect::handleThemeChange(iCurrentThemeName);
-
-    HbThemeServerRequest requestType;
-    requestType = EThemeSelection;
-    QByteArray block;
-    QDataStream out(&block, QIODevice::WriteOnly);
-    out << (int)requestType;
-    out << iCurrentThemeName;
-    writeToClients(block);
-}
-
-bool HbThemeServerPrivate::resolveThemePath(const QString &themeName, QString &themePath)
-{
-    static QString mainThemesDir = QDir::fromNativeSeparators(qgetenv("HB_THEMES_DIR"));
-
-    if (themeName == "hbdefault") {
-        themePath = ":/themes/icons/hbdefault";
-        return true;
-    } else {
-        QString themeLookupPath = mainThemesDir + "/themes/icons/" + themeName;
-        if (QFile::exists(themeLookupPath + "/index.theme")) {
-            themePath = themeLookupPath;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void HbThemeServerPrivate::handleContentUpdate(const QStringList &fileNames)
-{
-    // If list is empty clear all themed content
-    if (!fileNames.count()) {
-        // Clear icons
-        HbThemeServerSession *session;
-        foreach(session, sessionList) {
-            session->clearSessionIconData();
-        }
-        iconCache->clear();
-
-        // Clear effects
-        HbThemeServerUtils::clearSharedEffects();
-
-        // Clear stylesheets
-        QHash<QString, HbCacheItem*>::const_iterator itEnd(themePriorityItems.constEnd());
-        for (QHash<QString, HbCacheItem*>::const_iterator iter = themePriorityItems.constBegin();
-                iter != itEnd;
-                ++iter) {
-            cssCache->cacheHandle().remove(iter.key());
-            HbThemeServerSession *session;
-            foreach(session, sessionList) {
-                session->removeSessionCssItem(iter.key());
-            }
-        }
-        themePriorityItems.clear();
-
-        return;
-    }
-
-    // Else delete only specified files
-    for (int i = 0; i < fileNames.count(); i++) {
-        QString filename = fileNames.at(i);
-
-        // Stylesheet
-        if (themePriorityItems.contains(filename)) {
-            cssCache->cacheHandle().remove(filename);
-            themePriorityItems.remove(filename);
-            HbThemeServerSession *session;
-            foreach(session, sessionList) {
-                session->removeSessionCssItem(filename);
-            }
-            break;
-        }
-        // Effect
-        if (HbThemeServerUtils::removeSharedEffect(filename)) {
-            break;
-        }
-
-        // Icon
-        QVector<const HbIconKey *> keys = iconCache->getKeys(filename);
-        for (int j = 0; j < keys.count(); j++) {
-            HbThemeServerSession *session;
-            foreach(session, sessionList) {
-                session->removeSessionIconItem(*keys.at(j));
-            }
-            iconCache->remove(*keys.at(j), false);
-        }
-    }
-}
-
-/*!
-  \fn HbThemeServerPrivate::writeToClients()
-  Write to all clients
-  \a block
-*/
-void HbThemeServerPrivate::writeToClients(QByteArray &block)
-{
-    HbThemeServerSession *session;
-#ifdef THEME_SERVER_TRACES
-    qDebug() << Q_FUNC_INFO << "socketlist count: " << sessionList.count();
-#endif
-    foreach(session, sessionList) {
-        QLocalSocket * curSocket = session->clientConnection();
-        curSocket->write(block);
-    }
-}
-
-/*!
-  \fn HbThemeServerPrivate::newClientConnected()
-  Creates a new session with the server.
-*/
-void HbThemeServerPrivate::newClientConnected()
-{
-    QLocalSocket * newClient = server->nextPendingConnection();
-    if (newClient) {
-        HbThemeServerSession * newSession =
-            new HbThemeServerSession(newClient, this);
-        // Store list of client connected to server
-        sessionList.append(newSession);
-#ifdef THEME_SERVER_TRACES
-        qDebug() << "Total No of Connection after addition = " << sessionList.count();
-#endif
-        connect(newClient, SIGNAL(disconnected()), this, SLOT(removeFromList()));
-    }
-}
-
-/*!
-  \fn HbThemeServerPrivate::removeFromList()
-  Remove a session from list
-*/
-void HbThemeServerPrivate::removeFromList()
-{
-    QList<HbThemeServerSession*>::const_iterator itEnd(sessionList.constEnd());
-
-    for (QList<HbThemeServerSession*>::const_iterator iter = sessionList.constBegin();
-            iter != itEnd;
-            ++iter) {
-        if ((*iter)->clientConnection() == (QLocalSocket *)sender()) {
-            sessionList.removeOne((*iter));
-            delete(*iter);
-            break;
-        }
-    }
-
-    QTimer::singleShot(CLOSE_TIMEOUT, this, SLOT(clienDisconnected()));
-}
-
-void HbThemeServerPrivate::clienDisconnected()
-{
-#ifdef THEME_SERVER_TRACES
-    qDebug() << "Total No of Connection after deletion = " << sessionList.count();
-#endif
-
-    // Quit the server if no more clients connected
-    if (!HbThemeServerApplication::Options::persistent && sessionList.isEmpty()) {
-#ifdef THEME_SERVER_TRACES
-        qDebug() << "HbThemeServerQt: last application quit, so do we!";
-#endif
-        stop();
-        QCoreApplication::quit();
-    }
-}
-
-/**
- *  HbThemeServerPrivate::currentRenderingMode
- *  This function returns ThemeServer's current rendering mode
- *
- */
-HbRenderingMode HbThemeServerPrivate::currentRenderingMode() const
-{
-    return renderMode;
-}
-
-/**
- *  HbThemeServerPrivate::setCurrentRenderingMode
- *  This function sets  ThemeServer's current rendering mode
- *
- */
-void HbThemeServerPrivate::setCurrentRenderingMode(HbRenderingMode currentMode)
-{
-    renderMode = currentMode;
-}
-
-//Debug Code for Test Purpose
-#ifdef HB_ICON_CACHE_DEBUG
-int HbThemeServerPrivate ::cacheIconCount() const
-{
-    return iconCache->count();
-}
-
-int HbThemeServerPrivate::freeVectorMemory()
-{
-    return iconCache->freeVectorMemory();
-}
-
-int HbThemeServerPrivate::freeRasterMemory()
-{
-    return iconCache->freeRasterMemory();
-}
-
-int HbThemeServerPrivate::lastAddedRefCount()
-{
-    return iconCache->lastAddedRefCount();
-}
-
-int HbThemeServerPrivate::lastAddedItemMem()
-{
-    return iconCache->lastAddedItemMem();
-}
-
-int HbThemeServerPrivate::lastRemovedItemMem()
-{
-    return iconCache->lastRemovedItemMem();
-}
-
-int HbThemeServerPrivate::lastRemovedItemRfCount()
-{
-    return iconCache->lastRemovedItemRfCount();
-}
-
-bool HbThemeServerPrivate::enableCache(bool cacheIt)
-{
-    return iconCache->enableCache(cacheIt);
-}
-
-int HbThemeServerPrivate::cacheHitCount()
-{
-    return iconCache->cacheHitCount();
-}
-
-int HbThemeServerPrivate::cacheMissCount()
-{
-    return iconCache->cacheMissCount();
-}
-
-int HbThemeServerPrivate::serverHeapSize()
-{
-    return 0;
-}
-
-void HbThemeServerPrivate::cleanVectorLRUList()
-{
-    iconCache->cleanVectorLRUList();
-}
-
-void HbThemeServerPrivate::cleanRasterLRUList()
-{
-    iconCache->cleanRasterLRUList();
-}
-
-int HbThemeServerPrivate::rasterLruCount()
-{
-    return iconCache->rasterLruCount();
-}
-
-int HbThemeServerPrivate::vectorLruCount()
-{
-    return iconCache->vectorLruCount();
-}
-#endif
-
-//***********************************
-//HbThemeServerSession - implementations
-//***********************************
-/*!
-  @hbserver
-  \class HbThemeServerSession
-  \brief HbThemeServerSession implements the sessions associated with the server.
-  The Theme server maintains a list of sessions, each session corresponding to a client.
-  Each session in turn is responsible for keeping track of client specific resources.
-  In case of Icon caching, a session maintains a list of Icon keys.
-  A  key is added to the list only if the corresponding cache item
-  has been successfully inserted into cache or if a previously cached icon
-  is requested and successfully found in the cache.
-  In case of client crash or graceful exit of client, the server goes through its list of sessions,
-  finds the session corresponding to the client, removes the session from its session list and
-  deletes the session.
-  In the session destructor, the session specific resources are cleaned up.
-  In case of icon caching, the list of icon keys is traversed and a remove operation is
-  performed on the cache items corresponding to these keys.
-  On removal, the items reference count is decremented and in case the
-  reference count becomes 0, the cache item instance gets added to the back of the LRU list.
-
-*/
-
-/*!
-  \fn HbThemeServerSession::HbThemeServerSession()
-  Constructor
-  \a aClientConnection indicates the local socket that is contained within this session
-  \a aServer denotes the handle to the theme server
-*/
-HbThemeServerSession::HbThemeServerSession(QLocalSocket *aClientConnection,
-                                           HbThemeServerPrivate *aServer)
-{
-    iServer = aServer;
-    iClientConnection = aClientConnection;
-    sessionIconData.clear();
-    sessionCssData.clear();
-    connect(iClientConnection, SIGNAL(readyRead()), this, SLOT(readDataFromClient()));
-    connect(iClientConnection, SIGNAL(disconnected()), iClientConnection, SLOT(deleteLater()));
-}
-
-/*!
-  \fn HbThemeServerSession::~HbThemeServerSession()
-  Destructor
-*/
-HbThemeServerSession::~HbThemeServerSession()
-{
-    //Remove icon related-session-specific data
-    QList<HbIconKey>::const_iterator itEnd(sessionIconData.constEnd());
-    for (QList<HbIconKey>::const_iterator iter = sessionIconData.constBegin();
-            iter != itEnd;
-            ++iter) {
-        iServer->removeIconCacheItem(*iter);
-    }
-
-    //Remove css related-session-specific data
-    QList<QString>::const_iterator iterEnd(sessionCssData.constEnd());
-    for (QList<QString>::const_iterator iter = sessionCssData.constBegin();
-            iter != iterEnd;
-            ++iter) {
-        iServer->removeCssCacheItem(*iter);
-    }
-    sessionIconData.clear();
-    sessionCssData.clear();
-}
-
-/*!
-  \fn HbThemeServerSession::clientConnection()
-  Returns a handle to the local socket contained by the session
-*/
-QLocalSocket * HbThemeServerSession::clientConnection()
-{
-    return iClientConnection;
-}
-
-/*!
-  \fn HbThemeServerSession::readDataFromClient()
-  Slot that is reponsible for reading data from the client
-  Is responsible for performing operations such as creating cache items and storing into cache
-  and writing back data to the client
-*/
-void HbThemeServerSession::readDataFromClient()
-{
-#ifdef THEME_SERVER_TRACES
-    qDebug() << Q_FUNC_INFO;
-#endif
-    HbSharedIconInfo data;
-    data.type = INVALID_FORMAT;
-    HbThemeServerRequest requestType;
-    QByteArray inputByteArray = static_cast<QLocalSocket *>(sender())->readAll();
-    if (inputByteArray.size() > 0) {
-        QDataStream inputDataStream(inputByteArray);
-        int clue;
-        inputDataStream >> clue;
-        requestType = (HbThemeServerRequest)clue;
-
-#ifdef THEME_SERVER_TRACES
-        qDebug() << Q_FUNC_INFO << "recognizer: " << requestType;
-#endif
-
-//Debug Code for Test Purpose
-#ifdef HB_ICON_CACHE_DEBUG
-        QByteArray outputByteArray;
-        QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-        outputDataStream << int(requestType);
-#endif
-        switch (requestType) {
-        case EStyleSheetLookup: {
-            QString fileName;
-            int priority;
-            HbLayeredStyleLoader::LayerPriority layerPriority;
-            inputDataStream >> fileName;
-            inputDataStream >> priority;
-            layerPriority = static_cast<HbLayeredStyleLoader::LayerPriority>(priority);
-            QByteArray output = handleStyleSheetLookup(int(requestType), fileName, layerPriority);
-            static_cast<QLocalSocket *>(sender())->write(output);
-            break;
-        }
-        case EWidgetMLLookup: {
-            QString filename;
-            QString section;
-            QString layout;
-
-            inputDataStream >> filename;
-            inputDataStream >> layout;
-            inputDataStream >> section;
-            // handle the shared Widgetml look up.
-            QByteArray output = iServer->handleSharedWidgetMLLookup(filename, layout, section);
-            static_cast<QLocalSocket *>(sender())->write(output);
-            break;
-        }
-        case EDeviceProfileOffset: {
-            int offset = -1;
-            HbDeviceProfileDatabase *deviceProfileDatabase =
-                HbDeviceProfileDatabase::instance(HbMemoryManager::SharedMemory);
-
-            if (deviceProfileDatabase) {
-                offset = deviceProfileDatabase->deviceProfilesOffset();
-            }
-            // offset will be -1 if the deviceProfileDatabase is NULL.
-            QByteArray outputByteArray;
-            QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-            outputDataStream << requestType;
-            outputDataStream << offset;
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        case EEffectLookupFilePath:
-        case EEffectAdd: {
-            QString fileName;
-            inputDataStream >> fileName;
-            QByteArray output = iServer->handleSharedEffectAddAndFileLookup((int) requestType, fileName);
-            static_cast<QLocalSocket *>(sender())->write(output);
-            break;
-        }
-        case EThemeSelection: {
-            QString themename;
-            inputDataStream >> themename;
-            iServer->handleThemeSelection(themename);
-            break;
-        }
-        case EThemeContentUpdate: {
-            QStringList themedItems;
-            inputDataStream >> themedItems;
-            iServer->handleContentUpdate(themedItems);
-            HbThemeServerRequest requestType = EThemeContentUpdate;
-            QByteArray block;
-            QDataStream out(&block, QIODevice::WriteOnly);
-            out << int(requestType);
-            out << themedItems;
-            iServer->writeToClients(block);
-            break;
-        }
-        case EThemeServerStop: {
-            //This segment is used by HbThemeApiWrapperUi.
-            //When no HbApplication is open and
-            // HbThemeserver has only HbThemeApiWrapperUi as client, making sessionListCount =1
-            //HbThemeserver is closed otherwise warning is shown.
-            //QCoreApplication::quit() removes the UI of HbThemeServer.
-            // Destructor of HbThemeServer will be called where it was instantiated.
-            if (iServer->sessionListCount() == 1) {
-#ifdef QT_DEBUG
-                iServer->close();
-#endif
-                static_cast<QLocalSocket *>(sender())->disconnectFromServer();
-                QCoreApplication::quit();
-            } else {
-                qWarning() << "Close all HbApplications before closing hbthemeserver!!";
-            }
-            break;
-        }
-        case EIconLookup: {
-            QString filename;
-            QSizeF size;
-            int aspectRatioMode;
-            int mode;
-            bool mirrored;
-            int options;
-            QColor color;
-            inputDataStream >> filename;
-            inputDataStream >> size;
-            inputDataStream >> aspectRatioMode;
-            inputDataStream >> mode;
-            inputDataStream >> mirrored;
-            inputDataStream >> options;
-            inputDataStream >> color;
-
-#ifdef THEME_SERVER_TRACES
-            qDebug() << "image req at server: " << filename;
-#endif
-            HbIconKey key(filename, size, static_cast<Qt::AspectRatioMode>(aspectRatioMode),
-                          static_cast<QIcon::Mode>(mode), mirrored, color,
-                          iServer->currentRenderingMode());
-            QByteArray output = handleIconLookup(key, data, options);
-            static_cast<QLocalSocket *>(sender())->write(output);
-            break;
-        }
-        case EMultiPieceIcon: {
-            HbMultiIconParams frameItemParams;
-            inputDataStream >> frameItemParams.multiPartIconList;
-            inputDataStream >> frameItemParams.multiPartIconData.multiPartIconId;
-
-            int noOfPieces = 1;
-            if (frameItemParams.multiPartIconData.multiPartIconId.contains("_3PV", Qt::CaseInsensitive)
-                || frameItemParams.multiPartIconData.multiPartIconId.contains("_3PH", Qt::CaseInsensitive)) {
-                noOfPieces = 3;
-            } else if (frameItemParams.multiPartIconData.multiPartIconId.contains("_9P", Qt::CaseInsensitive)) {
-                noOfPieces = 9;
-            }
-            for (int i = 0; i < noOfPieces; i++) {
-                inputDataStream >> frameItemParams.multiPartIconData.sources[i];
-            }
-
-            for (int i = 0; i < noOfPieces; i++) {
-                inputDataStream >> frameItemParams.multiPartIconData.targets[i];
-            }
-
-            for (int i = 0; i < noOfPieces; i++) {
-                inputDataStream >> frameItemParams.multiPartIconData.pixmapSizes[i];
-            }
-
-            inputDataStream >> frameItemParams.size;
-            inputDataStream >> frameItemParams.aspectRatioMode;
-            inputDataStream >> frameItemParams.mode;
-            inputDataStream >> frameItemParams.mirrored;
-            inputDataStream >> frameItemParams.options;
-            inputDataStream >> frameItemParams.color;
-
-#ifdef THEME_SERVER_TRACES
-            qDebug() << "image req at server: " << frameItemParams.multiPartIconList;
-#endif
-            int index = frameItemParams.multiPartIconList[0].lastIndexOf('/');
-            QString iconId = frameItemParams.multiPartIconList[0].left(index + 1);
-            HbSharedIconInfo stitchedData;
-            QT_TRY {
-                iconId.append(frameItemParams.multiPartIconData.multiPartIconId);
-                HbIconKey finalIconKey(iconId, frameItemParams.size,
-                    static_cast<Qt::AspectRatioMode>(frameItemParams.aspectRatioMode),
-                    static_cast<QIcon::Mode>(frameItemParams.mode),
-                    frameItemParams.mirrored,
-                    frameItemParams.color,
-                    static_cast<HbRenderingMode>(frameItemParams.renderMode));
-
-                stitchedData.type = INVALID_FORMAT;
-
-                if (!iconInfoFromSingleIcon(finalIconKey, stitchedData)) {
-                    iconInfoFromMultiParts(frameItemParams, noOfPieces, finalIconKey, stitchedData);
-                }
-            } QT_CATCH(const std::bad_alloc &) {
-                stitchedData.type = INVALID_FORMAT;
-            }
-
-            QByteArray outputByteArray;
-            QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-            HbThemeServerRequest request;
-            request = EMultiPieceIcon;
-            fillOutPutDataStream(outputDataStream, stitchedData, request);
-#ifdef THEME_SERVER_TRACES
-            qDebug() << Q_FUNC_INFO << " offset= " << stitchedData.pixmapData.offset
-                     << " format= " << stitchedData.pixmapData.format;
-            testLabel->setPixmap(QPixmap::fromImage(
-                QImage(HbMemoryUtils::getAddress<uchar>(HbMemoryManager::SharedMemory,
-                                                        stitchedData.pixmapData.offset),
-                       stitchedData.pixmapData.width,
-                       stitchedData.pixmapData.height,
-                       stitchedData.pixmapData.format)));
-#endif
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        case EMultiIcon: {
-            QStringList fileList;
-            QVector<QSizeF> sizeList;
-            QSizeF size;
-            int aspectRatioMode;
-            int mode;
-            bool mirrored;
-            int options;
-            QColor color;
-            inputDataStream >> fileList;
-            inputDataStream >> sizeList;
-            inputDataStream >> aspectRatioMode;
-            inputDataStream >> mode;
-            inputDataStream >> mirrored;
-            inputDataStream >> options;
-            inputDataStream >> color;
-
-#ifdef THEME_SERVER_TRACES
-            qDebug() << "image req at server: " << fileList;
-#endif
-            QByteArray output;
-            QDataStream outputDataStream(&output, QIODevice::WriteOnly);
-            outputDataStream << (int)requestType; // Put EMultiIcon request type in the beginning
-            for (int i = 0; i < fileList.count(); i++) {
-                HbIconKey key(fileList[i], sizeList[i],
-                              static_cast<Qt::AspectRatioMode>(aspectRatioMode),
-                              static_cast<QIcon::Mode>(mode), mirrored, color,
-                              iServer->currentRenderingMode());
-                output.append(handleIconLookup(key, data, options));
-            }
-
-            static_cast<QLocalSocket *>(sender())->write(output);
-            break;
-        }
-        case ENotifyForegroundLost: {
-            //Nothing to do here when the app notifies it's foreground lost event
-            break;
-        }
-        //Debug Code for Test Purpose
-#ifdef HB_ICON_CACHE_DEBUG
-        case ECacheIconCount: {
-            int count = iServer->cacheIconCount();
-            outputDataStream << count;
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        case ERasterMemLimit: {
-            int limit;
-            inputDataStream >> limit;
-            iServer->setMaxGpuCacheSize(limit);
-            break;
-        }
-        case EVectorMemLimit: {
-            int limit;
-            inputDataStream >> limit;
-            iServer->setMaxCpuCacheSize(limit);
-            break;
-        }
-        case EFreeRasterMem: {
-            int freeRastMem = iServer->freeRasterMemory();
-            outputDataStream << freeRastMem;
-            static_cast<QLocalSocket *>sender())->write(outputByteArray);
-            break;
-        }
-        case EFreeVectorMem: {
-            int freeVectMem = iServer->freeVectorMemory();
-            outputDataStream << freeVectMem;
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        case ELastAddedItemMem {
-            int lAddItemMem = iServer->lastAddedItemMem();
-            outputDataStream << lAddItemMem;
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        case ELastRemovedItemMem {
-            int lRemItemMem = iServer->lastRemovedItemMem();
-            outputDataStream << lRemItemMem;
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        case ELastRemovedItemRefCount: {
-            int lRemItemRfCnt = iServer->lastRemovedItemRfCount();
-            outputDataStream << lRemItemRfCnt;
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        case ELastAddedItemRefCount: {
-            int lAddItemRfCnt = iServer->lastAddedRefCount();
-            outputDataStream << lAddItemRfCnt;
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        case EEnableCache: {
-            int enable ;
-            inputDataStream >> enable;
-            bool success = iServer->enableCache(enable);
-            outputDataStream << (int)success;
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        case ECacheHit: {
-            int cacheHitCnt = iServer->cacheHitCount();
-            outputDataStream << cacheHitCnt;
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        case ECacheMiss: {
-            int cacheMissCnt = iServer->cacheMissCount();
-            outputDataStream << cacheMissCnt;
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        case ECleanRasterLRUList: {
-            iServer->cleanRasterLRUList();
-            break;
-        }
-        case ECleanVectorLRUList: {
-            iServer->cleanVectorLRUList();
-            break;
-        }
-        case EGpuLruCount: {
-            int rasterLruCount = iServer->rasterLruCount();
-            outputDataStream << rasterLruCount;
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        case ECpuLruCount: {
-            int vectorLruCount = iServer->vectorLruCount();
-            outputDataStream << vectorLruCount;
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        case EServerHeap: {
-        }
-#endif
-#ifdef HB_THEME_SERVER_MEMORY_REPORT
-        case ECreateMemoryReport: {
-            GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
-            static_cast<HbSharedMemoryManager *>(manager)->createReport();
-            break;
-        }
-#endif
-        case EUnloadIcon: {
-            QString filename;
-            QSizeF size;
-            int aspectRatioMode;
-            int mode;
-            bool mirrored;
-            int options;
-            QColor color;
-            inputDataStream >> filename;
-            inputDataStream >> size;
-            inputDataStream >> aspectRatioMode;
-            inputDataStream >> mode;
-            inputDataStream >> mirrored;
-            inputDataStream >> options;
-            inputDataStream >> color;
-
-            HbIconKey key(filename, size,
-                          static_cast<Qt::AspectRatioMode>(aspectRatioMode),
-                          static_cast<QIcon::Mode>(mode), mirrored, color,
-                          iServer->currentRenderingMode());
-            iServer->removeIconCacheItem(key);
-            sessionIconData.removeOne(key);
-            QByteArray outputByteArray;
-            QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-            outputDataStream << int(requestType);
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        case EFreeSharedMem: {
-            int freeSharedMem = iServer->freeSharedMemory();
-            QByteArray outputByteArray;
-            QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-            outputDataStream << requestType;
-            outputDataStream << freeSharedMem;
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        case EAllocatedSharedMem: {
-            int allocatedSharedMem = iServer->allocatedSharedMemory();
-            QByteArray outputByteArray;
-            QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-            outputDataStream << requestType;
-            outputDataStream << allocatedSharedMem;
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        case ETypefaceOffset: {
-            int offset = -1;
-            HbTypefaceInfoDatabase *typefaceDatabase =
-                HbTypefaceInfoDatabase::instance(HbMemoryManager::SharedMemory);
-
-            if (typefaceDatabase) {
-                offset = typefaceDatabase->typefaceInfoVectorOffset();
-            }
-            // offset will be -1 if the typefaceDatabase is NULL.
-            QByteArray outputByteArray;
-            QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-            outputDataStream << requestType;
-            outputDataStream << offset;
-            static_cast<QLocalSocket *>(sender())->write(outputByteArray);
-            break;
-        }
-        default:
-            break;
-        }
-    }
-}
-
-/*!
-  \fn HbThemeServerSession::iconInfoFromSingleIcon()
-  Checks for the cacheItem for a given key, if found gets the data relevant of the cacheItem.
-*/
-
-bool HbThemeServerSession::iconInfoFromSingleIcon(HbIconKey key,
-        HbSharedIconInfo &stitchedData)
-{
-    stitchedData.type = INVALID_FORMAT;
-    HbIconCacheItem *cacheItem = iServer->iconCacheItem(key);
-    if (cacheItem) {
-        getDataFromCacheItem(cacheItem, stitchedData);
-        return true;
-    }
-    return false;
-}
-
-/*!
-  \fn HbThemeServerSession::createCacheItemData()
-  Creates a cacheItem of the given key and insert the item in to the list
-  else free the data allocated for the cache..
-*/
-bool HbThemeServerSession::createCacheItemData(HbIconKey key, int options, HbSharedIconInfo &data)
-{
-    HbIconCacheItem *cacheItemOfPiece = iServer->iconCacheItem(key);
-    if (cacheItemOfPiece) {
-        return true;
-    }
-
-    QScopedPointer<HbIconCacheItem> tempIconCacheItem;
-    bool insertKeyIntoSessionList = false;
-    data.type = INVALID_FORMAT;
-    QString format = HbThemeServerUtils::formatFromPath(key.filename);
-
-    tempIconCacheItem.reset(HbIconCacheItemCreator::createCacheItem(key,
-                            static_cast<HbIconLoader::IconLoaderOptions>(options),
-                            format, iServer->currentRenderingMode(), false));
-    cacheItemOfPiece = tempIconCacheItem.data();
-    if (cacheItemOfPiece) {
-        getDataFromCacheItem(cacheItemOfPiece, data);
-        if (data.type != INVALID_FORMAT) {
-            insertKeyIntoSessionList = iServer->insertIconCacheItem(key, cacheItemOfPiece);
-            if (!insertKeyIntoSessionList) {
-                //if insertion failed free the memory
-                freeDataFromCacheItem(cacheItemOfPiece);
-                data.type = INVALID_FORMAT;
-            }
-        }
-    }
-    tempIconCacheItem.take();
-    return insertKeyIntoSessionList;
-}
-
-/*!
-  \fn HbThemeServerSession::createStichedIconInfoOfParts()
-  Creates a consolidated icon of the available piece iconInfo.
-*/
-bool HbThemeServerSession::createStichedIconInfoOfParts(QVector<HbSharedIconInfo> dataForParts, HbMultiIconParams params,
-        HbIconKey &finalIconKey, HbSharedIconInfo &stitchedData)
-{
-    HbIconCacheItem *cacheItem = iServer->iconCacheItem(finalIconKey);
-    if (cacheItem) {
-        return true;
-    }
-    bool insertKeyIntoSessionList = false;
-    stitchedData.type = INVALID_FORMAT;
-    QString format = HbThemeServerUtils::formatFromPath(params.multiPartIconList[0]);
-
-    QScopedPointer<HbPixmapIconProcessor> tempIconProcessor(new HbPixmapIconProcessor(finalIconKey,
-                                                static_cast<HbIconLoader::IconLoaderOptions>(params.options), format));
-    HbPixmapIconProcessor *rasterIcon = tempIconProcessor.data();
-    rasterIcon->createMultiPieceIconData(dataForParts, params);
-
-    QScopedPointer <HbIconCacheItem> tempIconCacheItem;
-    tempIconCacheItem.reset(HbIconCacheItemCreator::createCacheItem(finalIconKey,
-                                    static_cast<HbIconLoader::IconLoaderOptions>(params.options), format, iServer->currentRenderingMode(),false));
-    cacheItem = tempIconCacheItem.data();
-
-    cacheItem->rasterIconData = rasterIcon->sharedIconData();
-    cacheItem->rasterIconDataCost = rasterIcon->sharedIconDataCost();
-    stitchedData = cacheItem->rasterIconData;
-    if (stitchedData.type != INVALID_FORMAT) {
-        insertKeyIntoSessionList = iServer->insertIconCacheItem(finalIconKey, cacheItem);
-        if (!insertKeyIntoSessionList) {
-            //if insertion failed free the memory
-            freeDataFromCacheItem(cacheItem);
-            stitchedData.type = INVALID_FORMAT;
-        }
-    }
-    tempIconCacheItem.take();
-    return insertKeyIntoSessionList;
-}
-
-
-/*!
-  \fn HbThemeServerSession::iconInfoFromMultiParts()
-  Creates a shared IconInfo of the piece files of a frame item and
-  tries to create a stiched icon of the same.
-*/
-void HbThemeServerSession::iconInfoFromMultiParts(HbMultiIconParams params,
-        int noOfPieces,
-        HbIconKey &stichedKey,
-        HbSharedIconInfo &stitchedData)
-{
-    QVector<HbIconKey> keysInserted;
-    QVector<HbSharedIconInfo>  dataForParts;
-    bool insertKeyIntoSessionList = false;
-    bool failedToCreateParts = false;
-    try {
-        for (int i = 0; i < noOfPieces; i++) {
-            HbSharedIconInfo data;
-            bool iconPieceMirrored = false;
-            HbIconKey key(params.multiPartIconList.at(i), params.multiPartIconData.pixmapSizes[i],
-                          static_cast<Qt::AspectRatioMode>(stichedKey.aspectRatioMode),
-                          static_cast<QIcon::Mode>(stichedKey.mode),
-                          iconPieceMirrored, stichedKey.color, stichedKey.renderMode);
-            insertKeyIntoSessionList = iconInfoFromSingleIcon(key, data);
-            if (!insertKeyIntoSessionList) {
-                insertKeyIntoSessionList = createCacheItemData(key, params.options, data);
-            }
-            if ((data.type == INVALID_FORMAT) || !insertKeyIntoSessionList) {
-                failedToCreateParts = true;
-                break;
-            } else {
-                //The session will only keep track of icons that were either successfully found or were
-                //successfully inserted in the cache.
-                keysInserted.append(key);
-                dataForParts.append(data);
-                sessionIconData.append(key);
-            }
-        }//end of for
-    } catch(std::exception &) {
-        failedToCreateParts = true;
-    }
-
-    if (failedToCreateParts || (dataForParts.count() != noOfPieces)
-        || !insertKeyIntoSessionList) {
-        //atLeast one of the icon did'nt get constructed ,
-        //so move the cached piece icons to unused state and return
-        for (int i = 0; i < keysInserted.count(); i++) {
-            sessionIconData.removeOne(keysInserted.at(i));
-        }
-        dataForParts.clear();
-        stitchedData.type = INVALID_FORMAT;
-        return;
-    }
-// Create a stitched icon of the available piece shared iconinfos
-    if ((dataForParts.count() == noOfPieces) && (!failedToCreateParts)) {
-        try {
-            if (createStichedIconInfoOfParts(dataForParts, params, stichedKey, stitchedData)) {
-                sessionIconData.append(stichedKey);
-            }
-        } catch(std::exception &) {
-        }
-    }
-// Move the keys created for pieces to unused state*/
-    for (int i = 0; i < keysInserted.count(); i++) {
-        sessionIconData.removeOne(keysInserted.at(i));
-    }
-}
-
-/*!
-  \fn HbThemeServerSession::clearSessionIconData()
-  Clears the session data of the icons found in the cache.
-*/
-void HbThemeServerSession::clearSessionIconData()
-{
-    sessionIconData.clear();
-}
-
-void HbThemeServerSession::removeSessionIconItem(const HbIconKey &key)
-{
-    sessionIconData.removeAll(key);
-}
-
-void HbThemeServerSession::removeSessionCssItem(const QString &key)
-{
-    sessionCssData.removeAll(key);
-}
-
-/*!
-  \fn HbThemeServerSession::freeDataFromCacheItem()
-  Frees data from the cached item when insertion to the list fails.
-*/
-void HbThemeServerSession::freeDataFromCacheItem(HbIconCacheItem* cacheItem)
-{
-    GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory)
-    if (cacheItem->rasterIconData.type != INVALID_FORMAT) {
-        switch (cacheItem->rasterIconData.type) {
-        case PIC :
-            manager->free(cacheItem->rasterIconData.picData.offset);
-            break;
-        case NVG :
-            manager->free(cacheItem->rasterIconData.nvgData.offset);
-            break;
-        case OTHER_SUPPORTED_FORMATS :
-            manager->free(cacheItem->rasterIconData.pixmapData.offset);
-            break;
-        default:
-            break;
-        }
-    }
-    if (cacheItem->vectorIconData.type != INVALID_FORMAT) {
-        switch (cacheItem->vectorIconData.type) {
-        case PIC :
-            manager->free(cacheItem->vectorIconData.picData.offset);
-            break;
-        case NVG :
-            manager->free(cacheItem->vectorIconData.nvgData.offset);
-            break;
-        case OTHER_SUPPORTED_FORMATS :
-            manager->free(cacheItem->vectorIconData.pixmapData.offset);
-            break;
-        default:
-            break;
-        }
-    }
-    if (cacheItem->blobIconData.type == BLOB) {
-        manager->free(cacheItem->blobIconData.blobData.offset);
-    }
-}
-
-/*!
-  \fn HbThemeServerSession::fillOutPutDataStream()
-  Fills the Output data stream with the sharedIconInfo data.
-*/
-void HbThemeServerSession::fillOutPutDataStream(QDataStream &outputDataStream,
-                                                HbSharedIconInfo &data,
-                                                HbThemeServerRequest request)
-{
-    outputDataStream << int(request);
-    outputDataStream << int(data.type);
-
-    switch (data.type) {
-    case OTHER_SUPPORTED_FORMATS:
-        outputDataStream << data.pixmapData.offset;
-        outputDataStream << data.pixmapData.width;
-        outputDataStream << data.pixmapData.height;
-        outputDataStream << data.pixmapData.defaultWidth;
-        outputDataStream << data.pixmapData.defaultHeight;
-        outputDataStream << int(data.pixmapData.format);
-        break;
-        /*case SVG:*/
-    case PIC: {
-        outputDataStream << data.picData.offset;
-        outputDataStream << data.picData.dataSize;
-        outputDataStream << data.picData.defaultWidth;
-        outputDataStream << data.picData.defaultHeight;
-        break;
-    }
-    case NVG: {
-        outputDataStream << data.nvgData.offset;
-        outputDataStream << data.nvgData.dataSize;
-        break;
-    }
-    case BLOB: {
-        outputDataStream << data.blobData.offset;
-        outputDataStream << data.blobData.dataSize;
-        break;
-    }
-    default:
-        break;
-    }
-}
-
-/*!
-  \fn HbThemeServerSession::getDataFromCacheItem()
-  Gets data from the cache Item.
-*/
-void HbThemeServerSession::getDataFromCacheItem(HbIconCacheItem* cacheItem,
-                                                HbSharedIconInfo &data) const
-{
-    if (cacheItem) {
-        if (cacheItem->rasterIconData.type != INVALID_FORMAT) {
-            data = cacheItem->rasterIconData;
-        } else if (cacheItem->vectorIconData.type != INVALID_FORMAT) {
-            data = cacheItem->vectorIconData;
-        } else if (cacheItem->blobIconData.type != INVALID_FORMAT) {
-            data = cacheItem->blobIconData;
-        } else {
-            data.type = INVALID_FORMAT;
-        }
-    }
-}
-
-/**
- * HbThemeServerPrivate::handleSharedWidgetMLLookup()
- */
-QByteArray HbThemeServerPrivate::handleSharedWidgetMLLookup(const QString &fileName,
-                                                            const QString &layout,
-                                                            const QString &section)
-{
-    int offset = HbThemeServerUtils::getSharedLayoutDefinition(fileName, layout, section);
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest request;
-    request = EWidgetMLLookup;
-    outputDataStream << (int)request;
-    outputDataStream << offset;
-    return outputByteArray;
-}
-
-/**
- * HbThemeServerPrivate::handleSharedEffectAddAndFileLookup()
- */
-QByteArray HbThemeServerPrivate::handleSharedEffectAddAndFileLookup(int request,
-                                                                    const QString &fileName)
-{
-    int offset = HbThemeServerUtils::getSharedEffect(fileName);
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    outputDataStream << request;
-    outputDataStream << offset;
-    return outputByteArray;
-}
-
-/**
- * HbThemeServerSession::handleStyleSheetLookup()
- */
-QByteArray HbThemeServerSession::handleStyleSheetLookup(int request,
-    const QString &fileName, HbLayeredStyleLoader::LayerPriority priority)
-{
-    int offset = -1;
-    HbCacheItem* cssItem = iServer->cssCacheItem(fileName);
-    bool insertKeyIntoSessionList = false;
-    if (cssItem) {
-        offset = cssItem->offset;
-        insertKeyIntoSessionList = true;
-    } else {
-        bool tryAgain = false;
-        do {
-            bool inSharedCache = false;
-            offset = HbThemeServerUtils::getSharedStylesheet(fileName, priority, &inSharedCache);
-            if (!inSharedCache) {
-                if (offset >= 0) {
-                    HbCacheItem *cssItem = new HbCacheItem(offset, 0, fileName);
-                    insertKeyIntoSessionList = iServer->insertCssCacheItem(fileName, cssItem);
-                    if (priority == HbLayeredStyleLoader::Priority_Core
-                        && cssItem->refCount == 1) {
-                        // This will make sure the requested stylesheet will always remain
-                        // in the primary and secondary cache.
-                        cssItem->incrementRefCount();
-                    }
-                    if (priority == HbLayeredStyleLoader::Priority_Theme
-                        && cssItem->refCount == 1) {
-                        iServer->themePriorityItems.insert(fileName, cssItem);
-                    }
-                    break;
-                } else if (offset == OUT_OF_MEMORY_ERROR && tryAgain == false) {
-                    iServer->doCleanup();
-                    tryAgain = true;
-                } else if (offset == OUT_OF_MEMORY_ERROR && tryAgain == true) {
-                    //try only once to free up memory.
-                    tryAgain = false;
-                }
-            }
-        } while (tryAgain);
-    }
-
-    if (insertKeyIntoSessionList) {
-        //The session will only keep track of cssFiles that were either successfully found or were
-        //successfully inserted in the cache.
-        sessionCssData.append(fileName);
-    }
-
-    //write to client socket the offset of required stylesheet
-    //it can be -1 in case of error.
-    QByteArray output;
-    QDataStream outputDataStream(&output, QIODevice::WriteOnly);
-
-    outputDataStream << request;
-    outputDataStream << offset;
-
-    return output;
-}
-
-/**
- * HbThemeServerSession::handleIconLookup()
- */
-QByteArray HbThemeServerSession::handleIconLookup(const HbIconKey &key, HbSharedIconInfo &data,
-                                                  int options)
-{
-    bool insertKeyIntoSessionList = false;
-    HbIconCacheItem * cacheItem = iServer->iconCacheItem(key);
-    QScopedPointer <HbIconCacheItem> tempIconCacheItem;
-
-    if (cacheItem) {
-        insertKeyIntoSessionList = true; //The item was found in the cache and ref count was incremented
-        if (cacheItem->rasterIconData.type != INVALID_FORMAT) {
-            data = cacheItem->rasterIconData;
-        } else if (cacheItem->vectorIconData.type != INVALID_FORMAT) {
-            data = cacheItem->vectorIconData;
-        } else if (cacheItem->blobIconData.type != INVALID_FORMAT) {
-            data = cacheItem->blobIconData;
-        } else {
-            data.type = INVALID_FORMAT;
-        }
-    } else {
-        QString format = HbThemeServerUtils::formatFromPath(key.filename);
-        QT_TRY {
-            tempIconCacheItem.reset(HbIconCacheItemCreator::createCacheItem(key,
-                (HbIconLoader::IconLoaderOptions)options,
-                format,
-				iServer->currentRenderingMode(),
-                false));
-            cacheItem = tempIconCacheItem.data();
-            if (cacheItem) {
-                if (cacheItem->rasterIconData.type != INVALID_FORMAT) {
-                    data = cacheItem->rasterIconData;
-                } else if (cacheItem->vectorIconData.type != INVALID_FORMAT) {
-                    data = cacheItem->vectorIconData;
-                } else if (cacheItem->blobIconData.type != INVALID_FORMAT) {
-                    data = cacheItem->blobIconData;
-                } else {
-                    data.type = INVALID_FORMAT;
-                }
-                if (data.type != INVALID_FORMAT) {
-                    insertKeyIntoSessionList = iServer->insertIconCacheItem(key, cacheItem);
-                }
-            }
-        } QT_CATCH(const std::bad_alloc &) {
-            data.type = INVALID_FORMAT;
-        }
-    }
-    if (insertKeyIntoSessionList) {
-        //The session will only keep track of icons that were either successfully found or were
-        //successfully inserted in the cache.
-        sessionIconData.append(key);
-    }
-
-    tempIconCacheItem.take();
-
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest request;
-    request = EIconLookup;
-    outputDataStream << (int)request;
-    outputDataStream << (int)data.type;
-
-    if (data.type == OTHER_SUPPORTED_FORMATS) {
-        outputDataStream << data.pixmapData.offset;
-        outputDataStream << data.pixmapData.width;
-        outputDataStream << data.pixmapData.height;
-        outputDataStream << data.pixmapData.defaultWidth;
-        outputDataStream << data.pixmapData.defaultHeight;
-        outputDataStream << (int)data.pixmapData.format;
-    } else if (/*data.type == SVG || */data.type == PIC) {
-        outputDataStream << data.picData.offset;
-        outputDataStream << data.picData.dataSize;
-        outputDataStream << data.picData.defaultWidth;
-        outputDataStream << data.picData.defaultHeight;
-    } else if (data.type == NVG) {
-        outputDataStream << data.nvgData.offset;
-        outputDataStream << data.nvgData.dataSize;
-    } else if (data.type == BLOB) {
-        outputDataStream << data.blobData.offset;
-        outputDataStream << data.blobData.dataSize;
-    }
-#ifdef THEME_SERVER_TRACES
-    qDebug() << Q_FUNC_INFO << " offset= " << data.pixmapData.offset << " format= " << data.pixmapData.format;
-    testLabel->setPixmap(QPixmap::fromImage(
-                             QImage(
-                                 HbMemoryUtils::getAddress<uchar>(HbMemoryManager::SharedMemory, data.pixmapData.offset),
-                                 data.pixmapData.width,
-                                 data.pixmapData.height,
-                                 data.pixmapData.format)));
-#endif
-
-    return outputByteArray;
-}
-
-/**
- * HbThemeServerPrivate::doCleanup()
- *
- * This function releases shared memory occupied by css-resources whose reference count is zero,
- * so that subsequent css-requests could be fulfilled by the server. Those css-files whose reference
- * count are zero, are already appended to the list maintained by the css-cache. Since these resources
- * are not being referred to by any application, they can be removed from the cache and corresponding
- * shared memory can be freed up.
- */
-void HbThemeServerPrivate::doCleanup()
-{
-    HbThemeServerUtils::cleanupUnusedCss(cssCache);
-}
-
-/**
- * HbThemeServerPrivate::sessionListCount()
- * Gives the list count of Sessions.
- */
-int HbThemeServerPrivate::sessionListCount() const
-{
-    return sessionList.count();
-}
-
-/**
- * HbThemeServerPrivate::freeSharedMemory()
- * Gives the free shared memory.
- */
-int HbThemeServerPrivate::freeSharedMemory() const
-{
-    GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
-    return static_cast<HbSharedMemoryManager *>(manager)->freeSharedMemory();
-}
-
-/**
- * HbThemeServerPrivate::allocatedSharedMemory()
- * Gives the allocated shared memory.
- */
-int HbThemeServerPrivate::allocatedSharedMemory() const
-{
-    GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
-    return static_cast<HbSharedMemoryManager *>(manager)->allocatedSharedMemory();
-}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbthemeserver/hbthemeserver_generic_p_p.h
--- a/src/hbservers/hbthemeserver/hbthemeserver_generic_p_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbServers module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBTHEMESERVER_GENERIC_P_H
-#define HBTHEMESERVER_GENERIC_P_H
-
-#include <QMainWindow>
-#include <QLabel>
-
-#include "hbicondatacache_p.h"
-#include "hbcache_p.h"
-#include "hblayeredstyleloader_p.h"
-
-class QLocalServer;
-class QLocalSocket;
-class HbThemeServerSession;
-struct HbIconKey;
-
-#ifdef QT_DEBUG
-class HbThemeServerPrivate : public QMainWindow
-#else
-class HbThemeServerPrivate : public QObject
-#endif
-{
-    Q_OBJECT
-
-public:
-#ifdef QT_DEBUG
-    HbThemeServerPrivate(QWidget *parent = 0);
-#else
-    HbThemeServerPrivate();
-#endif
-
-    ~HbThemeServerPrivate();
-    bool start();
-    void stop();
-
-    bool insertIconCacheItem(const HbIconKey &key, HbIconCacheItem *item);
-    HbIconCacheItem *iconCacheItem(const HbIconKey &key);
-    void setMaxGpuCacheSize(int size);
-    void setMaxCpuCacheSize(int size);
-    void removeIconCacheItem(const HbIconKey &key);
-    void clearIconCache();
-    void handleThemeSelection(const QString &newtheme);
-    void handleContentUpdate(const QStringList &fileNames);
-
-    QByteArray handleSharedEffectAddAndFileLookup(int request, const QString &fileName);
-    QByteArray handleSharedWidgetMLLookup(const QString &fileName,
-                                          const QString &layout, const QString &section);
-    void writeToClients(QByteArray &block);
-
-    bool insertCssCacheItem(const QString &key,  HbCacheItem *item);
-    HbCacheItem *cssCacheItem(const QString &key);
-    void removeCssCacheItem(const QString &key);
-    void clearCssCache();
-
-    void doCleanup();
-    int sessionListCount() const;
-
-    int freeSharedMemory() const;
-    int allocatedSharedMemory() const;
-
-	HbRenderingMode currentRenderingMode() const;
-    void setCurrentRenderingMode(HbRenderingMode currentMode);
-
-    bool resolveThemePath(const QString &themeName, QString &themePath);
-
-//Debug Code for Test Purpose
-#ifdef HB_ICON_CACHE_DEBUG
-    int cacheIconCount() const;
-    int memorySize(const QString &mem);
-    int freeVectorMemory();
-    int freeRasterMemory();
-    int lastAddedRefCount();
-    int lastAddedItemMem();
-    int lastRemovedItemMem();
-    int lastRemovedItemRfCount();
-    bool enableCache(bool cacheIt);
-    int cacheHitCount();
-    int cacheMissCount();
-    int serverHeapSize();
-    void cleanRasterLRUList();
-    void cleanVectorLRUList();
-    int rasterLruCount();
-    int vectorLruCount();
-#endif
-
-private slots:
-    void newClientConnected();
-    void clienDisconnected();
-    void removeFromList();
-    bool listen();
-
-public:
-    QHash<QString, HbCacheItem*> themePriorityItems;
-
-private:
-#ifdef QT_DEBUG
-    QLabel statusLabel;
-#endif
-    QLocalServer *server;
-    QList<HbThemeServerSession *> sessionList;
-    HbIconDataCache *iconCache;
-    HbCache *cssCache;
-	HbRenderingMode renderMode;
-
-    QString iCurrentThemeName;
-    QString iCurrentThemePath;
-};
-
-class HbThemeServerSession : public QObject
-{
-    Q_OBJECT
-public:
-    HbThemeServerSession(QLocalSocket *clientConnection, HbThemeServerPrivate *server);
-    ~HbThemeServerSession();
-    QLocalSocket *clientConnection();
-    void fillOutPutDataStream(QDataStream &outputDataStream, HbSharedIconInfo &data,
-                              HbThemeServerRequest request);
-    void getDataFromCacheItem(HbIconCacheItem* cacheItem, HbSharedIconInfo &data) const;
-    void freeDataFromCacheItem(HbIconCacheItem* cacheItem);
-    QByteArray handleStyleSheetLookup(int request, const QString &fileName,
-                                      HbLayeredStyleLoader::LayerPriority priority);
-    QByteArray handleIconLookup(const HbIconKey &key, HbSharedIconInfo &data, int options);
-    bool iconInfoFromSingleIcon(HbIconKey key, HbSharedIconInfo &stitchedData);
-    bool createCacheItemData(HbIconKey key, int options, HbSharedIconInfo &data);
-    bool createStichedIconInfoOfParts(QVector<HbSharedIconInfo> dataForParts,
-                                      HbMultiIconParams params,
-                                      HbIconKey &finalIconKey,
-                                      HbSharedIconInfo &stitchedData);
-    void iconInfoFromMultiParts(HbMultiIconParams params,
-                                int noOfPieces,
-                                HbIconKey &stichedKey,
-                                HbSharedIconInfo &stitchedData);
-    void clearSessionIconData();
-    void removeSessionIconItem(const HbIconKey &key);
-    void removeSessionCssItem(const QString &key);
-
-public slots:
-    void readDataFromClient();
-
-private:
-    HbThemeServerPrivate *iServer;
-    QLocalSocket *iClientConnection;
-    QList<HbIconKey> sessionIconData;
-    QList<QString> sessionCssData;
-};
-
-#endif // HBTHEMESERVER_GENERIC_P_H
-
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbthemeserver/hbthemeserver_symbian.cpp
--- a/src/hbservers/hbthemeserver/hbthemeserver_symbian.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_symbian.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -103,34 +103,14 @@
     TInt error = iThemeProperty.Attach(KServerUid3, KThemeName );
     User::LeaveIfError(error);
 
-    // Store the active theme name in a member string
-    iCurrentThemeName = HbThemeUtils::getThemeSetting(HbThemeUtils::CurrentThemeSetting);    
-
-    if (iCurrentThemeName.isEmpty()) {
-        iCurrentThemeName = HbThemeUtils::defaultTheme().name;
-    }
-
-    // Cache ROM theme(name)s
-    QString romPath = "Z:\\resource\\hb\\themes\\icons\\";
-    QDir dir(romPath);
-    romThemeNames = dir.entryList(QDir::Dirs);
+    QString currentTheme = HbThemeUtils::getThemeSetting(HbThemeUtils::CurrentThemeSetting);
 
-    // Resolve the path of the current theme
-    QDir path(iCurrentThemeName);
-    if (!path.isAbsolute()) {
-        // Resolve the path of the current theme
-        resolveThemePath(iCurrentThemeName, iCurrentThemePath);
-    } else {
-        iCurrentThemeName = path.dirName();
-        iCurrentThemePath = path.absolutePath();
-    }          
-    
-    // Open index file to prevent uninstallation of the active theme
-    if (!openCurrentIndexFile()) {
-        // theme doesn't exist activate default theme
-        iCurrentThemeName = HbThemeUtils::defaultTheme().name;
-        resolveThemePath(iCurrentThemeName, iCurrentThemePath);
-    }
+    // Store the active theme name in a member string
+    // and resolve the path of the current theme
+    QDir path(currentTheme);
+    iCurrentThemeName = path.dirName();
+    iCurrentThemePath = path.absolutePath();
+
     cache = 0;
     cssCache = 0;
 
@@ -146,17 +126,34 @@
     }
     setMaxGpuCacheSize(GPU_CACHE_SIZE);
     setMaxCpuCacheSize(CPU_CACHE_SIZE);
-#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)    
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
     renderMode = EHWRendering;
 #else
     renderMode = ESWRendering;
 #endif
-    
-    // Process base theme index, it is used as parent index also when the current theme is something else
-    QString basePath;
-    resolveThemePath(HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting), basePath);
-    
-    HbThemeServerUtils::createThemeIndex(basePath, BaseTheme);
+
+    // Load theme indexes
+    UpdateThemeIndexes();
+
+    // Start the splash screen generator app.
+    QProcess::startDetached("hbsplashgenerator.exe");
+}
+
+void HbThemeServerPrivate::UpdateThemeIndexes(bool updateBase)
+{
+    // Start watching the current theme.index for uninstallation
+    if (!openCurrentIndexFile()) {
+        // theme doesn't exist activate default theme
+        QString defaultTheme = HbThemeUtils::getThemeSetting(HbThemeUtils::DefaultThemeSetting);
+        QDir path(defaultTheme);
+        iCurrentThemeName = path.dirName();
+        iCurrentThemePath = path.absolutePath();
+    }
+
+    if (updateBase) {
+        // Process base theme index, it is used as parent index also when the current theme is something else
+        HbThemeServerUtils::createThemeIndex(HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting), BaseTheme);
+    }
     // Process operator theme indexes
     QString operatorName = HbThemeUtils::getThemeSetting(HbThemeUtils::OperatorNameSetting);
     if (!operatorName.isEmpty()) {
@@ -164,30 +161,24 @@
         operatorPath.append(KOperatorCPath);
         operatorPath.append(operatorName);
         HbThemeServerUtils::createThemeIndex(operatorPath, OperatorC);
-        // Process operator Drive Z theme index
-        QString operatorROMPath;
-        operatorROMPath.append(KOperatorZPath);
-        operatorROMPath.append(operatorName);
-        HbThemeServerUtils::createThemeIndex(operatorROMPath, OperatorROM);
+        if (updateBase) {
+            // Process operator Drive Z theme index
+            QString operatorROMPath;
+            operatorROMPath.append(KOperatorZPath);
+            operatorROMPath.append(operatorName);
+            HbThemeServerUtils::createThemeIndex(operatorROMPath, OperatorROM);
+        }
     }
+
     // Process current theme index
     HbThemeServerUtils::createThemeIndex(iCurrentThemePath, ActiveTheme);
 
-    // Register theme system effects in construction
+    // Register theme system effects
     // TODO: fix parameter
     HbThemeSystemEffect::handleThemeChange(iCurrentThemeName);
 
     // Set the current theme also in the cenrep key that is used to notify clients.
-    HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting, iCurrentThemePath);    
-    
-    // Temporary hack for pre-loading app. background graphics in server startup to give more realistic
-    // results in performance tests. (Normally these graphics get loaded anyway when the first hb app is started.)
-#ifndef HB_NVG_CS_ICON
-    QProcess::startDetached("hbiconpreloader.exe");
-#endif
-
-    // Start the splash screen generator app.
-    QProcess::startDetached("hbsplashgenerator.exe");
+    HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting, iCurrentThemePath);
 }
 
 /**
@@ -241,7 +232,6 @@
  */
 bool HbThemeServerPrivate::openCurrentIndexFile()
 {
-    // Open index file to prevent uninstallation of the active theme
     if (!iCurrentThemePath.isEmpty() && iCurrentThemePath[0] != 'z' && 
         iCurrentThemePath[0] != 'Z' && iCurrentThemePath[0] != ':') {
         QString indexFileName;
@@ -267,98 +257,19 @@
     return true;
 }
 
-bool HbThemeServerPrivate::resolveThemePath(const QString &themeName, QString &themePath)
-{
-    if (themeName == "hbdefault") {
-        themePath = ":\\themes\\icons\\hbdefault";
-        return true;
-    }
-    
-    if (!themeName.isEmpty()) {
-        // Check for the theme's icon directory in different drives.
-        // ROM is checked first and then phone memory and memory card drives.
-
-        QString themeLookupPath = "Z:\\resource\\hb\\themes\\icons\\";
-    
-        if (romThemeNames.contains(themeName)) {
-            themeLookupPath.append(themeName);    
-            themePath = themeLookupPath;
-            return true;
-        }
-
-        themeLookupPath.append(themeName);
-        QString filename(themeLookupPath);
-        filename.append("\\index.theme");
-
-        filename[0] = 'C';
-        if (QFile::exists(filename)) {
-            themeLookupPath[0] = 'C';
-            themePath = themeLookupPath;
-            return true;
-        }
-
-        filename[0] = 'E';
-        if (QFile::exists(filename)) {
-            themeLookupPath[0] = 'E';
-            themePath = themeLookupPath;
-            return true;
-        }
-
-        filename[0] = 'F';
-        if (QFile::exists(filename)) {
-            themeLookupPath[0] = 'F';
-            themePath = themeLookupPath;
-            return true;
-        }        
-        
-    }
-    return false;
-}
-
 /**
 Handles theme selection
 */
 void HbThemeServerPrivate::HandleThemeSelection( const QString& themeName)
 {
-    //Make a copy for ourselves
-	
-	
-    QString cleanThemeName = themeName.trimmed();
-
-    iCurrentThemeName = cleanThemeName;    
+    QDir path(themeName.trimmed());
+    iCurrentThemeName = path.dirName();
+    iCurrentThemePath = path.absolutePath();
 
-    QDir path(cleanThemeName);
-    if (!path.isAbsolute()) {
-        // Resolve the path of the current theme
-        resolveThemePath(iCurrentThemeName, iCurrentThemePath);
-    } else {
-        iCurrentThemeName = path.dirName();
-        iCurrentThemePath = path.absolutePath();
-    }
-    
     #ifdef THEME_INDEX_TRACES
-    qDebug() << "ThemeIndex: theme change request, new theme =" << cleanThemeName.toUtf8();
+    qDebug() << "ThemeIndex: theme change request, new theme =" << themeName.toUtf8();
     #endif
 
-    
-    // Open index file to prevent uninstallation of the active theme
-    if (!openCurrentIndexFile()) {
-        // theme doesn't exist activate default theme
-        iCurrentThemeName = HbThemeUtils::defaultTheme().name;
-        resolveThemePath(iCurrentThemeName, iCurrentThemePath);
-    }
-
-    // Process operator Drive C theme index
-    QString operatorName = HbThemeUtils::getThemeSetting(HbThemeUtils::OperatorNameSetting);
-    if (!operatorName.isEmpty()) {
-        QString operatorPath;
-        operatorPath.append(KOperatorCPath);
-        operatorPath.append(operatorName);
-        HbThemeServerUtils::createThemeIndex(operatorPath, OperatorC);
-    }
-    // Process current theme index
-    HbThemeServerUtils::createThemeIndex(iCurrentThemePath, ActiveTheme);
-
     // Clear cached icons and session data
     clearIconCache();
     iSessionIter.SetToFirst();
@@ -367,12 +278,9 @@
         session.ClearSessionData();
         iSessionIter++;
     }
-	
-    // TODO: fix parameter
-    HbThemeSystemEffect::handleThemeChange(iCurrentThemeName);
- 
-    // Update settings and notify clients
-    HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting,iCurrentThemePath);
+
+    // Update current theme index
+    UpdateThemeIndexes(false);
 }
 
 /**
@@ -705,11 +613,12 @@
     return cache->vectorLruCount();
 }
 
+#endif
+
 int HbThemeServerPrivate::gpuLRUSize() const
 {
     return cache->gpuLRUSize();
 }
-#endif
 
 /**
  * HbThemeServerPrivate::doCleanup()
@@ -954,12 +863,6 @@
         aMessage.WriteL(1, out);
         break;
     }
-    case EGPULRUSize: {
-        TInt gpuLRUSize = iServer->gpuLRUSize();
-        TPckg<TInt> out(gpuLRUSize);
-        aMessage.WriteL(1, out);
-        break;
-    }
     case ERefCount: {
         TInt refCount = iServer->iconRefCount(aMessage);
         TPckg<TInt> out(refCount);
@@ -1007,6 +910,12 @@
         break;
     }
 #endif
+    case EGPULRUSize: {
+        TInt gpuLRUSize = iServer->gpuLRUSize();
+        TPckg<TInt> out(gpuLRUSize);
+        aMessage.WriteL(1, out);
+        break;
+    }
     case EMemoryGood: {
         if(iServer->currentRenderingMode() == ESWRendering){
             iServer->setCurrentRenderingMode(EHWRendering);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h
--- a/src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -103,7 +103,6 @@
     static bool gpuMemoryState();
 
     bool openCurrentIndexFile();
-    bool resolveThemePath(const QString &themeName, QString &themePath);
     HbRenderingMode currentRenderingMode() const;
     void setCurrentRenderingMode(HbRenderingMode currentMode);
     void HandleThemeSelection( const QString& themeName);
@@ -111,7 +110,7 @@
     int freeSharedMemory();
     int allocatedSharedMemory();
     int allocatedHeapMemory();
-
+    int gpuLRUSize() const;
 //Debug Code for Test Purpose
 #ifdef HB_ICON_CACHE_DEBUG
     int cacheIconCount() const;
@@ -130,7 +129,6 @@
     void cleanVectorLRUList();
     int rasterLruCount();
     int vectorLruCount();
-    int gpuLRUSize() const;
     unsigned long freeGPUMemory();
     unsigned long totalGPUMemory();
 #if defined(Q_OS_SYMBIAN)
@@ -143,10 +141,10 @@
     RProperty iThemeProperty;
     QString iCurrentThemeName;
     QString iCurrentThemePath;
-    QStringList romThemeNames;
 
 private:
     void ConstructL();
+    void UpdateThemeIndexes(bool updateBase = true);
     HbIconDataCache * cache;
     HbCache* cssCache;
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbthemeserver/hbthemeserverapplication.cpp
--- a/src/hbservers/hbthemeserver/hbthemeserverapplication.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserverapplication.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -94,6 +94,8 @@
         _LIT(KHbThemeServer, "HbThemeServer");
         CApaWindowGroupName *wgName = CApaWindowGroupName::NewLC(env->WsSession());
         env->RootWin().SetOrdinalPosition(0, ECoeWinPriorityNeverAtFront); // avoid coming to foreground
+        env->WsSession().ComputeMode(RWsSession::EPriorityControlDisabled);
+        setPriority();
         wgName->SetHidden(ETrue); // hides us from FSW and protects us from OOM FW etc.
         wgName->SetSystem(ETrue); // Allow only application with PowerManagement cap to shut us down    
         wgName->SetCaptionL(KHbThemeServer);
@@ -204,20 +206,18 @@
     }
 }
 
-bool HbThemeServerApplication::acquireLock() {
+bool HbThemeServerLocker::lock()
+{
 #ifdef Q_OS_SYMBIAN
-    // Guard against starting multiple copies of the server
-    Lock lock;
     Lock::State lockState;
-    for(;;) {
-        lockState = lock.acquire();
-        if (lockState == Lock::Acquired) {
-            break;
-        } else if (lockState == Lock::Reserved) {
+    
+    Q_FOREVER {
+        lockState = mLock.acquire();
+        if (lockState == Lock::Reserved) {
             // Process may be starting, wait for server object to be created
-            if (Lock::serverExists()) {
+            if (serverExists()) {
 #ifdef THEME_SERVER_TRACES
-        qDebug() << "HbThemeServer::main: serverExists!!!";
+                qDebug() << "HbThemeServerLocker::lock: serverExists";
 #endif
                 break;
             } else {
@@ -250,6 +250,8 @@
 }
 
 #ifdef Q_OS_SYMBIAN
+_LIT(KLockFileName, "lockFile");
+
 Lock::Lock()
 {
     // Using a file for interprocess lock
@@ -257,11 +259,9 @@
     if (mFs.Connect(NumMessageSlots) == KErrNone) {
         mFs.CreatePrivatePath(EDriveC);
         if (mFs.SetSessionToPrivate(EDriveC) == KErrNone) {
-            _LIT(KFileName, "lockFile");
-            const TUint mode = EFileShareReadersOrWriters;
-            if (mFile.Create(mFs, KFileName, mode) == KErrAlreadyExists) {
-                mFile.Open(mFs, KFileName, mode);
-            }
+            RFile file;
+            file.Create(mFs, KLockFileName, EFileShareReadersOrWriters);
+            file.Close();
         }
     }
 }
@@ -270,20 +270,17 @@
 Lock::State Lock::acquire()
 {
     State state = Error;
-    // If process holding the lock crashes, file server releases the lock
-    if (mFile.SubSessionHandle()) {
-        TInt error = mFile.Lock(0, 1);
-        if (error == KErrNone) {
-            state = Acquired;
-        } else if (error == KErrLocked) {
-            state = Reserved;
-        }
+    TInt status = mFile.Open(mFs, KLockFileName, EFileShareExclusive);
+    if (status == KErrNone) {
+        state = Acquired;
+    } else if (status == KErrInUse) {
+        state = Reserved;
     }
     return state;
 }
 
 // Check if Symbian server exists
-bool Lock::serverExists()
+bool HbThemeServerLocker::serverExists()
 {
     TFindServer findHbServer(KThemeServerName);
     TFullName name;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbthemeserver/hbthemeserverapplication_p.h
--- a/src/hbservers/hbthemeserver/hbthemeserverapplication_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserverapplication_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -47,8 +47,6 @@
 
     bool initialize();
     int exec();
-    
-    static bool acquireLock();
     static void setPriority();
 
 public slots:
@@ -74,14 +72,15 @@
         Error
     };
     Lock();
-    ~Lock(){close();}
+    ~Lock(){
+        close();
+    }
     void close()
     {
         mFile.Close();
         mFs.Close();
     }
     State acquire();
-    static bool serverExists();
 
 private:
     RFs mFs;
@@ -89,4 +88,18 @@
 };
 #endif
 
+// Guard against starting multiple copies of the server
+class HbThemeServerLocker
+{
+public:
+    HbThemeServerLocker() {}
+    bool lock();
+private:
+    static bool serverExists();
+private:
+#ifdef Q_OS_SYMBIAN
+    Lock mLock;
+#endif
+};
+
 #endif // HBTHEMESERVERAPPLICATION_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbthemeserver/hbthemewatcher_symbian.cpp
--- a/src/hbservers/hbthemeserver/hbthemewatcher_symbian.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemewatcher_symbian.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -90,7 +90,7 @@
     }
 
     // theme doesn't exist, change active theme to default
-    iObserver.HandleThemeSelection(HbThemeUtils::defaultTheme().name);
+    iObserver.HandleThemeSelection(HbThemeUtils::getThemeSetting(HbThemeUtils::DefaultThemeSetting));
 }
  
 void CHbThemeWatcher::DoCancel()
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbservers/hbthemeserver/main.cpp
--- a/src/hbservers/hbthemeserver/main.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbservers/hbthemeserver/main.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -55,7 +55,8 @@
     // We need to be up and running fast
     HbThemeServerApplication::setPriority();
 
-    if(!HbThemeServerApplication::acquireLock()) {
+    HbThemeServerLocker locker;
+    if(!locker.lock()) {
         return 0;
     }
     
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbtools/docml2bin/docml2bin.pro
--- a/src/hbtools/docml2bin/docml2bin.pro	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbtools/docml2bin/docml2bin.pro	Tue Jul 06 14:36:53 2010 +0300
@@ -30,10 +30,12 @@
 DEPENDPATH += $${HB_SOURCE_DIR}/src/hbutils/document
 DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/core
 DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/utils
+DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/layouts
 #INCLUDEPATH += .
 INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbutils/document
 INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/core
 INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/utils
+INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/layouts
 DEFINES += HB_BOOTSTRAPPED
 CONFIG += console
 CONFIG -= app_bundle
@@ -42,6 +44,8 @@
 DESTDIR = $${HB_BUILD_DIR}/bin
 
 # dependencies
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/layouts/hbanchor.h
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/layouts/hbanchor.cpp
 HEADERS += $${HB_SOURCE_DIR}/src/hbcore/utils/hbfontspec.h
 SOURCES += $${HB_SOURCE_DIR}/src/hbcore/utils/hbfontspec.cpp
 SOURCES += $${HB_SOURCE_DIR}/src/hbcore/utils/hbxmlloaderabstractsyntax_p.cpp
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbtools/docml2bin/main.cpp
--- a/src/hbtools/docml2bin/main.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbtools/docml2bin/main.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -30,9 +30,6 @@
 #include <assert.h>
 #include <iostream>
 
-#include <QDebug>
-
-
 void showHelp() {
     std::cout << "docml2bin.exe usage:\n\n";
 
@@ -54,15 +51,11 @@
 
 int main(int argc, char *argv[])
 {
-
-    qDebug() << "docml2bin, 1";
-
     QCoreApplication app(argc, argv);
 
     if (argc <= 2) {
         showHelp();
     } else {
-        qDebug() << "docml2bin, 2";
         //bool backup = false;
         QString source, target;
         //QStringList restore;
@@ -87,7 +80,6 @@
             */
             }
         }
-        qDebug() << "docml2bin, 3";
         /*
         if (restore.count()) {
             for (int i = 0; i < restore.count(); i++) {
@@ -115,24 +107,19 @@
                 source = orig;
             }
             */
-            qDebug() << "docml2bin, 4";
             if (!QFile::exists(source)) {
                 std::cout << "Error: file " << source.toStdString() << " does not exist.\n";
             } else {
-                qDebug() << "docml2bin, 5";
                 // Open file and parse lines. Each line should have three value separated with:
                 QFile sourceFile(source);
                 if (sourceFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
-                    qDebug() << "docml2bin, 6";
                     if (!target.length()) {
                         target = source + ".bin";
                     }
                     QFile targetFile(target);
                     if (targetFile.open(QIODevice::WriteOnly)) {
-                        qDebug() << "docml2bin, 7";
                         HbDocumentLoader loader;
                         loader.createBinary( &sourceFile, &targetFile );
-                        qDebug() << "docml2bin, 8";
                         targetFile.close();
                     }
                     sourceFile.close();
@@ -140,8 +127,6 @@
             }
         }
     }
-    qDebug() << "docml2bin, 9";
-
     return 0;
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbtools/hbbincssmaker/hbbincssmaker.pro
--- a/src/hbtools/hbbincssmaker/hbbincssmaker.pro	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbtools/hbbincssmaker/hbbincssmaker.pro	Tue Jul 06 14:36:53 2010 +0300
@@ -55,6 +55,7 @@
 QT += network
 
 CONFIG += console
+CONFIG -= app_bundle
 
 # directories
 DESTDIR = $${HB_BUILD_DIR}/bin
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbtools/hbbincssmaker/hbcssconverterutils.cpp
--- a/src/hbtools/hbbincssmaker/hbcssconverterutils.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbtools/hbbincssmaker/hbcssconverterutils.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -24,10 +24,14 @@
 ****************************************************************************/
 
 #include <QMap>
+#include <QHash>
+#include "hbstring_p.h"
 #include "hbcssconverterutils_p.h"
 #include "hbsharedmemorymanager_p.h"
 #include "hbsharedmemoryallocators_p.h"
 
+static QHash<QString, HbString> strMap;
+
 // Global list that stores pointers to the member variables where shared container instances
 // store offsets returned my memory allocator.
 // CSS converter utilizes it to automatically adjust the offsets if allocated cells are moved.
@@ -139,6 +143,7 @@
 {
     GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
     HbSharedMemoryManager *shared = static_cast<HbSharedMemoryManager*>(manager);
+    strMap.clear();
 
     // Register shared cache pointer in chunk header
     //as shared cache may also be moved in defragmentation
@@ -207,3 +212,21 @@
     // Return the next free address in the chunk
     return cssBinaryOffset + newCurrentOffset;
 }
+
+void HbCssConverterUtils::addSharedStringData(const QString &str, const HbString &hbstr)
+{
+    if (!strMap.contains(str)) {
+        strMap.insert(str, hbstr);
+    }
+}
+
+HbString* HbCssConverterUtils::sharedStringData(const QString &str)
+{
+    HbString *ret = 0;
+    QHash<QString, HbString>::iterator i = strMap.find(str);
+    if (i != strMap.end()) {
+        ret = &i.value();
+    }
+    return ret;
+}
+
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbtools/hbbincssmaker/hbcssconverterutils_p.h
--- a/src/hbtools/hbbincssmaker/hbcssconverterutils_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbtools/hbbincssmaker/hbcssconverterutils_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -28,6 +28,7 @@
 
 #include <QList>
 #include <QMultiHash>
+#include <hbstring_p.h>
 
 class HbCssConverterUtils
 {
@@ -44,6 +45,10 @@
     static void cellMoved(int offset, int newOffset);
     static int defragmentChunk();
 
+    //shared string management
+    static void addSharedStringData(const QString &str, const HbString &hbstr);
+    static HbString* sharedStringData(const QString &str);
+
 private:
 
     HbCssConverterUtils();
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbtools/hbbincssmaker/main.cpp
--- a/src/hbtools/hbbincssmaker/main.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbtools/hbbincssmaker/main.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -135,13 +135,13 @@
 
 void testLayoutDef(const HbWidgetLoader::LayoutDefinition *layoutDef)
 {
-    VERBOSELN("mesh items count: " << layoutDef->meshItems.count());
-    for (int i = 0; i < layoutDef->meshItems.count(); ++i) {
-        const HbWidgetLoader::MeshItem &meshItem = layoutDef->meshItems.at(i);
-        VERBOSELN("src: " << meshItem.src);
-        VERBOSELN("dst: " << meshItem.dst);
-        VERBOSELN("spacing text: " << meshItem.spacingText);
-        VERBOSELN("spacer: " << meshItem.spacer);
+    VERBOSELN("anchor items count: " << layoutDef->anchorItems.count());
+    for (int i = 0; i < layoutDef->anchorItems.count(); ++i) {
+        const HbWidgetLoader::AnchorItem &anchorItem = layoutDef->anchorItems.at(i);
+        VERBOSELN("srcId: " << anchorItem.srcId);
+        VERBOSELN("dstId: " << anchorItem.dstId);
+        VERBOSELN("prefLength text: " << anchorItem.prefText);
+        VERBOSELN("anchorId: " << anchorItem.anchorId);
     }
 }
 
@@ -443,6 +443,7 @@
     // Create shared cache to shared memory.
     QByteArray data(offsetMap.result());
     bool success = false;
+
     if (shared->createSharedCache(data.data(), data.size(), offsetMap.size())) {
         // Defragment the chunk contents before dumping it in a file
         int endOffset = HbCssConverterUtils::defragmentChunk();
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbutils/document/hbdocumentloader.cpp
--- a/src/hbutils/document/hbdocumentloader.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbutils/document/hbdocumentloader.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -109,7 +109,7 @@
 {
     QFile file( fileName );
     
-    if( !file.open( QFile::ReadOnly | QFile::Text ) ) {
+    if( !file.open( QFile::ReadOnly ) ) {
         qWarning( "Unable to open file" );
         if( ok ) {
             *ok = false;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbutils/document/hbdocumentloader_p.cpp
--- a/src/hbutils/document/hbdocumentloader_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbutils/document/hbdocumentloader_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -31,8 +31,6 @@
 #include <hbxmlloaderbinaryactions_p.h>
 #include <hbxmlloaderbinarysyntax_p.h>
 
-#include <QDebug>
-
 #ifndef HB_BOOTSTRAPPED
 
 #include <QGraphicsWidget>
@@ -112,7 +110,6 @@
 
 bool HbDocumentLoaderPrivate::createBinary( QIODevice *srcDevice, QIODevice *dstDevice )
 {
-    qDebug() << "createBinary, 1";
     bool result = true;
     syntax->setActions( binaryactions );
 #ifdef DEBUG_TIMES
@@ -124,32 +121,23 @@
     QList<QString> sectionsList;
     QHash< QString, qint64 > sectionsPositionList;
     qint64 startPos = srcDevice->pos();
-    qDebug() << "createBinary, 2";
     if( syntax->scanForSections( srcDevice, sectionsList ) ) {
-        qDebug() << "createBinary, 3";
         srcDevice->seek( startPos );
-        qDebug() << "createBinary, 4";
         result = syntax->load( srcDevice, "" );
         if( !sectionsList.isEmpty() ) {
             for( int i = 0; i < sectionsList.size(); i++ ) {
                 sectionsPositionList[ sectionsList.at( i ) ] = dstDevice->pos();
                 srcDevice->seek( startPos );
-                qDebug() << "createBinary, 5, " << i;
                 result &= syntax->load( srcDevice, sectionsList.at( i ) );
-                qDebug() << "createBinary, 6, " << i;
             }
         }
     } else {
         result = false;
     }
-    qDebug() << "createBinary, 7";
     qint64 sectionsMetaDataPos = dstDevice->pos();
     QDataStream stream( dstDevice );
     stream << sectionsPositionList;
     stream << sectionsMetaDataPos;
-
-    qDebug() << "createBinary, 8";
-
 #ifdef DEBUG_TIMES
     debugPrintX("MYTRACE: DocML create binary, end: %d", debugTime.elapsed());
 #endif
@@ -165,7 +153,10 @@
 #else
     bool result(true);
 
+    const bool originalTextMode = device->isTextModeEnabled();
+
     if (binarysyntax->isBinary(device)) {
+        device->setTextModeEnabled( false );    
         binarysyntax->setActions(actions);
 #ifdef DEBUG_TIMES
         debugTime.restart();
@@ -176,6 +167,7 @@
         debugPrintX("MYTRACE: DocML load binary, end: %d", debugTime.elapsed());
 #endif
     } else {
+        device->setTextModeEnabled( true );    
         syntax->setActions(actions);
 #ifdef DEBUG_TIMES
         debugTime.restart();
@@ -186,6 +178,7 @@
         debugPrintX("MYTRACE: DocML load plain text, end: %d", debugTime.elapsed());
 #endif
     }
+    device->setTextModeEnabled( originalTextMode );    
     return result;
 #endif
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbutils/document/hbdocumentloaderactions_p.cpp
--- a/src/hbutils/document/hbdocumentloaderactions_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbutils/document/hbdocumentloaderactions_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -172,54 +172,6 @@
     return true;
 }
 
-bool HbDocumentLoaderActions::pushSpacerItem( const QString &name, const QString &widget )
-{
-    if ( name.isEmpty() ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "SpacerItem needs to have a name" ) );
-        return false;
-    }
-
-    // find the widget which owns the spacer i.e. the parent
-    HbWidget *parent = 0;
-
-    if( widget.isEmpty() ) {
-        bool isWidget = false;
-        parent = qobject_cast<HbWidget *>( findFromStack( &isWidget ) );
-        if( !isWidget ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "SPACERITEM: CANNOT SET SPACERITEM TO NON-HBWIDGET " ) );
-            return false;
-        }
-    } else if( !( mObjectMap.contains( widget ) ) ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "SPACERITEM: NO SUCH ITEM " ) + widget );
-        return false;
-    } else {
-        ObjectMapItem &item = mObjectMap[ widget ];
-        if (item.mType == HbXml::WIDGET) {
-            parent = qobject_cast<HbWidget *>( item.mObject.data() );
-        }
-        if( !parent ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "SPACERITEM: CANNOT SET SPACERITEM TO NON-HBWIDGET " ) );
-            return false;
-        }
-    }
-
-    // look-up spacer item from widget
-    QGraphicsLayoutItem *current = parent->layoutPrimitive( name );
-    if ( !current ) {
-        current =  static_cast<HbWidgetPrivate*>(HbWidgetBasePrivate::d_ptr(parent))->createSpacerItem(name);
-    }
-
-    // add it onto stack for further processing
-    HbXml::Element e;
-    e.type = HbXml::SPACERITEM;
-    e.data = current;
-    mStack.append( e );
-    HB_DOCUMENTLOADER_PRINT( QString( "ADD ELEMENT " ) + name );
-
-    return true;
-
-}
-
 bool HbDocumentLoaderActions::pushConnect( const QString &srcName, const QString &signalName,
                                             const QString &dstName, const QString &slotName )
 {
@@ -378,17 +330,14 @@
 
 bool HbDocumentLoaderActions::setSizeHint(Qt::SizeHint hint, const HbXmlLengthValue &hintWidth, const HbXmlLengthValue &hintHeight, bool fixed)
 {
-    QGraphicsLayoutItem *current = findSpacerItemFromStackTop();
-    if (!current) {
-        bool isWidget = false;
-        QObject* obj = findFromStack(&isWidget);
-        if( !obj || !isWidget ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "Cannot set sizehint for non-QGraphicsWidget" ) );
-            return false;
-        }
-        QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(obj);
-        current = widget;
+    bool isWidget = false;
+    QObject* obj = findFromStack(&isWidget);
+    if( !obj || !isWidget ) {
+        HB_DOCUMENTLOADER_PRINT( QString( "Cannot set sizehint for non-QGraphicsWidget" ) );
+        return false;
     }
+    QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(obj);
+
     qreal hintWidthVal, hintHeightVal;
 
     bool ok = true;
@@ -407,28 +356,28 @@
     case Qt::MinimumSize:
         if ( hintWidth.mType != HbXmlLengthValue::None ) {
 
-            current->setMinimumWidth(hintWidthVal);
+            widget->setMinimumWidth(hintWidthVal);
         }
         if ( hintHeight.mType != HbXmlLengthValue::None ) {
-            current->setMinimumHeight(hintHeightVal);
+            widget->setMinimumHeight(hintHeightVal);
         }
         break;
 
     case Qt::PreferredSize:
         if ( hintWidth.mType != HbXmlLengthValue::None ) {
-            current->setPreferredWidth(hintWidthVal);
+            widget->setPreferredWidth(hintWidthVal);
         }
         if ( hintHeight.mType != HbXmlLengthValue::None ) {
-            current->setPreferredHeight(hintHeightVal);
+            widget->setPreferredHeight(hintHeightVal);
         }
         break;
 
     case Qt::MaximumSize:
         if ( hintWidth.mType != HbXmlLengthValue::None ) {
-            current->setMaximumWidth(hintWidthVal);
+            widget->setMaximumWidth(hintWidthVal);
         }
         if ( hintHeight.mType != HbXmlLengthValue::None ) {
-            current->setMaximumHeight(hintHeightVal);
+            widget->setMaximumHeight(hintHeightVal);
         }
         break;
 
@@ -437,14 +386,14 @@
     }
 
     if (fixed) {
-        QSizePolicy policy = current->sizePolicy();
+        QSizePolicy policy = widget->sizePolicy();
         if ( hintWidth.mType != HbXmlLengthValue::None && hintWidthVal >= 0) {
             policy.setHorizontalPolicy(QSizePolicy::Fixed);
         }
         if ( hintHeight.mType != HbXmlLengthValue::None && hintHeightVal >= 0) {
             policy.setVerticalPolicy(QSizePolicy::Fixed);
         }
-        current->setSizePolicy(policy);
+        widget->setSizePolicy(policy);
     }
 
     return true;
@@ -474,20 +423,16 @@
     int *horizontalStretch,
     int *verticalStretch )
 {
-    QGraphicsLayoutItem *current = findSpacerItemFromStackTop();
-    if (!current) {
-        bool isWidget = false;
-        QObject* obj = findFromStack(&isWidget);
-        if( !obj || !isWidget ) {
-            HB_DOCUMENTLOADER_PRINT( QString( "Cannot set size policy for non-QGraphicsWidget" ) );
-            return false;
-        }
-        QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(obj);
-        current = widget;
+    bool isWidget = false;
+    QObject* obj = findFromStack(&isWidget);
+    if( !obj || !isWidget ) {
+        HB_DOCUMENTLOADER_PRINT( QString( "Cannot set size policy for non-QGraphicsWidget" ) );
+        return false;
     }
+    QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(obj);
 
     bool changed = false;
-    QSizePolicy sizePolicy = current->sizePolicy();
+    QSizePolicy sizePolicy = widget->sizePolicy();
 
     if ( horizontalPolicy && (*horizontalPolicy != sizePolicy.horizontalPolicy() ) ) {
         sizePolicy.setHorizontalPolicy( *horizontalPolicy );
@@ -509,14 +454,14 @@
     }
 
     if ( changed ) {
-        current->setSizePolicy( sizePolicy );
+        widget->setSizePolicy( sizePolicy );
     }
 
     return true;
 }
 
 
-bool HbDocumentLoaderActions::createAnchorLayout( const QString &widget )
+bool HbDocumentLoaderActions::createAnchorLayout( const QString &widget, bool modify )
 {
     QGraphicsWidget *parent = 0;
 
@@ -534,99 +479,150 @@
         return false;
     }
 
-    mCurrentLayout = new HbAnchorLayout();
-
-    parent->setLayout( mCurrentLayout );
+    if ( modify ) {
+        mCurrentLayout = parent->layout();
+        if ( !mCurrentLayout ) {
+            HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: NO EXISTING LAYOUT" ) );
+            return false;
+        }
+    } else {
+        mCurrentLayout = new HbAnchorLayout();
+        parent->setLayout( mCurrentLayout );
+    }
 
     return true;
 }
 
-QGraphicsLayoutItem *findLayoutItem( const QGraphicsLayout &layout, const QString &layoutItemName )
-{
-    QGraphicsLayoutItem *result = 0;
-    if ( layout.parentLayoutItem() ) {
-        QGraphicsItem *asGraphicsItem = layout.parentLayoutItem()->graphicsItem();
-        if ( asGraphicsItem && asGraphicsItem->isWidget() ){
-            HbWidget *asWidget = qobject_cast<HbWidget*>( static_cast<QGraphicsWidget*>(asGraphicsItem) );
-            if( asWidget ) {
-                result = asWidget->layoutPrimitive( layoutItemName );
-            }
-        }
-    }
-    return result;
-}
-
-bool HbDocumentLoaderActions::addAnchorLayoutEdge( const QString &src, Hb::Edge srcEdge,
-                                                   const QString &dst, Hb::Edge dstEdge,
-                                                   const HbXmlLengthValue &spacing, const QString &spacer )
+bool HbDocumentLoaderActions::addAnchorLayoutItem( const QString &src, const QString &srcId, Hb::Edge srcEdge, 
+                                                   const QString &dst, const QString &dstId, Hb::Edge dstEdge,
+                                                   const HbXmlLengthValue &minLength,
+                                                   const HbXmlLengthValue &prefLength,
+                                                   const HbXmlLengthValue &maxLength,
+                                                   QSizePolicy::Policy *policy, HbAnchor::Direction *dir,
+                                                   const QString &anchorId )
 {
-    if ( !spacer.isEmpty() ) {
-        // spacer is added
-        // divide original anchor definition into two. src->dst becomes src->spacer->dst
-        bool ok = true;
-        if ( src.isEmpty() ) {
-            // if the starting item is layout
-            // "layout --(spacing)--> item"
-            // becomes
-            // "layout --(spacing)--> spacer --(0)--> item"
-            ok &= addAnchorLayoutEdge( src, srcEdge, spacer, srcEdge, spacing );
-            HbXmlLengthValue val(0, HbXmlLengthValue::Pixel);
-            ok &= addAnchorLayoutEdge( spacer, getAnchorOppositeEdge(srcEdge), dst, dstEdge, val );
-        } else {
-            // if the starting item is not layout
-            // "item1 --(spacing)--> item2"
-            // becomes
-            // "item1 --(spacing)--> spacer --(0)--> item2"
-            ok &= addAnchorLayoutEdge( src, srcEdge, spacer, getAnchorOppositeEdge(srcEdge), spacing );
-            HbXmlLengthValue val(0, HbXmlLengthValue::Pixel);
-            ok &= addAnchorLayoutEdge( spacer, srcEdge, dst, dstEdge, val );
-        }
-        return ok;
-    }
-
     QGraphicsLayoutItem *item1 = 0;
     QGraphicsLayoutItem *item2 = 0;
 
     HbAnchorLayout *layout = static_cast<HbAnchorLayout *>( mCurrentLayout );
 
-    if ( src.isEmpty() ) {
-        item1 = layout;
-    } else if ( !( mObjectMap.contains( src ) ) ) {
-        item1 = findLayoutItem( *layout, src );
-    } else {
-        if (mObjectMap[ src ].mType == HbXml::WIDGET) {
+    if ( !src.isNull() ) {
+        if ( src.isEmpty() ) {
+            item1 = layout;
+        } else if ( mObjectMap.contains( src ) && mObjectMap[ src ].mType == HbXml::WIDGET ) {
             item1 = static_cast<QGraphicsWidget *>( mObjectMap[ src ].mObject.data() );
         }
+        if ( !item1 ) {
+            HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: NO SUCH ITEM " ) + src );
+            return false;
+        }
     }
-    if ( !item1 ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: NO SUCH ITEM " ) + src );
-        return false;
+
+    if ( !dst.isNull() ) {
+        if ( dst.isEmpty() ) {
+            item2 = layout;
+        } else if ( mObjectMap.contains( dst ) && mObjectMap[ dst ].mType == HbXml::WIDGET ) {
+            item2 = static_cast<QGraphicsWidget *>( mObjectMap[ dst ].mObject.data() );
+        }
+        if ( !item2 ) {
+            HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: NO SUCH ITEM " ) + dst );
+            return false;
+        }
+    }
+
+    HbAnchor* anchor = 0;
+    if ( item1 && item2 ) {
+        anchor = new HbAnchor( item1, srcEdge, item2, dstEdge );
+    } else if ( item1 ) {
+        anchor = new HbAnchor( item1, srcEdge, dstId, dstEdge );
+    } else if ( item2 ) {
+        anchor = new HbAnchor( srcId, srcEdge, item2, dstEdge );
+    } else {
+        anchor = new HbAnchor( srcId, srcEdge, dstId, dstEdge );
+    }
+
+    if ( minLength.mType != HbXmlLengthValue::None ) {
+        qreal minVal(0);
+        if ( !toPixels(minLength, minVal) ) {
+            delete anchor;
+            return false;
+        } else {
+            anchor->setMinimumLength( minVal );
+        }
+    }
+
+    if ( prefLength.mType != HbXmlLengthValue::None ) {
+        qreal prefVal(0);
+        if ( !toPixels(prefLength, prefVal) ) {
+            delete anchor;
+            return false;
+        } else {
+            anchor->setPreferredLength( prefVal );
+        }
     }
 
-    if ( dst.isEmpty() ) {
-        item2 = layout;
-    } else if( !( mObjectMap.contains( dst ) ) ) {
-        item2 = findLayoutItem( *layout, dst );
-    } else {
-        if (mObjectMap[ dst ].mType == HbXml::WIDGET) {
-            item2 = static_cast<QGraphicsWidget *>( mObjectMap[ dst ].mObject.data() );
+    if ( maxLength.mType != HbXmlLengthValue::None ) {
+        qreal maxVal(0);
+        if ( !toPixels(maxLength, maxVal) ) {
+            delete anchor;
+            return false;
+        } else {
+            anchor->setMaximumLength( maxVal );
         }
     }
-    if ( !item2 ) {
-        HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: NO SUCH ITEM " ) + dst );
-        return false;
+
+    if ( policy ) {
+        anchor->setSizePolicy( *policy );
+    }
+
+    if ( dir ) {
+        anchor->setDirection( *dir );
+    }
+
+    if ( !anchorId.isEmpty() ) {
+        anchor->setAnchorId( anchorId );
     }
 
-    qreal spacingVal(0);
-    if ( spacing.mType != HbXmlLengthValue::None && !toPixels(spacing, spacingVal) ) {
+    return layout->setAnchor( anchor );
+}
+
+
+bool HbDocumentLoaderActions::setAnchorLayoutMapping( const QString &item, const QString &id, bool remove )
+{
+    HbAnchorLayout *layout = static_cast<HbAnchorLayout *>( mCurrentLayout );
+    QGraphicsWidget *widget = 0;
+    if ( item.isEmpty() && id.isEmpty() ) {
+        HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: NO ITEM NOR ID SPECIFIED" ) );
         return false;
     }
-    layout->setAnchor( item1, srcEdge, item2, dstEdge, spacingVal );
+    if ( !item.isEmpty() ) {
+        if ( mObjectMap.contains( item ) && mObjectMap[ item ].mType == HbXml::WIDGET ) {
+            widget = static_cast<QGraphicsWidget *>( mObjectMap[ item ].mObject.data() );
+        }
+        if ( !widget ) {
+            HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: NO SUCH ITEM " ) + item );
+            return false;
+        }
+    }
+    if ( remove ) {
+        if ( widget ) {
+            layout->removeMapping( widget );
+        }
+        if ( !id.isEmpty() ) {
+            layout->removeMapping( id );
+        }
+    } else {
+        if ( widget && !id.isEmpty() ) {
+            layout->setMapping( widget, id );
+        } else {
+            HB_DOCUMENTLOADER_PRINT( QString( "ANCHORLAYOUT: NO ID SPECIFIED FOR" ) + item );
+            return false;
+        }
+    }
     return true;
 }
 
-
-bool HbDocumentLoaderActions::createGridLayout( const QString &widget, const HbXmlLengthValue &spacing )
+bool HbDocumentLoaderActions::createGridLayout( const QString &widget, const HbXmlLengthValue &spacing, bool modify )
 {
     QGraphicsWidget *parent = 0;
 
@@ -644,20 +640,29 @@
         return false;
     }
 
-    QGraphicsGridLayout* layout = new QGraphicsGridLayout();
+    qreal spacingVal;
+    bool setSpacing(false);
+
     if (spacing.mType != HbXmlLengthValue::None) {
-        qreal spacingVal;
         if ( toPixels(spacing, spacingVal) ) {
-            layout->setSpacing(spacingVal);
+            setSpacing = true;
         } else {
-            delete layout;
             return false;
         }
     }
-
-    mCurrentLayout = layout;
-    parent->setLayout( mCurrentLayout );
-
+    if ( modify ) {
+        mCurrentLayout = parent->layout();
+        if ( !mCurrentLayout ) {
+            HB_DOCUMENTLOADER_PRINT( QString( "GRIDLAYOUT: NO EXISTING LAYOUT" ) );
+            return false;
+        }
+    } else {
+        mCurrentLayout = new QGraphicsGridLayout();
+        parent->setLayout( mCurrentLayout );
+    }
+    if ( setSpacing ) {
+        static_cast<QGraphicsGridLayout*>(mCurrentLayout)->setSpacing(spacingVal);
+    }
     return true;
 }
 
@@ -861,10 +866,10 @@
 bool HbDocumentLoaderActions::createLinearLayout(
     const QString &widget,
     Qt::Orientation *orientation,
-    const HbXmlLengthValue &spacing )
+    const HbXmlLengthValue &spacing,
+    bool modify )
 {
     QGraphicsWidget *parent = 0;
-    QGraphicsLinearLayout *layout = 0;
 
     if( widget.isEmpty() ) {
         bool isWidget = false;
@@ -880,22 +885,37 @@
         return false;
     }
 
-    if( orientation ) {
-        layout = new QGraphicsLinearLayout( *orientation );
-    } else {
-        layout = new QGraphicsLinearLayout();
+    qreal spacingVal;
+    bool setSpacing(false);
+
+    if (spacing.mType != HbXmlLengthValue::None) {
+        if ( toPixels(spacing, spacingVal) ) {
+            setSpacing = true;
+        } else {
+            return false;
+        }
     }
 
-    if ( spacing.mType != HbXmlLengthValue::None ) {
-        qreal spacingVal;
-        if ( !toPixels(spacing, spacingVal) ) {
+    if ( modify ) {
+        mCurrentLayout = parent->layout();
+        if ( !mCurrentLayout ) {
+            HB_DOCUMENTLOADER_PRINT( QString( "LINEARLAYOUT: NO EXISTING LAYOUT" ) );
             return false;
         }
-        layout->setSpacing(spacingVal);
+        if ( orientation ) {
+            static_cast<QGraphicsLinearLayout*>(mCurrentLayout)->setOrientation(*orientation);
+        }
+    } else {
+        if( orientation ) {
+            mCurrentLayout = new QGraphicsLinearLayout(*orientation);
+        } else {
+            mCurrentLayout = new QGraphicsLinearLayout();
+        }
+        parent->setLayout( mCurrentLayout );
     }
-
-    mCurrentLayout = layout;
-    parent->setLayout( mCurrentLayout );
+    if ( setSpacing ) {
+        static_cast<QGraphicsLinearLayout*>(mCurrentLayout)->setSpacing(spacingVal);
+    }
 
     return true;
 }
@@ -1005,7 +1025,7 @@
     return ok;
 }
 
-bool HbDocumentLoaderActions::createStackedLayout( const QString &widget )
+bool HbDocumentLoaderActions::createStackedLayout( const QString &widget, bool modify )
 {
     QGraphicsWidget *parent = 0;
 
@@ -1023,9 +1043,16 @@
         return false;
     }
 
-    mCurrentLayout = new HbStackedLayout();
-
-    parent->setLayout( mCurrentLayout );
+    if ( modify ) {
+        mCurrentLayout = parent->layout();
+        if ( !mCurrentLayout ) {
+            HB_DOCUMENTLOADER_PRINT( QString( "STACKEDLAYOUT: NO EXISTING LAYOUT" ) );
+            return false;
+        }
+    } else {
+        mCurrentLayout = new HbStackedLayout();
+        parent->setLayout( mCurrentLayout );
+    }
 
     return true;
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbutils/document/hbdocumentloaderactions_p.h
--- a/src/hbutils/document/hbdocumentloaderactions_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbutils/document/hbdocumentloaderactions_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -64,7 +64,6 @@
 
         bool pushObject( const QString& type, const QString &name );
         bool pushWidget( const QString& type, const QString &name, const QString &role, const QString &plugin );
-        bool pushSpacerItem( const QString &name, const QString &widget );
         bool pushConnect( const QString &srcName, const QString &signalName, const QString &dstName, const QString &slotName );
         bool pushProperty( const char *propertyName, const HbXmlVariable &variable );
         bool pushRef( const QString &name, const QString &role );
@@ -85,12 +84,17 @@
         bool setSizeHint(Qt::SizeHint hint, const HbXmlLengthValue &hintWidth, const HbXmlLengthValue &hintHeight, bool fixed);
         bool setToolTip( const HbXmlVariable &tooltip );
 
-        bool createAnchorLayout( const QString &widget );
-        bool addAnchorLayoutEdge( const QString &src, Hb::Edge srcEdge, 
-                                  const QString &dst, Hb::Edge dstEdge,
-                                  const HbXmlLengthValue &spacing, const QString &spacer = QString() );
+        bool createAnchorLayout( const QString &widget, bool modify );
+        bool addAnchorLayoutItem( const QString &src, const QString &srcId, Hb::Edge srcEdge, 
+                                  const QString &dst, const QString &dstId, Hb::Edge dstEdge,
+                                  const HbXmlLengthValue &minLength,
+                                  const HbXmlLengthValue &prefLength,
+                                  const HbXmlLengthValue &maxLength,
+                                  QSizePolicy::Policy *policy, HbAnchor::Direction *dir,
+                                  const QString &anchorId );
+        bool setAnchorLayoutMapping( const QString &item, const QString &id, bool remove );
         
-        bool createGridLayout( const QString &widget, const HbXmlLengthValue &spacing );
+        bool createGridLayout( const QString &widget, const HbXmlLengthValue &spacing, bool modify );
         bool addGridLayoutCell( const QString &src, int row, int column,
                                 int *rowspan, int *columnspan, Qt::Alignment *alignment );
         bool setGridLayoutRowProperties( int row, int *rowStretchFactor, Qt::Alignment *alignment );
@@ -110,7 +114,8 @@
 
         bool createLinearLayout( const QString &widget,
                                  Qt::Orientation *orientation, 
-                                 const HbXmlLengthValue &spacing );
+                                 const HbXmlLengthValue &spacing,
+                                 bool modify );
         bool addLinearLayoutItem( const QString &itemname,
                                   int *index,
                                   int *stretchfactor, 
@@ -123,7 +128,7 @@
                                        const HbXmlLengthValue &right,
                                        const HbXmlLengthValue &bottom );
 
-        bool createStackedLayout( const QString &widget );
+        bool createStackedLayout( const QString &widget, bool modify );
         bool addStackedLayoutItem( const QString &itemname, int *index );
                                 
         bool createNullLayout( const QString &widget );
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbutils/document/hbdocumentloadersyntax_p.cpp
--- a/src/hbutils/document/hbdocumentloadersyntax_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbutils/document/hbdocumentloadersyntax_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -39,7 +39,7 @@
 
 // Document loader version number
 #define VERSION_MAJOR 1
-#define VERSION_MINOR 1
+#define VERSION_MINOR 2
 
 #define MIN_SUPPORTED_VERSION_MAJOR 0
 #define MIN_SUPPORTED_VERSION_MINOR 1
@@ -89,6 +89,18 @@
             }
     };
 
+static bool toFontSpecRole(const QString &roleString, HbFontSpec::Role &role)
+{
+    bool success(false);
+    int enumInt = HbFontSpec::staticMetaObject.enumerator(
+            HbFontSpec::staticMetaObject.indexOfEnumerator("Role")).keyToValue(roleString.toLatin1());
+    if (enumInt >= 0) {
+        success = true;
+        role = static_cast<HbFontSpec::Role>(enumInt);
+    }
+    return success;
+}
+
 /*
     \class HbDocumentLoaderSyntax
     \internal
@@ -138,24 +150,22 @@
         {
             HB_DOCUMENTLOADER_PRINT( "GENERAL LAYOUT START ITEM: ANCHOR ITEM" );
             if( mReader.name() == lexemValue( AL_ANCHOR ) ) {
+                result = readAnchorLayoutStartItem(false);
+            } else if( mReader.name() == lexemValue( AL_MAPPING ) ) {
+                const QString item = attribute( AL_MAPPING_ITEM );
+                const QString id = attribute( AL_MAPPING_ID );
+                const QString action = attribute( ATTR_ACTION );
+                bool remove = false;
+                if ( !action.isEmpty() ) {
+                    if (!action.compare("remove", Qt::CaseInsensitive)) {
+                        remove = true;
+                    } else if (action.compare("set", Qt::CaseInsensitive)) {
+                        qWarning() << "Invalid anchoritem action, line " << mReader.lineNumber();
+                        return false;
+                    }
+                }
 
-                const QString src = attribute( AL_SRC_NAME );
-                const QString dst = attribute( AL_DST_NAME );
-                const QString srcEdgeStr = attribute( AL_SRC_EDGE );
-                const QString dstEdgeStr = attribute( AL_DST_EDGE );
-                const QString spacing = attribute( AL_SPACING );
-                const QString spacer = attribute( AL_SPACER );
-                HbXmlLengthValue spacingVal;
-                result = true;
-                if( !spacing.isEmpty() ) {
-                    result = toLengthValue( spacing, spacingVal );
-                }
-                Hb::Edge srcEdge, dstEdge;
-                result &= getAnchorEdge( srcEdgeStr, srcEdge );
-                result &= getAnchorEdge( dstEdgeStr, dstEdge );
-                if ( result ) {
-                    result = mActions->addAnchorLayoutEdge( src, srcEdge, dst, dstEdge, spacingVal, spacer );
-                }
+                result = mActions->setAnchorLayoutMapping( item, id, remove );
             }
             break;
         }
@@ -653,7 +663,8 @@
          case HbXml::SPACERITEM:
          {
             HB_DOCUMENTLOADER_PRINT( "GENERAL START ITEM: SPACERITEM" );
-            result = processSpacerItem();
+            qWarning() << "spaceritem is deprecated " << mReader.lineNumber();
+            result = true;
             break;
          }
          case HbXml::CONNECT:
@@ -762,29 +773,26 @@
     return true;
 }
 
-bool HbDocumentLoaderSyntax::processSpacerItem()
-{
-    const QString name = attribute( ATTR_NAME );
-    const QString widget = attribute( ATTR_WIDGET );
-
-    bool pushOK = mActions->pushSpacerItem( name, widget );
-    if( !pushOK ) {
-        qWarning() << "Error in object processing, line " << mReader.lineNumber();
-        return false;
-    }
-    return true;
-}
-
 bool HbDocumentLoaderSyntax::processLayout()
 {
     bool result = false;
     const QString layout_type = attribute( ATTR_TYPE );
     const QString widget = attribute( ATTR_WIDGET );
+    const QString action = attribute( ATTR_ACTION );
+    bool modify = false;
+    if ( !action.isEmpty() ) {
+        if (!action.compare("modify", Qt::CaseInsensitive)) {
+            modify = true;
+        } else if (action.compare("create", Qt::CaseInsensitive)) {
+            qWarning() << "Invalid layout action, line " << mReader.lineNumber();
+            return false;
+        }
+    }
 
     if( layout_type == lexemValue( LAYOUT_ANCHOR ) ) {
 
         mCurrentLayoutType = LAYOUT_ANCHOR;
-        result = mActions->createAnchorLayout( widget );
+        result = mActions->createAnchorLayout( widget, modify );
 
     } else if( layout_type == lexemValue( LAYOUT_GRID ) ) {
 
@@ -796,7 +804,7 @@
             result = toLengthValue( spacing, spacingValue );
         }
         if (result) {
-            result = mActions->createGridLayout( widget, spacingValue );
+            result = mActions->createGridLayout( widget, spacingValue, modify );
         }
 
     } else if( layout_type == lexemValue( LAYOUT_LINEAR ) ) {
@@ -826,13 +834,13 @@
             result = toLengthValue( spacing, spacingValue );
         }
         if (result) {
-            result = mActions->createLinearLayout( widget, orient_p, spacingValue );
+            result = mActions->createLinearLayout( widget, orient_p, spacingValue, modify );
         }
 
     } else if( layout_type == lexemValue( LAYOUT_STACK ) ) {
 
         mCurrentLayoutType = LAYOUT_STACK;
-        result = mActions->createStackedLayout( widget );
+        result = mActions->createStackedLayout( widget, modify );
 
     } else if( layout_type == lexemValue( LAYOUT_NULL ) ) {
 
@@ -944,27 +952,6 @@
     return true;
 }
 
-static bool convertSizePolicy_Policy( const QString& policyS, QSizePolicy::Policy *&policy )
-{
-    if ( policyS.isEmpty() ) {
-        return false;
-    }
-
-    const QMetaObject *meta = &QSizePolicy::staticMetaObject;
-    const int enumIndex = meta->indexOfEnumerator("Policy");
-    Q_ASSERT( enumIndex != -1 );
-    QMetaEnum metaEnum = meta->enumerator(enumIndex);
-    const QByteArray byteArray = policyS.toUtf8();
-    const int policyI = metaEnum.keyToValue(byteArray.data());
-
-    if ( policyI == -1 ) {
-        return false;
-    }
-
-    policy = (QSizePolicy::Policy *)new int(policyI);
-    return true;
-}
-
 bool HbDocumentLoaderSyntax::processVariable()
 {
     bool result = false;
@@ -1008,34 +995,42 @@
 
         result = true;
 
-        QSizePolicy::Policy *hPol = 0;
+        QSizePolicy::Policy hPol;
+        QSizePolicy::Policy *hPolP = 0;
         if ( !horizontalPolicyS.isEmpty() ) {
-            result = convertSizePolicy_Policy( horizontalPolicyS, hPol );
+            result = toSizePolicy( horizontalPolicyS, hPol );
+            hPolP = &hPol;
         }
 
-        QSizePolicy::Policy *vPol = 0;
+        QSizePolicy::Policy vPol;
+        QSizePolicy::Policy *vPolP = 0;
         if ( result && !verticalPolicyS.isEmpty() ) {
-            result = convertSizePolicy_Policy( verticalPolicyS, vPol );
+            result = toSizePolicy( verticalPolicyS, vPol );
+            vPolP = &vPol;
         }
 
-        int *hStretch = 0;
+        int hStretch;
+        int *hStretchP = 0;
         if ( result && !horizontalStretchS.isEmpty() ) {
             const int intValue = horizontalStretchS.toInt( &result );
             if ( result ) {
                 if ( intValue >= 0 && intValue < 256 ) {
-                    hStretch = new int( intValue );
+                    hStretch = intValue;
+                    hStretchP = &hStretch;
                 } else {
                     result = false;
                 }
             }
         }
 
-        int *vStretch = 0;
+        int vStretch;
+        int *vStretchP = 0;
         if ( result && !verticalStretchS.isEmpty() ) {
             const int intValue = verticalStretchS.toInt( &result );
             if ( result ) {
                 if ( intValue >= 0 && intValue < 256 ) {
-                    vStretch = new int( intValue );
+                    vStretch = intValue;
+                    vStretchP = &vStretch;
                 } else {
                     result = false;
                 }
@@ -1043,12 +1038,8 @@
         }
 
         if ( result ) {
-            result = mActions->setSizePolicy( hPol, vPol, hStretch, vStretch );
+            result = mActions->setSizePolicy( hPolP, vPolP, hStretchP, vStretchP );
         }
-        delete hPol;
-        delete vPol;
-        delete hStretch;
-        delete vStretch;
 
         if (!result) {
             qWarning() << "Invalid size policy, line " << mReader.lineNumber();
@@ -1193,13 +1184,7 @@
     } else if ( type == lexemValue( TYPE_BOOL ) ) {
         bool *boolVal = new bool();
         const QString value = attribute( ATTR_VALUE );
-        if (value == lexemValue( VALUE_BOOL_TRUE ) ) {
-            *boolVal = true;
-        } else if (value == lexemValue( VALUE_BOOL_FALSE ) ) {
-            *boolVal = false;
-        } else {
-            ok = false;
-        }
+        ok = toBool( value, *boolVal );
         if (ok) {
             variable.mType = HbXmlVariable::BOOL;
             variable.mParameters.append(boolVal);
@@ -1397,14 +1382,3 @@
             + QString::number( MIN_SUPPORTED_VERSION_MINOR ) + QString( ")" ) );
 }
 
-bool HbDocumentLoaderSyntax::toFontSpecRole(const QString &roleString, HbFontSpec::Role &role)
-{
-    bool success(false);
-    int enumInt = HbFontSpec::staticMetaObject.enumerator(
-            HbFontSpec::staticMetaObject.indexOfEnumerator("Role")).keyToValue(roleString.toLatin1());
-    if (enumInt >= 0) {
-        success = true;
-        role = static_cast<HbFontSpec::Role>(enumInt);
-    }
-    return success;
-}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbutils/document/hbdocumentloadersyntax_p.h
--- a/src/hbutils/document/hbdocumentloadersyntax_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbutils/document/hbdocumentloadersyntax_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -61,7 +61,6 @@
     bool processDocument();
     bool processObject();
     bool processWidget();
-    bool processSpacerItem();
     bool processLayout();
     bool processConnect();
     bool processContainer();
@@ -86,8 +85,6 @@
     bool readContainerStartItem();
     bool readContainerEndItem();
 
-    static bool toFontSpecRole(const QString &roleString, HbFontSpec::Role &role);
-
 };
 
 #endif // HBDOCUMENTLOADERSYNTAX_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbutils/theme/hbthemeservices.cpp
--- a/src/hbutils/theme/hbthemeservices.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbutils/theme/hbthemeservices.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -84,10 +84,6 @@
         path.append(info.path);
         path.append("/icons/");
         path.append(info.name);
-    } else {
-        path.append(HbThemeUtils::getThemeSetting(HbThemeUtils::DefaultThemeRootDirSetting));
-        path.append("/themes/icons/");
-        path.append(HbThemeUtils::getThemeSetting(HbThemeUtils::CurrentThemeSetting));
     }
     return path;
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/dataform/hbdataform.cpp
--- a/src/hbwidgets/dataform/hbdataform.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataform.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -269,10 +269,15 @@
             static_cast<HbDataFormViewItem *>(d->mContainer->itemByIndex(index));
         if (item) {
             item->setExpanded(expanded);
-            d->mContainer->setModelIndexes();
         }
-
-        d->mContainer->setItemTransientStateValue(index, "expanded", expanded);    
+        // If view item is not yet created then set the ItemTransientState so that 
+        // when ever it gets created expansion state will be considered . This is valid for formPage group 
+        // and group page . Itemstate for the leaf items also will be set but does not have any
+        // significance since these items cannot expand( do not have children )
+        
+        else {
+            d->mContainer->setItemTransientStateValue(index, "expanded", expanded);
+        } 
     }
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/dataform/hbdataform.h
--- a/src/hbwidgets/dataform/hbdataform.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataform.h	Tue Jul 06 14:36:53 2010 +0300
@@ -93,7 +93,6 @@
     Q_DECLARE_PRIVATE_D(d_ptr, HbDataForm)
     Q_DISABLE_COPY(HbDataForm)
     Q_PRIVATE_SLOT(d_func(), void _q_page_changed(int))
-    Q_PRIVATE_SLOT(d_func(), void _q_item_displayed(const QModelIndex&))
     
     friend class HbDataFormViewItem;
 };
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/dataform/hbdataform_p.cpp
--- a/src/hbwidgets/dataform/hbdataform_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataform_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -83,7 +83,9 @@
 void  HbDataFormPrivate::_q_page_changed(int index)
 {
     Q_Q(const HbDataForm);
-    QModelIndex childIndex = q->model()->index(index,0);
+
+    QModelIndex childIndex = pageModelIndex(index);
+    //QModelIndex childIndex = q->model()->index(index,0);
     HbDataFormModelItem::DataItemType itemType =
         static_cast<HbDataFormModelItem::DataItemType>(
         (childIndex.data(HbDataFormModelItem::ItemTypeRole)).toInt());
@@ -103,13 +105,16 @@
     QModelIndex changedIndex = model->index(index, 0);*/
     if(itemType == HbDataFormModelItem::FormPageItem) {
         if(index != mHeadingWidget->mActivePage) {
-            QModelIndex prevPageIndex = q->model()->index(mHeadingWidget->mActivePage,0);
-            QModelIndex newPageIndex = q->model()->index(index,0);
+            QModelIndex prevPageIndex = pageModelIndex( mHeadingWidget->mActivePage );
+            QModelIndex newPageIndex = pageModelIndex( index );
             if(prevPageIndex.isValid()) {
                 HbDataGroup *prevPage = static_cast<HbDataGroup *>(
                                                q->itemByIndex(prevPageIndex));
                 if(prevPage) {
                     HbDataGroupPrivate::d_ptr(prevPage)->setExpanded(false);
+                } else {
+                    mContainer->setItemTransientStateValue(prevPageIndex, "expanded", false);
+
                 }
             }
             if(newPageIndex.isValid()) {
@@ -117,6 +122,8 @@
                                                q->itemByIndex(newPageIndex));
                 if(newPage) {
                     HbDataGroupPrivate::d_ptr(newPage)->setExpanded(true);
+                } else {
+                    mContainer->setItemTransientStateValue(newPageIndex, "expanded", true);
                 }
             }
             mHeadingWidget->mActivePage = index;
@@ -124,6 +131,35 @@
     }
 }
 
+/*
+    Function to return valid modelIndex for corresponding formpage combo index.
+*/
+QModelIndex HbDataFormPrivate::pageModelIndex(int index) const 
+{
+    const Q_Q(HbDataForm);
+    int pageIndex = -1;
+    QModelIndex modelIndex;
+    
+    // Make sure that the child is groupPage type and current item is group.
+    if( index >= 0) {
+
+        HbDataFormModelItem *groupModelItem = static_cast<HbDataFormModel*>(q->model())->invisibleRootItem();
+        int childCount = groupModelItem->childCount();
+
+        for( int i = 0; i < childCount; i++) {
+            HbDataFormModelItem *child = groupModelItem->childAt(i);
+            if( child->type() == HbDataFormModelItem::FormPageItem ) {
+                pageIndex ++;
+                // get the index of groupPage
+                if(pageIndex == index) {
+                    modelIndex = static_cast<HbDataFormModel*>(q->model())->indexFromItem(child);
+                    break;                  
+                }
+            }        
+        }
+    }
+    return modelIndex;
+}
 
 /*!
     Creates a DataForm Page \a page in DataForm .
@@ -145,7 +181,7 @@
     if(!mHeadingWidget->mPageCombo) {
         mHeadingWidget->createPrimitives();
         mHeadingWidget->mPageCombo = new HbComboBox(mHeadingWidget);
-		HbStyle::setItemName(mHeadingWidget->mPageCombo,"dataForm_Combo");
+        HbStyle::setItemName(mHeadingWidget->mPageCombo,"dataForm_Combo");
         QEvent polishEvent(QEvent::Polish);
         QCoreApplication::sendEvent(mHeadingWidget->mPageCombo, &polishEvent);
         // setFormHeading to the layout
@@ -181,30 +217,37 @@
     Q_Q(HbDataForm);    
 
     if(mHeadingWidget && mHeadingWidget->mPageCombo) {
+        // if we are emoving the current page
         if(mHeadingWidget->mPageCombo->currentText() == page){
-            mHeadingWidget->mPageCombo->setCurrentIndex(mHeadingWidget->mActivePage+1);
+        // if we are removing the last page then set the current page as 0th
+            if( mHeadingWidget->mPageCombo->findText(page) + 1 == mHeadingWidget->mPageCombo->count()) {
+                mHeadingWidget->mPageCombo->setCurrentIndex(0);
+            } else {// set next page as the curent page
+                mHeadingWidget->mPageCombo->setCurrentIndex(mHeadingWidget->mPageCombo->findText(page) + 1);
+            }
         }
     }
-        QObject::disconnect(mHeadingWidget->mPageCombo,SIGNAL(currentIndexChanged(int)),
+    QObject::disconnect(mHeadingWidget->mPageCombo,SIGNAL(currentIndexChanged(int)),
             q,SLOT(_q_page_changed(int)));
 
-        mHeadingWidget->mPageCombo->removeItem(mHeadingWidget->mPageCombo->findText(page));
-        mHeadingWidget->mActivePage = mHeadingWidget->mPageCombo->currentIndex();
+    mHeadingWidget->mPageCombo->removeItem(mHeadingWidget->mPageCombo->findText(page));
+    mHeadingWidget->mActivePage = mHeadingWidget->mPageCombo->currentIndex();
         
-         QObject::connect(mHeadingWidget->mPageCombo,SIGNAL(currentIndexChanged(int)),
+    QObject::connect(mHeadingWidget->mPageCombo,SIGNAL(currentIndexChanged(int)),
             q,SLOT(_q_page_changed(int)));
 
+
    mHeadingWidget->callPolish();    
 }
 
-void HbDataFormPrivate::_q_item_displayed(const QModelIndex &index)
+/*void HbDataFormPrivate::_q_item_displayed(const QModelIndex &index)
 {
     Q_Q( HbDataForm);
     emit q->itemShown(index);
     emit q->activated(index);
     qWarning("activated signal will not be emitted when items are created ," 
         "instead itemShown SIGNAL should be used");
-}
+}*/
 
 void HbDataFormPrivate::makeConnection(QModelIndex index, HbWidget* widget)
 {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/dataform/hbdataform_p.h
--- a/src/hbwidgets/dataform/hbdataform_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataform_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -63,7 +63,8 @@
     void removeFormPage(const QString& page);
     void _q_page_changed(int index);
 
-    void _q_item_displayed(const QModelIndex &index);
+    //void _q_item_displayed(const QModelIndex &index);
+    QModelIndex pageModelIndex(int index) const;
     void makeConnection(QModelIndex index, HbWidget* widget);
     void connectNow(HbDataFormModelItem * modelItem, QString signal, 
                     QObject *receiver, QString slot);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/dataform/hbdataformviewitem.cpp
--- a/src/hbwidgets/dataform/hbdataformviewitem.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformviewitem.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -25,6 +25,7 @@
 
 #include "hbdataformviewitem.h"
 #include "hbdataformviewitem_p.h"
+#include "hbabstractitemcontainer_p_p.h"
 
 #include "hbdataformmodelitem_p.h"
 #include "hbdataform_p.h"
@@ -398,7 +399,11 @@
     // Expansion is valid only for group ,form page and group page
     if( d->mType < HbDataFormModelItem::SliderItem ) {
         static_cast<HbDataGroup*>(this)->setExpanded(expanded);
-    } 
+    }  else {
+        HbAbstractItemContainer *container = qobject_cast<HbAbstractItemContainer *>(
+        static_cast<QGraphicsWidget *>( d->mSharedData->mItemView->contentWidget( ) ) );
+        container->setItemTransientStateValue(d->mIndex, "expanded", expanded);
+    }
 }
 
 /*!
@@ -412,13 +417,18 @@
     Q_D( const HbDataFormViewItem);
     // Expansion is valid only for group ,form page and group page
     if( d->mType < HbDataFormModelItem::SliderItem ) {
-        HbDataGroup *group = qobject_cast<HbDataGroup *>(const_cast<HbDataFormViewItem*>(this));
+        HbDataGroup *group = qobject_cast< HbDataGroup *>(const_cast<HbDataFormViewItem*>(this));
         if( group ) {
             return group->isExpanded();
-        } else {
-            return false;
         }
     } 
+    if(d->mSharedData->mItemView) {
+        HbAbstractItemContainer *container = qobject_cast<HbAbstractItemContainer *>(
+            static_cast<QGraphicsWidget *>( d->mSharedData->mItemView->contentWidget( ) ) );
+        if(container) {
+            return container->itemTransientState(d->mIndex).value("expanded").toBool();
+        }
+    }
     return false;
 }
 
@@ -435,26 +445,25 @@
 HbWidget* HbDataFormViewItem::dataItemContentWidget()const
 {
     Q_D(const HbDataFormViewItem);
-    HbWidget *widget = d->mContentWidget;;
+    HbWidget *widget = d->mContentWidget;
 
-    switch( d->mType ) {
-        case HbDataFormModelItem::RadioButtonListItem:
-            {
+    if(d->mContentWidget) {
+        switch( d->mType ) {
+            case HbDataFormModelItem::RadioButtonListItem:{
                 widget = static_cast<HbRadioItem*>(d->mContentWidget)->createRadioButton();
             }
             break;
-        case HbDataFormModelItem::MultiselectionItem:
-            {
+            case HbDataFormModelItem::MultiselectionItem:{
                 widget = NULL;
             }
             break;
-        case HbDataFormModelItem::ToggleValueItem:
-            {
+            case HbDataFormModelItem::ToggleValueItem:{
                 widget = static_cast<HbToggleItem*>(d->mContentWidget)->contentWidget();
             }
             break;
-        default:
+            default:
             break;
+        }
     }
     return widget;
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/dataform/hbdataformviewitem_p.cpp
--- a/src/hbwidgets/dataform/hbdataformviewitem_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformviewitem_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -45,7 +45,7 @@
 #include <hbaction.h>
 
 #include <QGraphicsLinearLayout>
-#include <QCoreApplication>
+//#include <QCoreApplication>
 
 #ifdef HB_GESTURE_FW
 #include <hbtapgesture.h>
@@ -1066,10 +1066,10 @@
             mBackgroundItem, HbStyle::P_DataItem_background, &options );
     }
 
-    if ( mContentWidget ) {
-        QEvent polishEvent( QEvent::Polish );
-        QCoreApplication::sendEvent( mContentWidget, &polishEvent );
-    }
+    //if ( mContentWidget ) {
+    //    QEvent polishEvent( QEvent::Polish );
+    //    QCoreApplication::sendEvent( mContentWidget, &polishEvent );
+    //}
 }
 
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/dataform/hbdatagroup_p.cpp
--- a/src/hbwidgets/dataform/hbdatagroup_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/dataform/hbdatagroup_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -62,9 +62,7 @@
 
 bool HbDataGroupPrivate::setExpanded( bool expanded )
 {
-
     Q_Q(HbDataGroup);
-    //HB_SD(HbAbstractViewItem);
     HbAbstractItemContainer *container = 0;
     HbDataFormModelItem::DataItemType itemType = 
             static_cast<HbDataFormModelItem::DataItemType>(
@@ -80,9 +78,10 @@
         if(container->itemTransientState(mIndex).value("expanded")  == expanded || !mSharedData->mItemView) {
             return true;
         }    
-        expand(expanded);
-        //if some one exlicitly calls setExpanded for data group then primitives needs to be
-        //updated.
+        // expand function sets correct expansion itemstate for this item and its children
+        changeExpansionState(expanded);
+        
+        // if some one exlicitly calls setExpanded for data group then primitives needs to be updated.
         if(itemType == HbDataFormModelItem::GroupItem){
             if(mPageCombo) {
                 if(expanded) {
@@ -99,12 +98,13 @@
                     mPageCombo = 0;
                     delete mPageComboBackgroundItem;
                     mPageComboBackgroundItem = 0;
-
                     QEvent polishEvent(QEvent::Polish);
                     QCoreApplication::sendEvent(q, &polishEvent);
                 }
             }
         }
+        // setModelIndexes will be create or delete items according to the 
+        // itemTransient state set using expand function call above
         container->setModelIndexes(mIndex.operator const QModelIndex & ());
     }
     q->updatePrimitives();
@@ -143,10 +143,92 @@
     }
 }
 
+// This function gets called  for group item or for grouppage item . It returs the corresponding page index .
+// The relevance of this function is when some items are inserted before group page inside a group.
+// returns -1 if not valid index.
+int HbDataGroupPrivate::pageIndex(const QModelIndex &index) const 
+{
+    const Q_Q(HbDataGroup);
+    int pageIndex = -1;
+    HbDataFormModelItem::DataItemType indexType = static_cast<HbDataFormModelItem::DataItemType>(
+        index.data( HbDataFormModelItem::ItemTypeRole).toInt( ) );
 
-void HbDataGroupPrivate::expand( bool expanded )
+    // Make sure that the child is groupPage type and current item is group.
+    if( (indexType == HbDataFormModelItem::GroupPageItem) || (indexType == HbDataFormModelItem::FormPageItem) ) {
+        HbDataFormModelItem *modelItem = 
+            static_cast<HbDataFormModel*>((q->itemView())->model())->itemFromIndex(
+                q->modelIndex( ));
+        HbDataFormModelItem *groupModelItem = 0;
+        // get the group modelItem pointer depending upon the type
+        if( modelItem->type() == HbDataFormModelItem::GroupItem ) {
+            groupModelItem = modelItem;
+        } else if( modelItem->type() == HbDataFormModelItem::GroupPageItem ) {
+            groupModelItem = modelItem->parent();
+        } else if (modelItem->type() == HbDataFormModelItem::FormPageItem ) {
+            groupModelItem = static_cast<HbDataFormModel*>(q->itemView()->model())->invisibleRootItem();
+        }
+ 
+        int childCount = groupModelItem->childCount();
+        for( int i = 0; i < childCount; i++) {
+            HbDataFormModelItem *child = groupModelItem->childAt(i);
+            if( (child->type() == HbDataFormModelItem::GroupPageItem ) || (child->type() == HbDataFormModelItem::FormPageItem)) {
+                pageIndex ++;
+                // get the index of groupPage
+                QModelIndex childIndex = static_cast<HbDataFormModel*>(q->itemView()->model())->indexFromItem(child);
+                if(childIndex == index) {
+                    break;// we got the page index
+                }
+            }        
+        }
+    }
+    return pageIndex;
+}
+
+QModelIndex HbDataGroupPrivate::pageModelIndex(int index) const 
+{
+    const Q_Q(HbDataGroup);
+    int pageIndex = -1;
+    QModelIndex modelIndex;
+    
+    // Make sure that the child is groupPage type and current item is group.
+    if( index >= 0) {
+
+        HbDataFormModelItem *modelItem = 
+            static_cast<HbDataFormModel*>((q->itemView())->model())->itemFromIndex(
+                q->modelIndex( ));
+        HbDataFormModelItem *groupModelItem = 0;
+        // get the group modelItem pointer depending upon the type
+        if( modelItem->type() == HbDataFormModelItem::GroupItem ) {
+            groupModelItem = modelItem;
+        } else if( modelItem->type() == HbDataFormModelItem::GroupPageItem ) {
+            groupModelItem = modelItem->parent();
+        }
+
+        int childCount = groupModelItem->childCount();
+
+        for( int i = 0; i < childCount; i++) {
+
+            HbDataFormModelItem *child = groupModelItem->childAt(i);
+            if( child->type() == HbDataFormModelItem::GroupPageItem ) {
+                pageIndex ++;
+                // get the index of groupPage
+                if(pageIndex == index) {
+                modelIndex = static_cast<HbDataFormModel*>(q->itemView()->model())->indexFromItem(child);
+                break; 
+                    
+                }
+            }        
+        }
+    }
+    return modelIndex;
+}
+
+
+
+void HbDataGroupPrivate::changeExpansionState( bool expanded )
 {
     Q_Q(HbDataGroup);
+    // get container for setting item state
     HbAbstractItemContainer *container = qobject_cast<HbAbstractItemContainer *>(
         static_cast<QGraphicsWidget *>( mSharedData->mItemView->contentWidget( ) ) );
     HbDataFormModelItem::DataItemType itemType = static_cast<HbDataFormModelItem::DataItemType>(
@@ -157,56 +239,22 @@
     }
 
     if( !expanded ) {
-        //collapsing all the expanded child Types.
-        QModelIndex index = mIndex.operator const QModelIndex & ( );
-        QModelIndex childIndex = index.child(0,0);
-        while(childIndex.isValid()) {
-            HbDataFormModelItem::DataItemType childType = static_cast<HbDataFormModelItem::DataItemType>(
-            childIndex.data(HbDataFormModelItem::ItemTypeRole).toInt());
-
-            if(childType <= HbDataFormModelItem::GroupPageItem) {
-                HbDataGroup* group_Item = 
-                static_cast<HbDataGroup*>(mSharedData->mItemView->itemByIndex(
-                    childIndex));
-                if(group_Item && group_Item->isExpanded()) {
-                    HbDataGroupPrivate::d_ptr(group_Item)->expand(false);
-                    // retaining the item state so that next time when this formpage is activated
-                    // previously expanded group will be expanded since we are checking this 
-                    // expansion state from updatechilditems of group
-                    container->setItemTransientStateValue(childIndex, "expanded", true);                
-                }
-            }
-            QModelIndex nextChild = index.child(childIndex.row() +1 ,0);
-            childIndex = nextChild;
-        }
-
         if( mGroupHeading ) {
             mGroupHeading->mExpanded = false;
         }
-
     } else { //expand
-        
+        // here we are checking only for HbDataGroup since for HbDataFormPage expansion will happen through 
+        // setModelIndexes. For group we need to expand the current active grouppage . 
         if(itemType == HbDataFormModelItem::GroupItem){
-            HbDataFormModelItem *modelItem = static_cast<HbDataFormModel*>(
-                mSharedData->mItemView->model())->itemFromIndex(mIndex.operator const QModelIndex & ());
-            QModelIndex childIndex = (mIndex.operator const QModelIndex & ()).child(0,0);
-            HbDataFormModelItem::DataItemType childType = static_cast<HbDataFormModelItem::DataItemType>(
-                childIndex.data(HbDataFormModelItem::ItemTypeRole).toInt());
-            if( childType == HbDataFormModelItem::GroupPageItem ) {
-                QVariant pageIndex = modelItem->contentWidgetData(QString("currentPage"));
-                int activePage;
-                if(!pageIndex.isValid()) {
-                    activePage = 0;
-                    setActivePage(activePage);
-                } else {
-                    activePage = pageIndex.toInt();
-                }
-                //get the group page index
-                QModelIndex groupPageIndex = mIndex.child(activePage,0);
+            int page = activePage();
+            if(page != -1) {
+                QModelIndex groupPageIndex = pageModelIndex(page);
                 
                 if(groupPageIndex.isValid()) {                    
+                    // set transient state for group page so that when it gets created then its  
+                    // child items are also created
                     container->setItemTransientStateValue(groupPageIndex, "expanded", true);
-                    q->emitActivated(groupPageIndex);
+                    q->emitActivated(groupPageIndex);                   
                 }
             }
             if (mGroupHeading )  {
@@ -214,22 +262,23 @@
             }
         }
     }
-
+    // save the item state for this item. All the cild item state are saved above
     container->setItemTransientStateValue(mIndex, "expanded", expanded);
 }
 
 
-QString HbDataGroupPrivate::groupPage() const
+/*QString HbDataGroupPrivate::groupPage() const
 {   
     return mPageString;
 }
-
+*/
 
 void HbDataGroupPrivate::setGroupPage( const QString &page ) 
 {
    Q_Q(HbDataGroup);
 
     if( !mPageCombo ) {
+        // This is the first groupPgae getting added so create the combobox to add the page
         mPageCombo = new HbComboBox( q );
         mPageString = ' ';
         q->setProperty("groupPage", page);
@@ -252,8 +301,11 @@
     if(!list.contains(page)) {
         mPageCombo->addItem(page);        
         mPageString = page; 
-    }   
-    mPageCombo->setCurrentIndex(activePage());
+    }
+    int pageIndex = activePage();
+    if(pageIndex!= -1) {
+        mPageCombo->setCurrentIndex(pageIndex);
+    }
 
     QObject::connect(mPageCombo,SIGNAL(currentIndexChanged(int)),
             q ,SLOT(pageChanged(int)));
@@ -261,40 +313,71 @@
 
 void HbDataGroupPrivate::removeGroupPage(const QString &page)
 {    
+
     if(mPageCombo) {
+        // if we are removing the last page then set current page as 0
+        if( mPageCombo->findText(page) + 1 == mPageCombo->count()) {
+	    	mPageCombo->setCurrentIndex(0);
+	    } else {// set next page as the currrent page
+		    mPageCombo->setCurrentIndex(mPageCombo->findText(page) + 1);
+	    }
+        // remove the text from ombobox
         mPageCombo->removeItem(mPageCombo->findText(page));
     }
 }
+/*
+int HbDataGroupPrivate::pageChanged(const QModelIndex &modelIndex)
+{
+
+}*/
 
 int HbDataGroupPrivate::activePage( )
 {
     Q_Q( HbDataGroup );
+    // Here we need to find which page has the itemTransientState  true, 
+    // which in turn will be the active page. If no page is set as true , then
+    // make the 0th page as expanded ie itemTransientState as true
 
+    // This function can be called from Group or GroupPage items 
+    QModelIndex groupIndex ;    
     HbDataFormModelItem *modelItem = 
         static_cast<HbDataFormModel*>((q->itemView())->model())->itemFromIndex(
             q->modelIndex( ));
-    int page = 0;
-    if(modelItem){
-        page = modelItem->contentWidgetData(QString("currentPage")).toInt();
+    HbDataFormModelItem *groupModelItem = 0;
+    // get the group modelItem pointer depending upon the type
+    if( modelItem->type() == HbDataFormModelItem::GroupItem ) {
+        groupModelItem = modelItem;
+    } else if( modelItem->type() == HbDataFormModelItem::GroupPageItem ) {
+        groupModelItem = modelItem->parent();
     }
-    return page;
-}
-
-void HbDataGroupPrivate::setActivePage(int pageindex)
-{  
-    Q_Q( HbDataGroup ); 
-   
-    HbDataFormModelItem *modelItem = 
-        static_cast<HbDataFormModel*>((q->itemView())->model())->itemFromIndex(
-            q->modelIndex());
-    
-    QObject::disconnect( mSharedData->mItemView->model(), SIGNAL( dataChanged( QModelIndex,QModelIndex ) ),
-        mSharedData->mItemView, SLOT( dataChanged( QModelIndex,QModelIndex ) ) );
-
-    modelItem->setContentWidgetData(QString("currentPage"),pageindex);
-
-    QObject::connect( mSharedData->mItemView->model(), SIGNAL( dataChanged( QModelIndex,QModelIndex ) ),
-        mSharedData->mItemView, SLOT( dataChanged( QModelIndex,QModelIndex ) ) );
+    int childCount = groupModelItem->childCount();
+    //int activePage = 0;
+    // get container for setting item state
+    HbAbstractItemContainer *container = qobject_cast<HbAbstractItemContainer *>(
+        static_cast<QGraphicsWidget *>( mSharedData->mItemView->contentWidget( ) ) );
+    int currentPage = -1; 
+    bool somePageExpanded = false;
+    for( int i = 0; i < childCount; i++) {
+        // Make sure that the child is groupPage type.
+        HbDataFormModelItem *child = groupModelItem->childAt(i);
+        if( child->type() == HbDataFormModelItem::GroupPageItem ) {
+            // Here we are not using i as the page index since there can other types of children in the same level
+            // so need a seperate variable for this 
+            currentPage ++;
+            
+            // get the index of groupPage
+            QModelIndex pageIndex = static_cast<HbDataFormModel*>(q->itemView()->model())->indexFromItem(child);
+            if(container->itemTransientState(pageIndex).value("expanded").toBool()) {
+                somePageExpanded = true;
+                break;
+            }
+            
+        }        
+    }
+    if(!somePageExpanded && currentPage != -1) {// This means pages are present and no page is expanded so expand first page
+        currentPage = 0;
+    }
+    return currentPage;
 }
 
 void HbDataGroupPrivate::setHeading( const QString &heading )
@@ -362,16 +445,21 @@
         if( contentWidgetType == HbDataFormModelItem::GroupItem ) {
             d->setExpanded(expanded);
         } else if (contentWidgetType == HbDataFormModelItem::GroupPageItem) {
+            //We need to change even the combobox state also so call pageChanged fuction
             if(modelItem) {
-                pageChanged(modelItem->parent()->indexOf(modelItem));
+                int page = d->pageIndex(d->mIndex);
+                if(page != -1) {
+                    pageChanged(page);
+                }
             }
         } else if(contentWidgetType == HbDataFormModelItem::FormPageItem) {
             if(modelItem) {
-                HbDataFormPrivate::d_ptr(
-                    static_cast<HbDataForm*>(d->mSharedData->mItemView))->_q_page_changed(
-                        modelItem->parent()->indexOf(modelItem));
+                int formPageIndex = d->pageIndex(d->mIndex);
+                if( formPageIndex!= -1) {
+                    HbDataFormPrivate::d_ptr(
+                    static_cast<HbDataForm*>(d->mSharedData->mItemView))->_q_page_changed(formPageIndex);
+                }
             }
-            
         }
         return true;
     } else {
@@ -385,11 +473,7 @@
     HbDataFormModelItem::DataItemType contentWidgetType =
         static_cast<HbDataFormModelItem::DataItemType>(
         (d->mIndex.data(HbDataFormModelItem::ItemTypeRole)).toInt());
-    if( contentWidgetType == HbDataFormModelItem::GroupItem ) {
-        if(d->mGroupHeading) {
-            return d->mGroupHeading->mExpanded;
-        }
-    } else if ( contentWidgetType == HbDataFormModelItem::GroupPageItem ) {
+    if( contentWidgetType < HbDataFormModelItem::SliderItem ) {
         HbAbstractItemContainer *container = qobject_cast<HbAbstractItemContainer *>(
             static_cast<QGraphicsWidget *>(d->mSharedData->mItemView->contentWidget()));
         if(container) {
@@ -397,7 +481,6 @@
         }
     }
     return false;
-
 }
 
 void HbDataGroup::updateGroupPageName(int index , const QString &page)
@@ -409,6 +492,7 @@
         }       
     }
 }
+
 void HbDataGroup::updatePrimitives()
 {
     Q_D(HbDataGroup);
@@ -458,13 +542,19 @@
 void HbDataGroup::pageChanged(int index)
 {
     Q_D(HbDataGroup);
+
     HbDataFormModelItem::DataItemType itemType =
         static_cast<HbDataFormModelItem::DataItemType>(
         (d->mIndex.data(HbDataFormModelItem::ItemTypeRole)).toInt());
+    
 
     if(!itemView()) {
         return;
     }
+
+    HbAbstractItemContainer *container = qobject_cast<HbAbstractItemContainer *>(
+                static_cast<QGraphicsWidget *>(d->mSharedData->mItemView->contentWidget()));
+
     // Get Previous Active Group Page
     QModelIndex previousPageIndex;
     QModelIndex currentPageIndex;
@@ -472,48 +562,61 @@
     // this function can get called for both group and grouppage
     // active grouppage is always stored in group modelitem so get the next index and 
     // activepage according to group
-    if(itemType == HbDataFormModelItem::GroupItem) {
-        previousPageIndex = modelIndex().child(d->activePage(),0);
-        currentPageIndex = modelIndex().child(index,0);
-    } else if(itemType == HbDataFormModelItem::GroupPageItem) {
+
+    int previous_page = d->activePage();
+    if(previous_page != -1) {
+        previousPageIndex = d->pageModelIndex(previous_page);  
+    }
+    currentPageIndex =  d->pageModelIndex(index); 
+
+    if(itemType == HbDataFormModelItem::GroupPageItem) {
         // need to fetch group (parent) for getting previus page and active page
         group = static_cast<HbDataGroup*>(itemView()->itemByIndex(modelIndex().parent()));
-        previousPageIndex = modelIndex().parent().child(HbDataGroupPrivate::d_ptr(group)->activePage(),0);
-        currentPageIndex = modelIndex().parent().child(index,0);
-        
         if(HbDataGroupPrivate::d_ptr(group)->mPageCombo) {
-        if(HbDataGroupPrivate::d_ptr(group)->mPageCombo->currentIndex() != index) {
-            QObject::disconnect(HbDataGroupPrivate::d_ptr(group)->mPageCombo,SIGNAL(currentIndexChanged(int)),
+            if(HbDataGroupPrivate::d_ptr(group)->mPageCombo->currentIndex() != index) {
+
+                // combobox has to be changed explicitly here since the call happened on GroupPage item
+                QObject::disconnect(HbDataGroupPrivate::d_ptr(group)->mPageCombo,SIGNAL(currentIndexChanged(int)),
                         group ,SLOT(pageChanged(int)));
-            HbDataGroupPrivate::d_ptr(group)->mPageCombo->setCurrentIndex(index);
-            QObject::connect(d->mPageCombo,SIGNAL(currentIndexChanged(int)),
+                HbDataGroupPrivate::d_ptr(group)->mPageCombo->setCurrentIndex(index);
+                QObject::connect(d->mPageCombo,SIGNAL(currentIndexChanged(int)),
                         group ,SLOT(pageChanged(int)));
+            }
         }
     }
-    }
     
     if(index != HbDataGroupPrivate::d_ptr(group)->activePage()) {// If the page is different
+
         // Collapse previous group page
-        HbDataGroup* previousPage = static_cast<HbDataGroup*>(itemView()->itemByIndex(previousPageIndex));
-        HbDataGroupPrivate::d_ptr(group)->setActivePage(index);
-        if(previousPage) {
-            HbDataGroupPrivate::d_ptr(previousPage)->setExpanded(false);
+        if(previousPageIndex.isValid()) {
+            HbDataGroup* previousPage = static_cast<HbDataGroup*>(itemView()->itemByIndex(previousPageIndex));
+            //HbDataGroupPrivate::d_ptr(group)->setActivePage(index);
+            
+            if(previousPage) {
+                HbDataGroupPrivate::d_ptr(previousPage)->setExpanded(false);
+            }else {
+                container->setItemTransientStateValue(previousPageIndex, "expanded", false);
+            }
         }
-        // Expand current selected page set as active page
-        
+
+        // Expand current selected page set as active page        
         if(currentPageIndex.isValid()) {
             HbDataGroup* currentPage = static_cast<HbDataGroup*>(
                 (itemView())->itemByIndex(currentPageIndex));
             if(currentPage) {
                 HbDataGroupPrivate::d_ptr(currentPage)->setExpanded(true);
+            } else {
+                container->setItemTransientStateValue(currentPageIndex, "expanded", true);
             }
         }
     } else {//If selected page is same then expand it if it is not expanded already
-        HbDataGroup* currentPage = static_cast<HbDataGroup*>(//remove this code
+        HbDataGroup* currentPage = static_cast<HbDataGroup*>(
             (itemView())->itemByIndex(previousPageIndex));
         if(currentPage && !currentPage->isExpanded()) {
             HbDataGroupPrivate::d_ptr(currentPage)->setExpanded(true);
-        }
+        } else {
+            container->setItemTransientStateValue(currentPageIndex, "expanded", true);
+        } 
     }
 }
 
@@ -527,6 +630,15 @@
 {
     Q_D(HbDataGroup);
     HB_SD(HbAbstractViewItem);
+     if( d->mIndex.isValid( ) ) {
+        d->mType = static_cast<HbDataFormModelItem::DataItemType>(
+            d->mIndex.data(HbDataFormModelItem::ItemTypeRole).toInt( ) );
+    }
+
+    if( d->mSharedData && d->mSharedData->mItemView ) {
+        d->mModel = static_cast<HbDataFormModel*>( d->mSharedData->mItemView->model( ) );
+        d->mModelItem = d->mModel->itemFromIndex( modelIndex( ) );
+    }
     HbAbstractItemContainer *container = qobject_cast<HbAbstractItemContainer *>(
             static_cast<QGraphicsWidget *>(d->mSharedData->mItemView->contentWidget()));
 
@@ -616,6 +728,7 @@
 // TODO: remove this, temporary workaround to return size zero incase of no contentwidget
 QSizeF HbDataGroup::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 {
+    //TODO: remove this
     QSizeF size;
     HbDataFormModelItem::DataItemType itemType = 
         static_cast<HbDataFormModelItem::DataItemType>(
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/dataform/hbdatagroup_p_p.h
--- a/src/hbwidgets/dataform/hbdatagroup_p_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/dataform/hbdatagroup_p_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -42,18 +42,19 @@
     ~HbDataGroupPrivate( );
 
     void init( );
-    void expand( bool expanded );
+    void changeExpansionState( bool expanded );
 
     void setHeading( const QString &heading );
     QString heading( ) const;
 
-    QString groupPage() const;
+    //QString groupPage() const;
     void setGroupPage(const QString &page);
     void removeGroupPage(const QString &page);
     int activePage();
-    void setActivePage(int pageindex);
     bool setExpanded( bool expanded );
     void setEnabled( bool enabled );
+	int pageIndex(const QModelIndex &index) const ;
+	QModelIndex pageModelIndex(int index) const ; 
 
 public:
     static HbDataGroupPrivate *d_ptr( HbDataGroup *item ) {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/dataform/hbdatagroupheadingwidget_p.cpp
--- a/src/hbwidgets/dataform/hbdatagroupheadingwidget_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/dataform/hbdatagroupheadingwidget_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -29,6 +29,7 @@
 #include "hbdatagroup_p.h"
 #include "hbdatagroup_p_p.h"
 #include <QGraphicsItem>
+#include <QGraphicsScene>
 #include <hbwidgetfeedback.h>
 
 #ifdef HB_GESTURE_FW
@@ -189,6 +190,10 @@
 
         case Qt::GestureStarted:
             {
+                if (scene())
+                    scene()->setProperty(HbPrivate::OverridingGesture.latin1(),Qt::TapGesture);
+                tap->setProperty(HbPrivate::ThresholdRect.latin1(), mapRectToScene(boundingRect()).toRect());
+
                 mDown = true;
                 mLongPressed = false;
                 HbStyleOptionDataGroupHeadingWidget settingGroupOption;
@@ -221,6 +226,10 @@
                 }
 
                 HbWidgetFeedback::triggered(this, Hb::InstantReleased, modifiers);
+
+                if (scene()) {
+                    scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
+                }
                 break;
             }
         case Qt::GestureCanceled:
@@ -235,6 +244,10 @@
             }
 
             HbWidgetFeedback::triggered(this, Hb::InstantReleased, modifiers);
+
+            if (scene()) {
+                scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
+            }
             break;
 
          }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/devicedialogs/hbdevicemessagebox.cpp
--- a/src/hbwidgets/devicedialogs/hbdevicemessagebox.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicemessagebox.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -80,6 +80,17 @@
     TRACE_EXIT
 }
 
+void HbDeviceMessageBoxPrivate::initAction(int index)
+{
+    if (!mActions[index].mAction) {
+        if (!mDefaultActions[index]) {
+            mDefaultActions[index] = new QAction(0);
+        }
+        mActions[index].mAction = mDefaultActions[index];
+        connect(mActions[index].mAction, SIGNAL(changed()), SLOT(actionChanged()));
+    }
+}
+
 void HbDeviceMessageBoxPrivate::initProperties()
 {
     for(int i = 0; i < NumProperties; i++) {
@@ -101,17 +112,23 @@
     }
 
     switch(mProperties[Type].mValue.toInt()) {
+    case HbMessageBox::MessageTypeNone:
+        q_ptr->setIconVisible(false);
+        // Fall trough
     case HbMessageBox::MessageTypeInformation:
     case HbMessageBox::MessageTypeWarning:
         q_ptr->setDismissPolicy(HbPopup::TapAnywhere);
         q_ptr->setTimeout(timeoutValue(HbPopup::StandardTimeout));
-        // Use default accept button, reject button is empty
+        // HbMessageBox sets by default accept button to "Ok", reject button is empty
+        mProperties[StandardButtons].mValue.setValue(static_cast<int>(HbMessageBox::Ok));
         useActions[AcceptButton] = true;
         break;
     case HbMessageBox::MessageTypeQuestion:
         q_ptr->setTimeout(HbPopup::NoTimeout);
         q_ptr->setDismissPolicy(HbPopup::NoDismiss);
-        // Use default accept and reject buttons
+        // HbMessageBox sets by default accept button to "Ok", reject button is empty.
+        // Set default buttons to yes/no
+        setProperty(StandardButtons, HbMessageBox::Yes|HbMessageBox::No);
         useActions[AcceptButton] = true;
         useActions[RejectButton] = true;
         break;
@@ -121,11 +138,7 @@
 
     for(int i = 0; i < NumActions; i++) {
         if (useActions[i]) {
-            if (!mDefaultActions[i]) {
-                mDefaultActions[i] = new QAction(0);
-            }
-            mActions[i].mAction = mDefaultActions[i];
-            connect(mActions[i].mAction, SIGNAL(changed()), SLOT(actionChanged()));
+            initAction(i);
         }
     }
 }
@@ -145,6 +158,21 @@
     TRACE_EXIT
 }
 
+void HbDeviceMessageBoxPrivate::setStandardButtons(HbMessageBox::StandardButtons buttons)
+{
+    // Create actions for buttons. These will be signaled on button press.
+    int buttonCount = qMin(static_cast<int>(NumActions), countBits(buttons));
+    int i = 0;
+    for(; i < buttonCount; i++) {
+        initAction(i);
+    }
+    // Clear extra actions
+    for(; i < NumActions; i++) {
+      clearAction(mActions[i]);
+    }
+    setProperty(StandardButtons, buttons);
+}
+
 // Send properties to server
 void HbDeviceMessageBoxPrivate::sendToServer(bool show)
 {
@@ -168,6 +196,7 @@
 
     static const char * const propertyNames[] = {
         "type",
+        "standardButtons",
         "text",
         "iconName",
         "iconVisible",
@@ -347,6 +376,16 @@
     return timeoutValues[timeout].value;
 }
 
+int HbDeviceMessageBoxPrivate::countBits(unsigned int value)
+{
+    int count = 0;
+    while(value) {
+        count += value & 1;
+        value >>= 1;
+    }
+    return count;
+}
+
 HbDeviceMessageBoxPrivate::ActionSelector HbDeviceMessageBoxPrivate::actionSelector(
     HbDeviceMessageBox::ActionRole role)
 {
@@ -368,27 +407,53 @@
     @stable
     @hbwidgets
     \class HbDeviceMessageBox
-    \brief HbDeviceMessageBox displays a message to the user, on top of any running applications, which the user must acknowledge to dismiss.
+    \brief HbDeviceMessageBox displays a message box on top of any running applications.
 
-    HbDeviceMessageBox is a device dialog version of HbMessageBox. It displays a message box with text, icon or animation and optional reply button(s).
-    It differs from HbMessageBox by excluding functions which handle concrete UI-component related information.
+    HbDeviceMessageBox is a device dialog version of HbMessageBox. It displays a message box
+    with text, icon or animation and optional accept and reject buttons. It is not a widget.
+    The message box is displayed by a device dialog service which HbDeviceMessageBox is a
+    client of.
 
     Device dialogs are shown on top of any running applications and are always modal by nature.
 
-    A device message box is launched when exec() is called for an synchronous dialog or show() is called for an asynchronous
-    dialog. The launched dialog can be updated by the setter metods. Because updating a dialog
-    requires interprocess communication, it is advisable to fully construct the device message box before
-    calling show(). The device message box is closed when the user dismisses it by pressing a button, when
-    the client calls close(), or when the dialog timeout expires. If the system must close the device message
-    box while it is executing, it will have the same effect as having the message box's secondary action    
+    A device message box is lauched by a show(). A new message box is lauched every time show()
+    is called. aboutToClose() signal is emitted when the box has closed. There is also syncronous
+    exec() function which launches a message box and waits for it close. exec() is not compatible
+    with gestures and cannot be used from applications that have an user interface.
+
+    After message box has been launched, updating it's properties causes interprocess
+    communication. Therefore it's best to construct the message box fully before
+    calling show(). Changing a property while a message box is displayed, causes the property
+    to be updated to the displayed widget automatically next time event loop is entered
+    or updated values can be sent immediately by calling update().
+
+    Message box buttons are represented by two actions. Left button corrensponds to accept
+    action and the right one to reject action. triggered() signal of action is emitted when
+    corresponding button is pressed. Changing action text changes corresponding button text.
+    Icons on buttons are not suppported.
 
-    Static convenience functions are provided for launching message boxes.
-    Dialogs created by them contain default property values appropriate for
-    the message box type and their contents cannot be updated. Information and
-    warning convenience methods return immediately. Question waits for a message box
-    to close.
+    Device message box is closed when user dismisses it, when HbDeviceMessageBox::close() is
+    called, timeout expires and message box closes itself or system closes the message box for
+    some reason. aboutToClose() signal is always emitted after the box has closed.
+
+    Static convenience functions are provided for launching message boxes. They launch message boxes
+    containing default properties appropriate for the message box type and their contents cannot
+    be updated. Information and warning convenience methods return immediately. Question waits for
+    a message box to close and is not compatible with gestures.
 
-    Supported icon animation formats are following:
+    Four types of message boxes are predefined. The type determines a set of default properties that
+    are set on construction. Below is a table listing types and their default properties.
+
+    <table border="1">
+        <caption><b>HbDeviceMessageBox types and default properties</b></caption>
+        <tr><th>Type</th><th>Icon</th><th>Buttons</th><th>Timeout</th><th>Dismiss policy</th><th>Sound</th></tr>
+        <tr><td>None</td><td>No icon</td><td>"Ok" button</td><td>Standard timeout</td><td>Tap anywhere</td><td>No sound</td></tr>
+        <tr><td>Information</td><td>Info icon</td><td>"Ok" button</td><td>Standard timeout</td><td>Tap anywhere</td><td>Info sound</td></tr>
+        <tr><td>Warning</td><td>Warning icon</td><td>"Ok" button</td><td>Standard timeout</td><td>Tap anywhere</td><td>Warn sound</td></tr>
+        <tr><td>Question</td><td>Question icon</td><td>"Yes" and "No" buttons</td><td>No timeout</td><td>Button press</td><td>Question sound</td></tr>
+    </table>
+
+    In place of an icon, message box may conatain an animation. Supported icon animation formats are:
     - GIF (.gif)
     - MNG (.mng)
     - Frame animations (.axml)
@@ -405,7 +470,7 @@
     }
     \endcode
 
-    Alter the appearance of the message box with the methods provided by the class.
+    Modify appearance of a message box with the methods provided by the class.
 
     \code
     // Code below modifies the default properties of the message box.
@@ -425,6 +490,9 @@
     QAction rejectAction("Cancel", 0);
     messageBox.setAction(&rejectAction, HbDeviceMessageBox::RejectButtonRole);
 
+    // Set standard buttons
+    messageBox.setStandardButtons(HbMessageBox::Ok|HbMessageBox::Cancel);
+
     // Beware, application may exit during exec().
     // Beware, exec() is not compatible with gestures.
     QAction *result = messageBox.exec();
@@ -465,8 +533,8 @@
 /*!
     \fn void HbDeviceMessageBox::aboutToClose();
 
-    This signal is emitted when the device message box is about to be closed i.e.
-    when the question type of message is replied to by the user.
+    This signal is emitted when the message box has closed. If a button was pressed,
+    corresponding action's triggered() signal is emitted before this signal.
  */
 
 /*!
@@ -475,7 +543,7 @@
 */
 /*!
     \var HbDeviceMessageBox::ActionRole HbDeviceMessageBox::InvalidRole
-    No action.
+    No role.
 */
 /*!
     \var HbDeviceMessageBox::ActionRole HbDeviceMessageBox::AcceptButtonRole
@@ -503,7 +571,7 @@
 
 /*!
     Constructor.
-    \param text Text can be set in the constructor.
+    \param text Message box text.
     \param type Type of the message box.
     \param parent An optional parameter.
 */
@@ -529,7 +597,12 @@
 }
 
 /*!
-    Executes the dialog asynchronously.
+    Shows a message box and returns immediately without waiting for it to close. Closing of the
+    message box is indicated by aboutToClose() signal. Button presses are indicated by
+    QAction::triggered() signals. The message box can be updated while showing by property
+    setters.
+
+    \sa update(), aboutToClose()
 */
 void HbDeviceMessageBox::show()
 {
@@ -539,10 +612,10 @@
 }
 
 /*!
-    Updates changed properties of a launched message box to device dialog service using
-    interprocess communication. Has no effect if show() has not been called or dialog has
-    closed already. Calling show() is optional as updating any property schedules an event
-    and the dialog is updated next time Qt event loop executes.
+    Updates changed properties to a showing message box via interprocess communication.
+    Has no effect if show() has not been called or the message box has closed already.
+    Calling update() is optional as setting any property schedules an event and the
+    showing message box is updated next time Qt event loop executes.
 
     \sa show()
 */
@@ -552,7 +625,7 @@
 }
 
 /*!
-    Closes the dialog if the dialog is shown asynchronously.
+    Closes a message box shown asynchronously.
 */
 void HbDeviceMessageBox::close()
 {
@@ -564,10 +637,10 @@
 /*!
     Executes the dialog synchronously.
 
-    Returns a pointer to the action that was activated by the user, i.e. dialog's
-    accept or reject action. Return 0 if object was deleted during a call.
+    Returns a pointer to an action corresponding to a button pressed. Returns 0 if no button
+    was pressed (the dialog closed for other reason).
 
-    This functions starts a new event loop. Consider following caveats before using it
+    This functions starts a new event loop. Consider following caveats before using it.
     Stack usage increases. Depending on application program flow, several event
     loops may get instantiated on top of each other. Application event processing continues while
     exec() executes. When it returns application state may have changed. For example some
@@ -624,7 +697,8 @@
 
 /*!
     Sets message box type. All message box properties are reset to a default values for the type.
-    A show() must be called to launch a message box after setMessageBoxType() has been called.
+    Type of a showing message box cannot be changed on the fly. show() must be called to launch
+    a new message box after setMessageBoxType() has been called.
 
     \param type Message box type.
 
@@ -653,9 +727,39 @@
 }
 
 /*!
+    Sets message box buttons to standard buttons.
+
+    \param buttons Message box buttons. A combination of flags,
+    eg. HbMessageBox::Yes | HbMessageBox::No. Button flags are scanned starting from lsb.
+    First button found goes to accept position and so forth.
+
+    \sa standardButtons()
+*/
+void HbDeviceMessageBox::setStandardButtons(HbMessageBox::StandardButtons buttons)
+{
+    TRACE_ENTRY
+    d_ptr->setStandardButtons(buttons);
+    d_ptr->scheduleUpdateEvent();
+    TRACE_EXIT
+}
+
+/*!
+    Returns standard buttons set to a message box. A default value for question message box is
+    HbMessageBox::Yes|HbMessageBox::No. For all other message box types the default is
+    HbMessageBox::Ok.
+
+    \sa setStandardButtons()
+*/
+HbMessageBox::StandardButtons HbDeviceMessageBox::standardButtons() const
+{
+    return static_cast<HbMessageBox::StandardButtons>
+        (d_ptr->mProperties[HbDeviceMessageBoxPrivate::StandardButtons].mValue.toInt());
+}
+
+/*!
     Convenience method for showing question message box and waiting for it to close.
 
-    This functions starts a new event loop. Consider following caveats before using it
+    This functions starts a new event loop. Consider following caveats before using it.
     Stack usage increases. Depending on application program flow, several event
     loops may get instantiated on top of each other. Application event processing continues while
     question() executes. When it returns application state may have changed. For example some
@@ -665,11 +769,11 @@
     has an user interface, please don't use this function. Instead connect to signals and use
     asynchronous show().
 
-    \param text - text shown in message box.
-    \param acceptButtonText Accept button text. If string is null, a default button is used.
-    \param rejectButtonText Reject button text. If string is null, a default button is used.
+    \param text Message box text.
+    \param acceptButtonText Accept button text. If string is null, a default (Yes) button is used.
+    \param rejectButtonText Reject button text. If string is null, a default (No) button is used.
 
-    Returns true if user triggered accept action, otherwise false.
+    Returns true if user pressed accept button, otherwise false.
 
     \sa show()
 */
@@ -681,12 +785,12 @@
     TRACE_STATIC_ENTRY
     HbDeviceMessageBox messageBox(HbMessageBox::MessageTypeQuestion);
     messageBox.setText(text);
-
+    messageBox.setStandardButtons(HbMessageBox::Yes|HbMessageBox::No);
     if (!acceptButtonText.isNull()) {
-        messageBox.setAction(new QAction(acceptButtonText, &messageBox), AcceptButtonRole);
+        messageBox.action(AcceptButtonRole)->setText(acceptButtonText);
     }
     if (!rejectButtonText.isNull()) {
-        messageBox.setAction(new QAction(rejectButtonText, &messageBox), RejectButtonRole);
+        messageBox.action(RejectButtonRole)->setText(rejectButtonText);
     }
     messageBox.exec();
     TRACE_EXIT
@@ -695,10 +799,42 @@
 }
 
 /*!
+    Convenience method for showing question message box and waiting for it to close.
+
+    This functions starts a new event loop. Consider following caveats before using it.
+    Stack usage increases. Depending on application program flow, several event
+    loops may get instantiated on top of each other. Application event processing continues while
+    question() executes. When it returns application state may have changed. For example some
+    objects may have been deleted or application may have exited.
+
+    <b>Note that starting an event loop isn't compatible with gestures.</b> Therefore if an application
+    has an user interface, please don't use this function. Instead connect to signals and use
+    asynchronous show().
+
+    \param text Message box text.
+    \param buttons Specifies message box buttons. See setStandardButtons() for format.
+
+    Returns true if user pressed accept button, otherwise false.
+
+    \sa show()
+*/
+bool HbDeviceMessageBox::question(const QString &text, HbMessageBox::StandardButtons buttons)
+{
+    TRACE_STATIC_ENTRY
+    HbDeviceMessageBox messageBox(HbMessageBox::MessageTypeQuestion);
+    messageBox.setText(text);
+    messageBox.setStandardButtons(buttons);
+    messageBox.exec();
+    TRACE_EXIT
+    // Return true if accept action was triggered
+    return messageBox.isAcceptAction(messageBox.triggeredAction());
+}
+
+/*!
     Convenience method for showing information message box. Launches a message box and
     returns immediately.
 
-    \param text - text shown in message box.
+    \param text Message box text.
 */
 void HbDeviceMessageBox::information(const QString &text)
 {
@@ -711,7 +847,7 @@
     Convenience method for showing warning message box. Launches a message box and returns
     immediately.
 
-    \param text - text shown in message box.
+    \param text Message box text.
 */
 void HbDeviceMessageBox::warning(const QString &text)
 {
@@ -737,7 +873,7 @@
 }
 
 /*!
-    Sets an action into the device message box. Action role is either an
+    Sets an action into device message box. Action role is either an
     accept (left button in left-to-right layout) or reject (right button).
     Action can be null which removes corresponding button from the message
     box. Only text of the action is shown in the message box button. Icon
@@ -745,11 +881,11 @@
     the action.
 
     HbDeviceMessageBox constructor sets a default accept and reject actions into
-    question message box. Information and warning message boxes have only accept
-    action by default. Default actions are owned and deleted by the message box.
+    question message box. Other message boxes have only accept action by default.
+    Default actions are owned and deleted by the message box.
 
     \param action Action or null. Ownership does not transfer.
-    \param role Selects an action to set.
+    \param role Selects an action.
 
     \sa action()
 */
@@ -766,11 +902,11 @@
 }
 
 /*!
-    Sets text of the message dialog.
+    Sets message box text. Supported text formats are the same as HbMessageBox::setText().
 
-    \param text Message text.
+    \param text Message box text.
 
-    \sa text()
+    \sa text(), HbMessageBox::setText()
 */
 void HbDeviceMessageBox::setText(const QString &text)
 {
@@ -780,7 +916,7 @@
 }
 
 /*!
-    Returns text of the dialog.
+    Returns message box text.
 
     \sa setText()
 */
@@ -839,10 +975,9 @@
 }
 
 /*!
-    Sets the timeout property in milliseconds.
-    If timeout <= 0 then the note is permanent and not closed automatically.
+    Sets message box timeout.
 
-    \param timeout Timeout in milliseconds.
+    \param timeout Timeout in milliseconds. 0 denotes no timeout (infinite).
 
     \sa timeout() setTimeout(HbPopup::DefaultTimeout)
 */
@@ -854,8 +989,8 @@
 }
 
 /*!
-    This is a convenience overload of \a timeout() for setting HbPopup::DefaultTimeout values
-    to achive common look & feel.
+    Sets timeout to one of HbPopup::DefaultTimeout values. Helps achieving
+    common look and feel of message boxes.
 
     \param timeout Timeout as an enumerated constant.
 
@@ -869,9 +1004,9 @@
 }
 
 /*!
-    Returns the timeout property in milliseconds.
-    If this property is not set the default is HbPopup::StandardTimeout except for
-    HbMessageBox::MessageTypeQuestion type of message box for which default is HbPopup::NoTimeout.
+    Returns message box timeout in milliseconds. Default value depends on message box type.
+    Question message box has a default of HbPopup::NoTimeout. All other boxes, the default is
+    HbPopup::StandardTimeout.
 
     \sa setTimeout()
 */
@@ -881,9 +1016,9 @@
 }
 
 /*!
-    Sets the dismiss policy for the dialog.
+    Sets message box dismiss policy.
 
-    \param dismissPolicy Dismiss policy of the message box.
+    \param dismissPolicy Dismiss policy.
 
     \sa dismissPolicy()
 */
@@ -895,9 +1030,8 @@
 }
 
 /*!
-    Returns the dismiss policy of the dialog.
-    Default is HbPopup::TapAnywhere except for HbMessageBox::MessageTypeQuestion type of
-    message box for which default is HbPopup::NoDismiss.
+    Returns dismiss policy of a message box. Default depends on message box type.
+    Question box has default HbPopup::NoDismiss and all other boxes HbPopup::TapAnywhere.
 
     \sa setDismissPolicy()
 */
@@ -908,7 +1042,7 @@
 }
 
 /*!
-    Sets animation definition to a dialog. Animation's logical name has to be set
+    Sets animation a message box. Animation's logical name has to be set
     using setIcon(). Animation definition files must be stored to a place where they
     can be accessed by device dialog service.
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/devicedialogs/hbdevicemessagebox.h
--- a/src/hbwidgets/devicedialogs/hbdevicemessagebox.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicemessagebox.h	Tue Jul 06 14:36:53 2010 +0300
@@ -38,6 +38,7 @@
     Q_OBJECT
 
     Q_PROPERTY(HbMessageBox::MessageBoxType messageBoxType READ messageBoxType WRITE setMessageBoxType)
+    Q_PROPERTY(HbMessageBox::StandardButtons standardButtons READ standardButtons WRITE setStandardButtons)
     Q_PROPERTY(QString text READ text WRITE setText)
     Q_PROPERTY(QString iconName READ iconName WRITE setIconName)
     Q_PROPERTY(bool iconVisible READ iconVisible WRITE setIconVisible)
@@ -53,18 +54,19 @@
 
 public:
     explicit HbDeviceMessageBox(
-        HbMessageBox::MessageBoxType type = HbMessageBox::MessageTypeInformation,
+        HbMessageBox::MessageBoxType type = HbMessageBox::MessageTypeNone,
         QObject *parent = 0);
     explicit HbDeviceMessageBox(const QString &text,
-        HbMessageBox::MessageBoxType type = HbMessageBox::MessageTypeInformation,
+        HbMessageBox::MessageBoxType type = HbMessageBox::MessageTypeNone,
         QObject *parent=0);
     virtual ~HbDeviceMessageBox();
 
     static bool question(
         const QString &text,
-        const QString &acceptButtonText = QString(),
-        const QString &rejectButtonText = QString());
-
+        const QString &acceptButtonText,
+        const QString &rejectButtonText);
+    static bool question(const QString &text, HbMessageBox::StandardButtons buttons =
+        HbMessageBox::Yes|HbMessageBox::No);
     static void information(const QString &text);
     static void warning(const QString &text);
 
@@ -78,6 +80,9 @@
     void setMessageBoxType(HbMessageBox::MessageBoxType type);
     HbMessageBox::MessageBoxType messageBoxType() const;
 
+    void setStandardButtons(HbMessageBox::StandardButtons buttons);
+    HbMessageBox::StandardButtons standardButtons() const;
+
     void setText(const QString &text);
     QString text() const;
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/devicedialogs/hbdevicemessagebox_p.h
--- a/src/hbwidgets/devicedialogs/hbdevicemessagebox_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicemessagebox_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -38,6 +38,7 @@
 
     enum PropertySelector {
         Type,
+        StandardButtons,
         Text,
         IconName,
         IconVisible,
@@ -77,8 +78,10 @@
     void exec();
 
     void init();
+    void initAction(int index);
     void initProperties();
     void setAction(ActionSelector select, QAction *action);
+    void setStandardButtons(HbMessageBox::StandardButtons buttons);
     void sendToServer(bool show = false);
     bool propertiesModified() const;
     void clearAction(Action &action);
@@ -86,6 +89,7 @@
     void setProperty(PropertySelector propertySelector, const QString &value);
 
     static int timeoutValue(HbPopup::DefaultTimeout timeout);
+    static int countBits(unsigned int value);
     static ActionSelector actionSelector(HbDeviceMessageBox::ActionRole role);
 
     void scheduleUpdateEvent();
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.cpp
--- a/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -80,6 +80,7 @@
         EType = EFirstIntProperty,
         EIconVisible,
         ETimeout,
+        EStandardButtons,
         EDismissPolicy,
         ELastIntProperty = EDismissPolicy,
         EFirstStringProperty,
@@ -100,12 +101,14 @@
     void SetPropertyValue(TPropertyId aId, TInt aValue);
     void SetButtonNull(CHbDeviceMessageBoxSymbian::TButtonId aButtonId, bool aValue);
     void SetButtonTextL(CHbDeviceMessageBoxSymbian::TButtonId aButtonId, const TDesC &aValue);
+    void SetStandardButtons(TUint aButtons);
     void SendToServerL(bool aShow = false);
     void Close();
     bool WaitForClosed();
     static const TPtrC PropertyName(TPropertyId aId);
     static TPropertyId ButtonPropertyId(TPropertyId aId, CHbDeviceMessageBoxSymbian::TButtonId aButtonId);
     static HBufC *CreateActionDataLC(TBool aNull, const TDesC &text);
+    static TInt CountBits(TUint aValue);
 
 public: // MHbDeviceDialogObserver
     void DataReceived(CHbSymbianVariantMap& aData);
@@ -250,12 +253,21 @@
     mProperties[EIconVisible].Set(ETrue);
 
     switch(aType) {
+    case CHbDeviceMessageBoxSymbian::ENone:
+        mProperties[EIconVisible].Set(EFalse);
+        // Fall through
     case CHbDeviceMessageBoxSymbian::EInformation:
     case CHbDeviceMessageBoxSymbian::EWarning: {
         const TInt KStandardTimeout = 3000; // 3s
         mProperties[ETimeout].Set(KStandardTimeout);
         const TInt KTapAnywhere = 0x03; // HbPopup::TapAnywhere
         mProperties[EDismissPolicy].Set(KTapAnywhere);
+        // Initialize standard buttons but do not send to server as
+        // HbMessageBox sets standard buttons by default
+        const TInt KStandardButtons = 0x00000400; // Ok
+        mProperties[EStandardButtons].Set(KStandardButtons);
+        mProperties[EStandardButtons].SetModified(false);
+        mProperties[EStandardButtons].SetValid(false);
 
         // Plugin has accept button by default
         mProperties[ERejectText].SetNullAction(true);
@@ -266,6 +278,10 @@
         mProperties[ETimeout].Set(KNoTimeout);
         const TInt KNoDismiss = 0; // HbPopup::NoDismiss
         mProperties[EDismissPolicy].Set(KNoDismiss);
+        // Initialize standard buttons and send to server as
+        // HbMessageBox currently sets standard buttons to "Ok" by default
+        const TInt KStandardButtons = 0x00002000|0x00010000; // Yes|No
+        mProperties[EStandardButtons].Set(KStandardButtons);
         break;
     }
     default:
@@ -314,6 +330,35 @@
     mProperties[id].SetL(aValue);
 }
 
+// Set standard buttons property
+void CHbDeviceMessageBoxPrivate::SetStandardButtons(TUint aButtons)
+{
+    static const CHbDeviceMessageBoxSymbian::TButtonId buttonIds[] = {
+        CHbDeviceMessageBoxSymbian::EAcceptButton, CHbDeviceMessageBoxSymbian::ERejectButton
+    };
+    const TInt KNumButtonIds = sizeof(buttonIds) / sizeof(buttonIds[0]);
+    TInt buttonCount = Min(KNumButtonIds, CountBits(aButtons));
+    // Mark buttons present
+    TInt i = 0;
+    for(; i < buttonCount; i++) {
+        TPropertyId id = ButtonPropertyId(EAcceptText, buttonIds[i]);
+        // Set property value but don't send to server
+        mProperties[id].SetNullAction(false);
+        mProperties[id].SetValid(false);
+        mProperties[id].SetModified(false);
+    }
+    // Mark extra buttons not present
+    for(; i < KNumButtonIds; i++) {
+        TPropertyId id = ButtonPropertyId(EAcceptText, buttonIds[i]);
+        // Set property value but don't send to server
+        mProperties[id].SetNullAction(true);
+        mProperties[id].SetValid(false);
+        mProperties[id].SetModified(false);
+    }
+    SetPropertyValue(EStandardButtons, aButtons);
+
+}
+
 // Send properties to server. Show or update.
 void CHbDeviceMessageBoxPrivate::SendToServerL(bool aShow)
 {
@@ -400,6 +445,7 @@
         L"type",
         L"iconVisible",
         L"timeout",
+        L"standardButtons",
         L"dismissPolicy",
         L"text",
         L"iconName",
@@ -444,6 +490,17 @@
     return actionData;
 }
 
+// Count number of bits on
+TInt CHbDeviceMessageBoxPrivate::CountBits(TUint aValue)
+{
+    TInt count = 0;
+    while(aValue) {
+        count += aValue & 1;
+        aValue >>= 1;
+    }
+    return count;
+}
+
 // Observer, data received from device message box
 void CHbDeviceMessageBoxPrivate::DataReceived(CHbSymbianVariantMap& aData)
 {
@@ -520,8 +577,9 @@
     change, e.g. objects may get deleted. Preferred way is to use asynchoronous ShowL() instead.
 
     Device message box is closed when user dismisses it, when Close()
-    is called, timeout triggers or system closes the dialog. Default return value is a reject
-    button. The default is returned in all other cases than user pressing an accept button.
+    is called, timeout triggers or system closes the dialog. Default return value is
+    CHbDeviceMessageBoxSymbian::EInvalidButton. The default is returned in all other cases
+    than user pressing an accept or reject button.
 
     Static convenience functions are provided for ease of use. Message boxes created by these
     static functions contain a default set of properties depending on the message box type and their
@@ -559,7 +617,7 @@
 
     _LIT(KText, "Accept connection ?");
     CHbDeviceMessageBoxSymbian::TButtonId selection =
-        CHbDeviceMessageBoxSymbian::QuestionL(KText, KNullDesC, KNullDesC);
+        CHbDeviceMessageBoxSymbian::QuestionL(KText);
     if (selection == CHbDeviceMessageBoxSymbian::EAcceptButton) {
         // user pressed yes
     }
@@ -618,6 +676,10 @@
     Predefined device message boxes.
 */
 /*!
+    \var CHbDeviceMessageBoxSymbian::TType CHbDeviceMessageBoxSymbian::ENone
+    Message box with no icon and audio defined by default.
+*/
+/*!
     \var CHbDeviceMessageBoxSymbian::TType CHbDeviceMessageBoxSymbian::EInformation
     Information message box.
 */
@@ -635,6 +697,10 @@
     Selects message box button.
 */
 /*!
+    \var CHbDeviceMessageBoxSymbian::TButtonId CHbDeviceMessageBoxSymbian::EInvalidButton
+    No button.
+*/
+/*!
     \var CHbDeviceMessageBoxSymbian::TButtonId CHbDeviceMessageBoxSymbian::EAcceptButton
     Accept button.
 */
@@ -704,10 +770,9 @@
     <b> Beware that Symbian event processing is running while the function executes. For example
     application may have exited when the function returns.</b>
 
-
     \param aText Message box text.
-    \param aAcceptButtonText Accept button text. If text is empty, default text is used.
-    \param aRejectButtonText Reject button text. If text is empty, default text is used.
+    \param aAcceptButtonText Accept button text. If text is empty, a default (Yes) button is used.
+    \param aRejectButtonText Reject button text. If text is empty, a default (No) button is used.
 */
 EXPORT_C CHbDeviceMessageBoxSymbian::TButtonId CHbDeviceMessageBoxSymbian::QuestionL(
     const TDesC& aText, const TDesC& aAcceptButtonText, const TDesC& aRejectButtonText)
@@ -715,6 +780,7 @@
     CHbDeviceMessageBoxSymbian* messageBox = NewL(EQuestion);
     CleanupStack::PushL(messageBox);
     messageBox->SetTextL(aText);
+    messageBox->SetStandardButtons(0x00002000|0x00010000); // Yes|No
     if (aAcceptButtonText.Length()) {
         messageBox->SetButtonTextL(EAcceptButton, aAcceptButtonText);
     }
@@ -727,6 +793,33 @@
 }
 
 /*!
+    Static convenience function to create and show a question device message box. Waits for
+    the message box to close and returns button selected. If message box was closed for other
+    reason than button press, returns EInvalidButton.
+
+    <b> Beware that Symbian event processing is running while the function executes. For example
+    application may have exited when the function returns.</b>
+
+    \param aText Message box text.
+    \param aStandardButtons Specifies message box buttons. If 0, default buttons "Yes" and "No" are
+    used. See SetStandardButtons() for format.
+*/
+EXPORT_C CHbDeviceMessageBoxSymbian::TButtonId CHbDeviceMessageBoxSymbian::QuestionL(
+    const TDesC& aText, TUint aStandardButtons)
+{
+    CHbDeviceMessageBoxSymbian* messageBox = NewL(EQuestion);
+    CleanupStack::PushL(messageBox);
+    messageBox->SetTextL(aText);
+    if (!aStandardButtons) {
+        aStandardButtons = 0x00002000|0x00010000; // Yes|No
+    }
+    messageBox->SetStandardButtons(aStandardButtons);
+    TButtonId buttonId = messageBox->ExecL();
+    CleanupStack::PopAndDestroy(); // messageBox
+    return buttonId;
+}
+
+/*!
     Static convenience function to create and show an information device message box.
 
     \param aText Message box text.
@@ -1042,6 +1135,32 @@
 }
 
 /*!
+    Sets message box buttons to standard buttons.
+
+    \param aButtons Message box buttons. A combination of flags,
+    eg. HbMessageBox::Yes | HbMessageBox::No. Button flags are scanned starting from lsb.
+    First button found goes to accept position and so forth.
+
+    \sa StandardButtons()
+*/
+EXPORT_C void CHbDeviceMessageBoxSymbian::SetStandardButtons(TUint aButtons)
+{
+    return d->SetStandardButtons(aButtons);
+}
+
+/*!
+    Returns standard buttons set to a message box. A default value for question message box is
+    HbMessageBox::Yes|HbMessageBox::No. For all other message box types the default is
+    HbMessageBox::Ok.
+
+    \sa SetStandardButtons()
+*/
+EXPORT_C TUint CHbDeviceMessageBoxSymbian::StandardButtons() const
+{
+    return d->mProperties[CHbDeviceMessageBoxPrivate::EStandardButtons].IntValue();
+}
+
+/*!
     Sets message box observer. The observer is called when message box closes.
 
     \param aObserver Pointer to observer or null.
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.h
--- a/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.h	Tue Jul 06 14:36:53 2010 +0300
@@ -37,6 +37,7 @@
 {
 public:
     enum TType {
+        ENone,
         EInformation,
         EQuestion,
         EWarning
@@ -50,12 +51,13 @@
 
 public:
 
-    IMPORT_C static CHbDeviceMessageBoxSymbian* NewL(TType aType = EInformation,
+    IMPORT_C static CHbDeviceMessageBoxSymbian* NewL(TType aType = ENone,
         MHbDeviceMessageBoxObserver *aObserver = 0);
     IMPORT_C ~CHbDeviceMessageBoxSymbian();
 
     IMPORT_C static TButtonId QuestionL(const TDesC& aText,
         const TDesC& aAcceptButtonText, const TDesC& aRejectButtonText);
+    IMPORT_C static TButtonId QuestionL(const TDesC& aText, TUint aStandardButtons = 0);
     IMPORT_C static void InformationL(const TDesC& aText);
     IMPORT_C static void WarningL(const TDesC& aText);
 
@@ -91,6 +93,9 @@
     IMPORT_C void SetButton(TButtonId aButton, TBool aEnable);
     IMPORT_C TBool HasButton(TButtonId aButton) const;
 
+    IMPORT_C void SetStandardButtons(TUint aButtons);
+    IMPORT_C TUint StandardButtons() const;
+
     IMPORT_C void SetObserver(MHbDeviceMessageBoxObserver *aObserver);
 
 private:
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/editors/hbabstractedit.cpp
--- a/src/hbwidgets/editors/hbabstractedit.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/editors/hbabstractedit.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -36,13 +36,13 @@
 #include "hbmenu.h"
 #include "hbaction.h"
 #include "hbselectioncontrol_p.h"
-#include "hbmeshlayout_p.h"
 #include "hbsmileyengine_p.h"
 #include "hbinputeditorinterface.h"
 #include "hbfeaturemanager_r.h"
 #include "hbtextmeasurementutility_p.h"
 #include "hbtapgesture.h"
 #include "hbpangesture.h"
+#include "hbnamespace_p.h"
 
 #include <QApplication>
 #include "hbpopup.h"
@@ -54,6 +54,7 @@
 #include <QAbstractTextDocumentLayout>
 #include <QClipboard>
 #include <QInputContext>
+#include <QGraphicsScene>
 
 /*!
     \class HbAbstractEdit
@@ -201,6 +202,8 @@
 */
 bool HbAbstractEdit::event(QEvent* event)
 {
+    Q_D(HbAbstractEdit);
+
     if(event->type() ==  QEvent::DynamicPropertyChange) {
         const QString p = static_cast<QDynamicPropertyChangeEvent *>(event)->propertyName();
         if(p == "SmileyIcon") {
@@ -223,7 +226,15 @@
 
             d->cursorChanged(HbValidator::CursorChangeFromContentUpdate);
         }
+    } else { //HbEvent handler
+        if (event->type() == HbEvent::InputMethodFocusIn) {
+            d->setInputFocusEnabled(true);
+            
+        } else if (event->type() == HbEvent::InputMethodFocusOut) {
+            d->setInputFocusEnabled(false);
+        }
     }
+
     return HbWidget::event(event);
 }
 
@@ -243,6 +254,10 @@
         return QVariant(block.text());
     case Qt::ImCurrentSelection:
         return QVariant(d->cursor.selectedText());
+    case Qt::ImMaximumTextLength:
+        return QVariant(); // No limit.
+    case Qt::ImAnchorPosition:
+        return QVariant(qBound(0, d->cursor.anchor() - block.position(), block.length()));
     default:
         return QVariant();
     }
@@ -330,7 +345,7 @@
         d->_q_contentsChanged();
     }
 
-    if(hasFocus()) {
+    if(d->hasInputFocus()) {
         d->cursorOn = true;
     }
     d->ensureCursorVisible();
@@ -478,15 +493,9 @@
     if (d->interactionFlags & Qt::NoTextInteraction)
         return;
 
-    update(d->selectionRect());
-
-    if (d->interactionFlags & Qt::TextEditable) {
-        d->setBlinkingCursorEnabled(true);
-    } else {
-        d->cursorOn = (d->interactionFlags & Qt::TextSelectableByKeyboard);
-    }
-
-    d->openInputPanel();        
+    // It sets the cursor the focus item's depending on if
+    // the input panel is connceted or not
+    d->setInputFocusEnabled(d->hasInputFocus());
 
     event->accept();
 }
@@ -503,8 +512,9 @@
     if (d->interactionFlags & Qt::NoTextInteraction)
         return;
 
-    d->setBlinkingCursorEnabled(false);
-    d->repaintOldAndNewSelection(d->selectionCursor);
+    // It sets the cursor the focus item's depending on if
+    // the input panel is connceted or not
+    d->setInputFocusEnabled(d->hasInputFocus());
 
     event->accept();
 }
@@ -556,7 +566,7 @@
 
     deselect();
 
-    if(hasFocus() && !isReadOnly() && !panel()) {
+    if(d->hasInputFocus() && !isReadOnly() && !panel()) {
         d->closeInputPanel();
     }
 }
@@ -657,6 +667,10 @@
     d->setTextInteractionFlags(f);
 
     setFlag(QGraphicsItem::ItemAcceptsInputMethod, !value);
+
+    if (value && d->hasInputFocus()) {
+        d->closeInputPanel();
+    }
 }
 
 /*!
@@ -696,9 +710,11 @@
         HbWidget::updatePrimitives();
 
         if (d->scrollArea) {
-            d->doc->setTextWidth(d->scrollArea->size().width());
-            if(d->placeholderDoc) {
-                d->placeholderDoc->setTextWidth(d->scrollArea->size().width());
+            if(!qFuzzyCompare(d->doc->textWidth(), d->scrollArea->size().width())){
+                d->doc->setTextWidth(d->scrollArea->size().width());
+                if(d->placeholderDoc) {
+                    d->placeholderDoc->setTextWidth(d->scrollArea->size().width());
+                }
             }
         }
         QRectF canvasGeom(QRectF(QPointF(0,0),d->doc->size()));
@@ -1278,12 +1294,20 @@
     Q_D(HbAbstractEdit);
     HbMenu *menu = createContextMenu();
 
+    QTextBlock block = d->cursor.block();
+    QTextLayout *layout = block.layout();
+    if(layout && !layout->preeditAreaText().isEmpty())
+    {
+        // there's pre-edit text present, it needs to be commited 1st
+        if(qApp->inputContext()) {
+            qApp->inputContext()->reset();
+        }
+    }
+
     if (!menu) {
         menu = new HbMenu();
     }
 
-    menu->setAttribute(Hb::InputMethodNeutral);
-
     if (d->cursor.hasSelection() && d->canCut()) {
         connect(
             menu->addAction(hbTrId("txt_common_menu_cut")), SIGNAL(triggered()),
@@ -1321,7 +1345,7 @@
     emit aboutToShowContextMenu(menu, d->tapPosition);
 
     if(menu->actions().count() > 0){
-        d->minimizeInputPanel();
+//        d->minimizeInputPanel();
         menu->setPreferredPos(position);
         menu->show();
     }
@@ -1674,15 +1698,23 @@
         QPointF pos = mapFromScene(event->mapToGraphicsScene(tap->position()));
         switch(tap->state()) {
         case Qt::GestureStarted:
+            scene()->setProperty(HbPrivate::OverridingGesture.latin1(),Qt::TapGesture);
+            if (!tap->property(HbPrivate::ThresholdRect.latin1()).toRect().isValid()) {
+                tap->setProperty(HbPrivate::ThresholdRect.latin1(), mapRectToScene(boundingRect()).toRect());
+            }
+
             d->tapPosition = pos;
             HbWidgetFeedback::triggered(this, Hb::InstantPressed);
             break;
         case Qt::GestureUpdated:
             if(tap->tapStyleHint() == HbTapGesture::TapAndHold) {
-                d->longTapGesture(pos);
+                d->openInputPanel();
+                d->longTapGesture(pos);                
             }
             break;
       case Qt::GestureFinished:
+            scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
+
             if(tap->tapStyleHint() == HbTapGesture::TapAndHold) {
             } else {
                 d->tapGesture(pos);
@@ -1694,6 +1726,8 @@
             
             break;
       case Qt::GestureCanceled:
+            scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
+
             break;
       default:
             break;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/editors/hbabstractedit_p.cpp
--- a/src/hbwidgets/editors/hbabstractedit_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/editors/hbabstractedit_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -39,7 +39,6 @@
 #include "hbstyleoption_p.h"
 #include "hbscrollarea.h"
 #include "hbvalidator.h"
-#include "hbmeshlayout_p.h"
 #include "hbmenu.h"
 #include "hbselectioncontrol_p.h"
 #include "hbcolorscheme.h"
@@ -48,6 +47,9 @@
 #include "hbfeaturemanager_r.h"
 #include "hbinputeditorinterface.h"
 #include "hbinputvkbhost.h"
+#include "hbinputmethod.h"
+#include "hbinputfocusobject.h"
+
 
 #include <QValidator>
 #include <QTextLayout>
@@ -95,6 +97,7 @@
 
     HbEditItem(HbAbstractEdit *parent) : HbWidget(parent), edit(parent)
     {
+    	setFlag(QGraphicsItem::ItemUsesExtendedStyleOption, true);
     };
 
     virtual ~HbEditItem() {};
@@ -377,7 +380,7 @@
     }
 
     cursor.setPosition(pos, mode);
-
+    ensureCursorVisible();
     cursorChanged(HbValidator::CursorChangeFromMouse);
 }
 
@@ -581,13 +584,11 @@
 
 void HbAbstractEditPrivate::setTextInteractionFlags(Qt::TextInteractionFlags flags)
 {
-    Q_Q(HbAbstractEdit);
-
     if (flags == interactionFlags)
         return;
     interactionFlags = flags;
 
-    if (q->hasFocus()) {
+    if (hasInputFocus()) {
         setBlinkingCursorEnabled(flags & Qt::TextEditable);
     }
 }
@@ -777,7 +778,7 @@
     if (cursor.hasSelection()) {
         QAbstractTextDocumentLayout::Selection selection;
         selection.cursor = cursor;
-        QPalette::ColorGroup cg = q->hasFocus() ? QPalette::Active : QPalette::Inactive;
+        QPalette::ColorGroup cg = hasInputFocus() ? QPalette::Active : QPalette::Inactive;
         selection.format.setBackground(ctx.palette.brush(cg, QPalette::Highlight));
         selection.format.setForeground(ctx.palette.brush(cg, QPalette::HighlightedText));
 
@@ -1078,16 +1079,24 @@
     } else {
         // Currently focused widget to listen to InputContext before updating the cursor position
         sendMouseEventToInputContext(point);
+
+        // translate the point to have the Y ccordinate inside the viewport
+        QPointF translatedPoint(point);
+        if(translatedPoint.y() < viewPortRect().top()) {
+            translatedPoint.setY(viewPortRect().top() + 1);
+        } else if(translatedPoint.y() > viewPortRect().bottom()){
+            translatedPoint.setY(viewPortRect().bottom() - 1);
+        }
+
         // need to get the cursor position again since input context can change the document
-        newCursorPos = hitTest(point, Qt::FuzzyHit);
+        newCursorPos = hitTest(translatedPoint, Qt::FuzzyHit);
         setCursorPosition(newCursorPos);
 
         if (interactionFlags & Qt::TextEditable) {
             updateCurrentCharFormat();
         }
-        cursorChanged(HbValidator::CursorChangeFromMouse);
 
-        QString anchor(q->anchorAt(point));
+        QString anchor(q->anchorAt(translatedPoint));
         if(!anchor.isEmpty()) {
             emit q->anchorTapped(anchor);
         }
@@ -1234,16 +1243,27 @@
     sendInputPanelEvent(QEvent::CloseSoftwareInputPanel);
 }
 
-#include "hbinputeditorinterface.h"
-#include "hbinputvkbhost.h"
-
-void HbAbstractEditPrivate::minimizeInputPanel()
+bool HbAbstractEditPrivate::hasInputFocus() const
 {
-    Q_Q(HbAbstractEdit);
+    Q_Q(const HbAbstractEdit);
+
+    HbInputMethod* inputMethod = HbInputMethod::activeInputMethod();
+    if (inputMethod && inputMethod->focusObject() &&
+        qobject_cast<HbAbstractEdit*>(inputMethod->focusObject()->object()) == q) {
+        return true;
+    }
+    return false;
+}
 
-    HbEditorInterface ei(q);
-    HbVkbHost* vkbHost = ei.vkbHost();
-    vkbHost->minimizeKeypad();
+void HbAbstractEditPrivate::setInputFocusEnabled(bool enable)
+{
+    QGraphicsItem *focusItem = focusPrimitive(HbWidget::FocusHighlightActive);
+    if (focusItem) {
+        focusItem->setVisible(enable);
+    }
+
+    setBlinkingCursorEnabled(enable);
+    repaintOldAndNewSelection(selectionCursor);
 }
 
 #include "moc_hbabstractedit.cpp"
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/editors/hbabstractedit_p.h
--- a/src/hbwidgets/editors/hbabstractedit_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/editors/hbabstractedit_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -137,7 +137,8 @@
     void sendInputPanelEvent(QEvent::Type type);
     void openInputPanel();
     void closeInputPanel();
-    void minimizeInputPanel();
+    bool hasInputFocus() const;
+    void setInputFocusEnabled(bool enable);
 
     int contentLength() const;
     bool hasAcceptableInput() const;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/editors/hbdatetimeedit.cpp
--- a/src/hbwidgets/editors/hbdatetimeedit.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/editors/hbdatetimeedit.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -30,6 +30,7 @@
 #include "hbdatetimevalidator_p.h"
 #include "hbdatetimeedit.h"
 #include "hbdatetimeedit_p.h"
+#include "hbevent.h"
 
 /*!
     @alpha
@@ -234,26 +235,14 @@
 /*!
     \reimp
 */
-void HbDateTimeEdit::focusOutEvent(QFocusEvent *event)
+bool HbDateTimeEdit::event(QEvent* event)
 {
     Q_D(HbDateTimeEdit);
 
-    if(d->validator->fixDate(&d->cursor, true)) {
-        // fixing so restore focus to editor
-        // do it asynchronously by private slot:
-        int metodIndex = metaObject()->indexOfMethod("_q_regainFocus()");
-        if (metodIndex<0) {
-            qWarning("HbDateTimeEdit::focusOutEvent private method "
-                     "_q_regainFocus() NOT FOUND");
-        } else {
-            if (!metaObject()->method(metodIndex).invoke(this, Qt::QueuedConnection)) {
-                qWarning("HbDateTimeEdit::focusOutEvent failed to call "
-                         "private method _q_regainFocus()");
-            }
-        }
-        // prevent emmiting signal editingFinished so omnit HbLineEdit
-        HbAbstractEdit::focusOutEvent(event);
-    } else {
-        HbLineEdit::focusOutEvent(event);
+    if (event->type() == HbEvent::InputMethodFocusOut) {
+        d->validator->fixDate(&d->cursor, true);
     }
+
+    return HbLineEdit::event(event);
 }
+
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/editors/hbdatetimeedit.h
--- a/src/hbwidgets/editors/hbdatetimeedit.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/editors/hbdatetimeedit.h	Tue Jul 06 14:36:53 2010 +0300
@@ -65,17 +65,17 @@
     void setTimeFormat(const QLocale& locale = QLocale());
     void setDateTimeFormat(const QLocale& locale = QLocale());
 
+    bool event(QEvent* event);
+
 protected:
     HbDateTimeEdit (HbDateTimeEditPrivate &dd, QGraphicsItem *parent);
 
     void setMaxLength (int length);
     void setText (const QString &text);
-    void focusOutEvent(QFocusEvent *event);
 
 private:
     Q_DISABLE_COPY(HbDateTimeEdit)
     Q_DECLARE_PRIVATE_D(d_ptr, HbDateTimeEdit)
-    Q_PRIVATE_SLOT(d_func(), void _q_regainFocus())
 };
 
 #endif // HBDATETIMEEDIT_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/editors/hbdatetimeedit_p.cpp
--- a/src/hbwidgets/editors/hbdatetimeedit_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/editors/hbdatetimeedit_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -125,9 +125,4 @@
     HbLineEditPrivate::_q_textChanged();
 }
 
-void HbDateTimeEditPrivate::_q_regainFocus()
-{
-    q_ptr->setFocus(Qt::OtherFocusReason);
-}
-
 #include <moc_hbdatetimeedit.cpp>
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/editors/hbdatetimeedit_p.h
--- a/src/hbwidgets/editors/hbdatetimeedit_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/editors/hbdatetimeedit_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -59,7 +59,6 @@
     void init(const QDateTime &dateTime);
 
     virtual void _q_textChanged();
-    void _q_regainFocus();
 
     QDateTime dateTime;
     HbDateTimeValidator *validator;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/editors/hblineedit.cpp
--- a/src/hbwidgets/editors/hblineedit.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/editors/hblineedit.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -32,12 +32,14 @@
 #include "hbtextmeasurementutility_p.h"
 #include "hbfeaturemanager_r.h"
 #endif //HB_TEXT_MEASUREMENT_UTILITY
+#include "hbevent.h"
 
 #include <QFontMetrics>
 #include <QPainter>
 #include <QTextBlock>
 #include <QTextDocument>
 #include <QGraphicsSceneResizeEvent>
+#include <QGraphicsLinearLayout>
 
 /*!
  \class HbLineEdit
@@ -283,7 +285,8 @@
 {
     Q_D(HbLineEdit);
     
-    if(d->echoMode == HbLineEdit::PasswordEchoOnEdit && d->clearOnEdit) {
+    if((!e->commitString().isEmpty() || e->replacementLength()) &&
+         d->echoMode == HbLineEdit::PasswordEchoOnEdit && d->clearOnEdit) {
         d->doc->clear();
         d->passwordText.clear();
         d->clearOnEdit = false;
@@ -311,6 +314,21 @@
     HbAbstractEdit::inputMethodEvent(e);
 }
 
+
+/*!
+ \reimp
+*/
+QVariant HbLineEdit::inputMethodQuery(Qt::InputMethodQuery property) const
+{
+    switch(property) {
+    case Qt::ImMaximumTextLength:
+        return QVariant(maxLength());
+    default:
+        return HbAbstractEdit::inputMethodQuery(property);
+    }
+}
+
+
 /*!
  \reimp
 */
@@ -357,7 +375,7 @@
     Q_D(HbLineEdit);
 
     if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) {
-        emit editingFinished();
+        d->editingFinished();
     }
 
     if(d->forwardKeyEvent(event)) {
@@ -635,15 +653,7 @@
  */
 void HbLineEdit::focusOutEvent(QFocusEvent * event)
 {
-    Q_D(HbLineEdit);
-
-    if(echoMode() == HbLineEdit::PasswordEchoOnEdit) {
-        setPlainText(d->passwordString(d->passwordText));
-    }
-
-    HbAbstractEdit::focusOutEvent(event);
-
-    emit editingFinished();
+    HbAbstractEdit::focusOutEvent(event);  
 }
 
 /*!
@@ -651,13 +661,6 @@
  */
 void HbLineEdit::focusInEvent(QFocusEvent * event)
 {
-    Q_D(HbLineEdit);
-
-    if(echoMode() == HbLineEdit::PasswordEchoOnEdit) {
-        // we need to clear the editor when typing starts
-        d->clearOnEdit = true;
-    }
-
     HbAbstractEdit::focusInEvent(event);
 }
 
@@ -690,6 +693,29 @@
 }
 
 /*!
+    \reimp
+*/
+bool HbLineEdit::event(QEvent* event)
+{
+    Q_D(HbLineEdit);
+
+    if (event->type() == HbEvent::InputMethodFocusIn) {
+        if(echoMode() == HbLineEdit::PasswordEchoOnEdit) {
+            // we need to clear the editor when typing starts
+            d->clearOnEdit = true;
+        }
+        d->showCustomAutoCompPopup();
+    } else if (event->type() == HbEvent::InputMethodFocusOut) {
+        d->hideCustomAutoCompPopup();
+        d->editingFinished();
+    }
+
+    return HbAbstractEdit::event(event);
+}
+
+
+
+/*!
     @proto
 
     Returns true if vertical font streach mode is active.
@@ -715,3 +741,35 @@
     }
     return HbAbstractEdit::eventFilter(obj, event);
 }
+
+/*!
+    set content of custum auto-complate pupup.
+ */
+void HbLineEdit::setAutoCompleteContent(QGraphicsLayoutItem *content)
+{
+    Q_D(HbLineEdit);
+
+    if (!d->mCustomAutoCompPopup) {
+        d->createCustomAutoCompPopup();
+        repolish();
+    }
+
+    if (d->mCustomAutoCompContent!=content) {
+        if (d->mCustomAutoCompContent) {
+            delete d->mCustomAutoCompContent;
+        }
+
+        d->mCustomAutoCompContent = content;
+
+        if (content->isLayout()) {
+            d->mCustomAutoCompPopup->setLayout(static_cast<QGraphicsLayout *>(content));
+        } else {
+            QGraphicsLinearLayout *linLayout = new QGraphicsLinearLayout(Qt::Horizontal,
+                                                                         d->mCustomAutoCompPopup);
+            linLayout->addItem(content);
+        }
+        if (hasFocus()) {
+            d->showCustomAutoCompPopup();
+        }
+    }
+}
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/editors/hblineedit.h
--- a/src/hbwidgets/editors/hblineedit.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/editors/hblineedit.h	Tue Jul 06 14:36:53 2010 +0300
@@ -94,6 +94,10 @@
     bool adjustFontSizeToFitHeight() const;
     void setAdjustFontSizeToFitHeight(bool active);
 
+    bool event(QEvent* event);
+
+    void setAutoCompleteContent(QGraphicsLayoutItem *content);
+
 public slots:
     void setText(const QString &text);
 
@@ -106,6 +110,7 @@
     HbLineEdit(HbLineEditPrivate &dd, QGraphicsItem *parent);
 
     void inputMethodEvent(QInputMethodEvent *event);
+    QVariant inputMethodQuery(Qt::InputMethodQuery) const;
     void keyPressEvent(QKeyEvent *event);
     void keyReleaseEvent(QKeyEvent *event);
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/editors/hblineedit_p.cpp
--- a/src/hbwidgets/editors/hblineedit_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/editors/hblineedit_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -36,7 +36,6 @@
 
 #include "hblineedit_p.h"
 #include "hblineedit.h"
-#include "hbmeshlayout_p.h"
 #include "hbcolorscheme.h"
 
 #include <QTextDocument>
@@ -58,7 +57,9 @@
     clearOnEdit(false),
     emitTextChanged(true),
     adjustFontSizeToFitHeight(false),
-    stretchedToLineCount(-1)
+    stretchedToLineCount(-1),
+    mCustomAutoCompContent(0),
+    mCustomAutoCompPopup(0)
 {
 }
 
@@ -79,12 +80,29 @@
     scrollArea->setHorizontalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff); 
     defaultWrapMode = doc->defaultTextOption().wrapMode(); // cannot be changed.
     q->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-    q->setBackgroundItem(HbStyle::P_LineEdit_frame_normal);
+    setBackgroundItem(HbStyle::P_LineEdit_frame_normal);
     q->setFocusHighlight(HbStyle::P_LineEdit_frame_highlight,HbWidget::FocusHighlightActive);
     updateWrappingMode();
 
     Q_ASSERT(scrollArea);
     scrollArea->installEventFilter(q); // needed for resize event processing
+
+    // createCustomAutoCompPopup();
+}
+
+void HbLineEditPrivate::createCustomAutoCompPopup()
+{
+    Q_Q(HbLineEdit);
+
+    mCustomAutoCompPopup = new HbPopup(q);
+    mCustomAutoCompPopup->setVisible(false);
+    mCustomAutoCompPopup->setFlag(QGraphicsItem::ItemIsPanel, true);
+    mCustomAutoCompPopup->setActive(false);
+    mCustomAutoCompPopup->setFocusPolicy(Qt::NoFocus);
+    mCustomAutoCompPopup->setBackgroundFaded(false);
+    mCustomAutoCompPopup->setDismissPolicy(HbPopup::NoDismiss);
+    mCustomAutoCompPopup->setTimeout(HbPopup::NoTimeout);
+    HbStyle::setItemName(mCustomAutoCompPopup, QString("autoCompletePopup"));
 }
 
 void HbLineEditPrivate::updatePaletteFromTheme()
@@ -177,6 +195,12 @@
     if(adjustFontSizeToFitHeight) {
         readjustStretchFont();
     }
+
+    if (doc->isEmpty()) {
+        hideCustomAutoCompPopup();
+    } else {
+        showCustomAutoCompPopup();
+    }
 }
 
 void HbLineEditPrivate::_q_textChange(int position, int charsRemoved,int charsAdded)
@@ -297,11 +321,10 @@
 
 QString HbLineEditPrivate::echoString(const QString &text)
 {
-    Q_Q(HbLineEdit);
 
     QString retText(text);
 
-    if(echoMode == HbLineEdit::Password || (echoMode == HbLineEdit::PasswordEchoOnEdit && !q->hasFocus())) {
+    if(echoMode == HbLineEdit::Password || (echoMode == HbLineEdit::PasswordEchoOnEdit && !hasInputFocus())) {
         retText = passwordString(text);
     } else if (echoMode == HbLineEdit::NoEcho) {
         retText.clear();
@@ -395,4 +418,36 @@
     }
 }
 
+void HbLineEditPrivate::showCustomAutoCompPopup()
+{
+    if (mCustomAutoCompContent) {
+        Q_ASSERT(mCustomAutoCompPopup);
+
+        if (!mCustomAutoCompPopup->isVisible() && !doc->isEmpty()) {
+            mCustomAutoCompPopup->show();
+        }
+    }
+}
+
+void HbLineEditPrivate::hideCustomAutoCompPopup()
+{
+    if (mCustomAutoCompContent) {
+        Q_ASSERT(mCustomAutoCompPopup);
+
+        if (mCustomAutoCompPopup->isVisible()) {
+            mCustomAutoCompPopup->hide();
+        }
+    }
+}
+
+void HbLineEditPrivate::editingFinished()
+{
+    Q_Q(HbLineEdit);
+
+    if(q->echoMode() == HbLineEdit::PasswordEchoOnEdit) {
+        q->setPlainText(passwordString(passwordText));
+     }
+    emit q->editingFinished();
+}
+
 #include "moc_hblineedit.cpp"
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/editors/hblineedit_p.h
--- a/src/hbwidgets/editors/hblineedit_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/editors/hblineedit_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -73,6 +73,11 @@
     int linesToBeVisible() const;
     void onResizeFontChange();
     void setVisibleRows(int rowCount);
+    void editingFinished();
+
+    void createCustomAutoCompPopup();
+    void showCustomAutoCompPopup();
+    void hideCustomAutoCompPopup();
 
     int maxLength;
     int minimumRows;
@@ -85,6 +90,8 @@
 
     bool adjustFontSizeToFitHeight;
     int stretchedToLineCount;
+    QGraphicsLayoutItem *mCustomAutoCompContent;
+    HbPopup *mCustomAutoCompPopup;
 };
 
 #endif // HBLINEEDIT_P_H
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/editors/hbselectioncontrol_p.cpp
--- a/src/hbwidgets/editors/hbselectioncontrol_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/editors/hbselectioncontrol_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -128,7 +128,9 @@
 
     q->setVisible(false);
     QGraphicsItem::GraphicsItemFlags itemFlags = q->flags();
+#if QT_VERSION >= 0x040600
     itemFlags |=  QGraphicsItem::ItemSendsGeometryChanges;
+#endif
     itemFlags &= ~QGraphicsItem::ItemIsFocusable;
     itemFlags |=  QGraphicsItem::ItemIsPanel;
     q->setFlags(itemFlags);
@@ -613,7 +615,7 @@
         switch(tap->state()) {
         case Qt::GestureStarted:
             if (d->mEdit) {
-                HbWidgetFeedback::triggered(d->mEdit, Hb::InstantPressed);
+                HbWidgetFeedback::triggered(this, Hb::InstantPressed);
             }
             break;
         case Qt::GestureUpdated:
@@ -621,7 +623,7 @@
       case Qt::GestureFinished:
             if (d->mEdit) {
                 d->tapGestureFinished(pos);
-                HbWidgetFeedback::triggered(d->mEdit, Hb::InstantReleased);
+                HbWidgetFeedback::triggered(this, Hb::InstantReleased);
             }
             break;
       case Qt::GestureCanceled:
@@ -646,7 +648,7 @@
         case Qt::GestureFinished:
             if (d->mEdit) {
                 d->panGestureFinished(pan);
-                HbWidgetFeedback::triggered(d->mEdit, Hb::InstantReleased);
+                HbWidgetFeedback::triggered(this, Hb::InstantReleased);
             }
             break;
       case Qt::GestureCanceled:
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/editors/hbsmileyengine_p.cpp
--- a/src/hbwidgets/editors/hbsmileyengine_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/editors/hbsmileyengine_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -157,6 +157,9 @@
 
 void HbSmileyEnginePrivate::insertSmileys( QTextCursor cursor, bool insertOne)
 {
+    QTextCursor initialCursor = cursor;
+    initialCursor.beginEditBlock();
+
     QString regexpStr;
     foreach (QString pattern, mSmileyTheme.patterns()) {
         regexpStr += QRegExp::escape(pattern) + "|";
@@ -172,6 +175,7 @@
         }
         cursor = mDocument->find(rx, cursor);
     }
+    initialCursor.endEditBlock();
 }
 
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/editors/hbtextedit_p.cpp
--- a/src/hbwidgets/editors/hbtextedit_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/editors/hbtextedit_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -58,7 +58,7 @@
     mTextBaseLinePen.setWidthF((qreal)1.0);
 
     q->setScrollable(true);
-    q->setBackgroundItem(HbStyle::P_TextEdit_frame_normal);
+    setBackgroundItem(HbStyle::P_TextEdit_frame_normal);
     q->setFocusHighlight(HbStyle::P_TextEdit_frame_highlight,HbWidget::FocusHighlightActive);
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/hbwidgets.pro
--- a/src/hbwidgets/hbwidgets.pro	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/hbwidgets.pro	Tue Jul 06 14:36:53 2010 +0300
@@ -74,6 +74,8 @@
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = CAP_GENERAL_DLL
     TARGET.UID3 = 0x20022FCC
+    
+    LIBS += -lsystemtoneservice
 
     # DEPLOYMENT_PLUGIN += qjpeg # TODO: Removed because this is already in qt.sis and that caused problems
     DEFINES += SYMBIAN_TARGET_ICON_CACHE_SIZE # TODO: what's this? why not use Q_OS_SYMBIAN?
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/itemviews/hbabstractitemcontainer_p.cpp
--- a/src/hbwidgets/itemviews/hbabstractitemcontainer_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemcontainer_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -27,7 +27,6 @@
 
 #include "hbabstractviewitem.h"
 #include "hbabstractitemview.h"
-#include "hbabstractitemview_p.h"
 #include "hbmodeliterator.h"
 #include <hbapplication.h>
 
@@ -481,11 +480,7 @@
         if (!delta.isNull()) {
             q->setPos(q->pos() - delta);
 
-            if (mItemView) {
-                // this will force the HbScrollArea to adjust the content correctly. Adjustment
-                // is not done in the setPos generated event handling by default to speed up scrolling.
-                HbAbstractItemViewPrivate::d_ptr(mItemView)->adjustContent();
-            }
+            adjustContent();
         }
     }
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/itemviews/hbabstractitemcontainer_p_p.h
--- a/src/hbwidgets/itemviews/hbabstractitemcontainer_p_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemcontainer_p_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -31,6 +31,7 @@
 #include "hbabstractviewitem.h"
 #include "hbabstractitemview.h"
 #include "hbmodeliterator.h"
+#include "hbabstractitemview_p.h"
 
 #include <QPersistentModelIndex>
 
@@ -95,6 +96,8 @@
 	
     inline HbModelIterator *modelIterator() const;
 
+    inline void adjustContent() const;
+
     mutable QList<HbAbstractViewItem*>  mPrototypes;
     QList<StateItem> mItemStateList;
     QHash<QPersistentModelIndex, QHash<QString, QVariant> > mItemStates;
@@ -119,6 +122,15 @@
     }
 }
 
+void HbAbstractItemContainerPrivate::adjustContent() const
+{
+    if (mItemView) {
+        // this will force the HbScrollArea to adjust the content correctly. Adjustment
+        // is not done in the setPos generated event handling by default to speed up scrolling.
+        HbAbstractItemViewPrivate::d_ptr(mItemView)->adjustContent();
+    }
+}
+
 Q_DECLARE_METATYPE(HbAbstractItemContainerPrivate::StateItem)
 
 #endif /* HBABSTRACTITEMCONTAINERPRIVATE_H */
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/itemviews/hbabstractviewitem.cpp
--- a/src/hbwidgets/itemviews/hbabstractviewitem.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractviewitem.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -35,6 +35,7 @@
 #include <hbabstractitemview_p.h>
 #include <hbwidgetfeedback.h>
 #include <hbtapgesture.h>
+#include <hbnamespace_p.h>
 
 #include <QPersistentModelIndex>
 #include <QGraphicsLayout>
@@ -42,6 +43,7 @@
 #include <QCoreApplication>
 #include <QEvent>
 #include <QTimer>
+#include <QGraphicsScene>
 #include <QDebug>
 
 #include <QGesture>
@@ -263,6 +265,11 @@
 
     switch (gesture->state()) {
         case Qt::GestureStarted: {
+            q->scene()->setProperty(HbPrivate::OverridingGesture.latin1(),Qt::TapGesture);
+            if (!gesture->property(HbPrivate::ThresholdRect.latin1()).toRect().isValid()) {
+                gesture->setProperty(HbPrivate::ThresholdRect.latin1(), q->mapRectToScene(q->boundingRect()).toRect());
+            }
+
             setPressed(true, true);
             emit q->pressed(position);
             break;
@@ -281,6 +288,8 @@
             break;
         }
         case Qt::GestureFinished: {
+            q->scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
+
             if (gesture->tapStyleHint() == HbTapGesture::Tap 
                 || (mSharedData->mItemView
                 && !mSharedData->mItemView->longPressEnabled())) {
@@ -306,6 +315,7 @@
             break;
         }
         case Qt::GestureCanceled: {
+            q->scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
             // hides focus immediately
             setPressed(false, false);
 
@@ -894,13 +904,18 @@
     }
 
     // items visibility or items content has really changed
-    d->mSizeHintPolish = false;
     updatePrimitives();
     if (!d->mContentChangedSupported
         || d->mItemsChanged) {
         updateGeometry();   // ensures that sizehint is calculated again in case items have been created or deleted
         d->mRepolishRequested = true;
+        // handle QEvent::Polish & QEvent::LayoutRequest event itself in ::sizeHint() as our performance is slightly better
+        // (saving a layoutrequest and going event loop through twice)
+        if (sd->mItemView && sd->mItemView->isScrolling()) {
+            d->mHandlingRepolishSynchronously = true;
+        }
         repolish();
+        d->mHandlingRepolishSynchronously = false;
     }
     d->mItemsChanged = false;
 }
@@ -954,7 +969,7 @@
         if (!d->mFocusItem) {
             d->mFocusItem = style()->createPrimitive(HbStyle::P_ItemViewItem_focus, this);
         }
-            
+
         HbStyleOptionAbstractViewItem styleOption;
         initStyleOption(&styleOption);
 
@@ -1004,13 +1019,8 @@
 {
     HB_SDD(HbAbstractViewItem);
 
-	if (!d->polished && layout()) {
-		return;
-	}
-	
-    if (d->mSizeHintPolish) {
-        d->mSizeHintPolish = false;
-        return;
+    if (!d->polished && layout()) {
+    return;
     }
 
     if (sd->mItemView) {
@@ -1040,16 +1050,17 @@
 {
     Q_D(const HbAbstractViewItem);
     if (d->mRepolishRequested) {
-        // force the polish event in order to get the real size
-        const_cast<HbAbstractViewItemPrivate *>(d)->mRepolishRequested = false;
-        QEvent polishEvent(QEvent::Polish);
-        QCoreApplication::sendEvent(const_cast<HbAbstractViewItem *>(this), &polishEvent);
-        // HbAbstractItemView::scrollByAmount() [recycleItems()]
-        // causes updateChildItems() to be called, which posts Polish to be posted via repolish().
-        // Next statement in the scrollByAmount() [refreshContainerGeometry()]
-        // causes synchronous call of this method. This is a quick way to disable another
-        // ::polish() to be called.
-        d->mSizeHintPolish = true;
+        if (d->repolishOutstanding) {
+            // force the polish event in order to get the real size
+            // updateGeometry() in ::updateChildItems() causes this function to be called
+            // before QEvent::Polish of repolish() is handled from the event loop
+            QCoreApplication::sendPostedEvents(const_cast<HbAbstractViewItem*>(this), QEvent::Polish);
+        } else {
+            // needed for pure widget or at startup phase, if first polish has not yet been done
+            QEvent polishEvent(QEvent::Polish);
+            QCoreApplication::sendEvent(const_cast<HbAbstractViewItem *>(this), &polishEvent);
+        }
+        QCoreApplication::sendPostedEvents(const_cast<HbAbstractViewItem *>(this), QEvent::LayoutRequest);
     }
     return HbWidget::sizeHint(which, constraint);
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/itemviews/hbabstractviewitem_p.h
--- a/src/hbwidgets/itemviews/hbabstractviewitem_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractviewitem_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -99,7 +99,6 @@
           mRepolishRequested(false),
           mContentChangedSupported(false),
           mItemsChanged(false),
-          mSizeHintPolish(false),
           mPressed(false),
           mFocusItem(0),
           mMultiSelectionTouchArea(0),                    
@@ -123,7 +122,6 @@
             mRepolishRequested(false),
             mContentChangedSupported(source.mContentChangedSupported),
             mItemsChanged(false),
-            mSizeHintPolish(false),
             mPressed(false),
             mFocusItem(0),
             mMultiSelectionTouchArea(0),
@@ -144,7 +142,6 @@
             mRepolishRequested = false;
             mContentChangedSupported = source.mContentChangedSupported;
             mItemsChanged = false;
-            mSizeHintPolish = false;
             mPressed = false;
             mFocusItem = 0;
             mSharedData = source.mSharedData;
@@ -196,7 +193,6 @@
         bool mContentChangedSupported;
         // Status of child item existence changed.
         bool mItemsChanged;
-        mutable bool mSizeHintPolish;
         bool mPressed;
 
         QGraphicsItem *mFocusItem;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/itemviews/hbindexfeedback.cpp
--- a/src/hbwidgets/itemviews/hbindexfeedback.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/itemviews/hbindexfeedback.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -58,6 +58,10 @@
     The sizing and number of characters to display are controlled by the IndexFeedbackPolicy.
 
     \sa HbAbstractItemView, HbIndexFeedback::IndexFeedbackPolicy.
+
+    \primitives
+    \primitive{index-text} HbTextItem representing the text in the HbIndexFeedback. 
+    \primitive{index-background} HbFrameItem representing the background of the HbIndexFeedback. 
 */
 
 /*!
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/itemviews/hbindexfeedback_p.cpp
--- a/src/hbwidgets/itemviews/hbindexfeedback_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/itemviews/hbindexfeedback_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -133,6 +133,10 @@
         q, SLOT(_q_hideIndexFeedback()));
 
     createPrimitives();
+
+    // ensure that the index feedback is shown on top of the itemView in
+    // all cases. 
+    q->setZValue(1);
 }
 
 /*
@@ -418,7 +422,7 @@
         return;
     }
 
-    QRectF contentRect = mItemView->rect();
+    QRectF contentRect = mItemView->mapToItem(q, mItemView->rect()).boundingRect();
     
     HbScrollBar *verticalScrollBar = mItemView->verticalScrollBar();
     HbScrollBar *horizontalScrollBar = mItemView->horizontalScrollBar();
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/itemviews/hblistitemcontainer_p.cpp
--- a/src/hbwidgets/itemviews/hblistitemcontainer_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistitemcontainer_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -516,6 +516,8 @@
             newPos.setY(newPos.y() - item->preferredHeight());
             setPos(newPos);
         }
+
+        d->adjustContent();
     } else {
         item->deleteLater();
     }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/itemviews/hbradiobuttonlist.cpp
--- a/src/hbwidgets/itemviews/hbradiobuttonlist.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/itemviews/hbradiobuttonlist.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -37,8 +37,6 @@
 const int HB_RADIOBUTTONLIST_ITEM_ACTIVATION_TIMER = 150;
 const int HB_RADIOBUTTONLIST_PREVIEW_TIMER = 500;
 
-const int HB_RADIOBUTTONLIST_MINIMUM_ITEM_COUNT_IN_SIZE_HINT = 4;
-
 /*!
     \class HbRadioButtonList
     \brief HbRadioButtonList provides a widget for a string list with radio buttons
@@ -130,15 +128,13 @@
     HbRadioButtonList::PreviewMode mPreviewMode;
     bool mPreviewGoingOn;
     bool mStartUp;
-    qreal mHeight;
 };
 
 HbRadioButtonListPrivate::HbRadioButtonListPrivate() :
     HbListViewPrivate(),
     mPreviewMode(HbRadioButtonList::NoPreview),
     mPreviewGoingOn(false),
-    mStartUp(true),
-    mHeight(0)
+    mStartUp(true)
 {     
 }
 
@@ -173,26 +169,6 @@
     q->setPreviewMode(previewMode);
     q->setLongPressEnabled(false);
     q->setUniformItemSizes(true);
-    calculateItemHeight();
-}
-
-void HbRadioButtonListPrivate::calculateItemHeight()
-{
-    Q_Q(HbRadioButtonList);
-    if (!q->items().isEmpty()) {
-        //Let's create a temporary item and take the height for the size hint
-        HbAbstractViewItem *tempItem = q->itemPrototypes().first()->createItem();
-        tempItem->setModelIndex(mModelIterator->nextIndex(QModelIndex()));
-
-        qreal oldHeight = mHeight;
-        mHeight = tempItem->effectiveSizeHint(Qt::PreferredSize).height();
-
-        delete tempItem;
-
-        if (mHeight != oldHeight) {
-            q->updateGeometry();
-        }
-    }
 }
 
 void HbRadioButtonListPrivate::emitStartPreview(int row)
@@ -252,10 +228,6 @@
     QStringListModel *stringListModel = qobject_cast<QStringListModel *>(d->mModelIterator->model());
     if (stringListModel) {
         stringListModel->setStringList(list);
-        //Calculate the item height only if needed
-        if(d->mHeight==0){
-            d->calculateItemHeight();
-        }
         updateGeometry();
     } else {
         //TODO: set the item here using the base model class
@@ -410,21 +382,7 @@
 */
 QSizeF HbRadioButtonList::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 {
-    Q_D(const HbRadioButtonList);
-    if (which == Qt::PreferredSize) {
-        QSizeF defaultSize = HbListView::sizeHint(which,constraint);
-        qreal minHeight = (d->mHeight) * HB_RADIOBUTTONLIST_MINIMUM_ITEM_COUNT_IN_SIZE_HINT;
-        defaultSize.setHeight(qMax(defaultSize.height(), minHeight));
-        
-        qreal height = (d->mHeight) * (d->mModelIterator->indexCount());
-        if( height <= defaultSize.height()) {
-            return QSizeF(defaultSize.width(), height);
-        } else {
-            return defaultSize;
-        } 
-    } else {
-        return HbListView::sizeHint(which, constraint);
-    }
+    return HbListView::sizeHint(which, constraint);
 }
 
 /*!
@@ -432,13 +390,7 @@
 */
 void HbRadioButtonList::rowsInserted(const QModelIndex &parent, int start, int end)
 {
-    Q_D(HbRadioButtonList);
     HbListView::rowsInserted(parent,start,end);
-    //Calculate the item height only if needed
-    if(d->mHeight==0){
-        d->calculateItemHeight();
-    }
-    updateGeometry();
 }
 
 /*!
@@ -447,7 +399,6 @@
 void HbRadioButtonList::rowsRemoved(const QModelIndex &parent, int start, int end)
 {
     HbListView::rowsRemoved(parent,start,end);
-    updateGeometry();
 }
 
 /*!
@@ -456,7 +407,6 @@
 void HbRadioButtonList::reset()
 {
     HbListView::reset();
-    updateGeometry();
 }
 #include "moc_hbradiobuttonlist.cpp"
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/itemviews/hbtumbleview.cpp
--- a/src/hbwidgets/itemviews/hbtumbleview.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtumbleview.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -130,68 +130,45 @@
 
 QPointF HbTumbleViewItemContainer::recycleItems(const QPointF &delta)
 {
-    Q_D(HbTumbleViewItemContainer);
-    QRectF viewRect(d->itemBoundingRect(d->mItemView));
-    viewRect.moveTopLeft(viewRect.topLeft() + delta);
-
-    int firstVisibleBufferIndex = -1;
-    int lastVisibleBufferIndex = -1;
-    d->firstAndLastVisibleBufferIndex(firstVisibleBufferIndex, lastVisibleBufferIndex, viewRect, false);
-
-    int hiddenAbove = firstVisibleBufferIndex;
-    int hiddenBelow = d->mItems.count() - lastVisibleBufferIndex - 1;
-
-    if (d->mItems.count()
-        && (firstVisibleBufferIndex == -1 || lastVisibleBufferIndex == -1)) {
-        // All items out of sight.
-        if (d->itemBoundingRect(d->mItems.first()).top() < 0) {
-            // All items above view.
-            hiddenAbove = d->mItems.count();
-            hiddenBelow = 0;
-        } else {
-            // All items below view.
-            hiddenAbove = 0;
-            hiddenBelow = d->mItems.count();
-        }
-    }
+    if(size().height() > itemView()->size().height()){
+            Q_D(HbTumbleViewItemContainer);
+            const qreal diff = d->getDiffWithoutScrollareaCompensation(delta);
+          
+            if(diff !=0.0){      
+                  QPointF newDelta(0.0, 0.0);
+                  qreal result = 0.0;
+                  HbAbstractViewItem *item = 0;
+                  if (diff < 0.0) {
+                        while (-newDelta.y() > diff) {
+                              item = d->shiftUpItem(newDelta);
+                              if (!item) {
+                                    break;
+                              }
+                        }
+                  }
 
-    QPointF newDelta(delta);
-
-    while (hiddenAbove > hiddenBelow + 1) {
-        HbAbstractViewItem *item = d->shiftDownItem(newDelta);
-        if (!item){
-            break;
-        }
-
-        if (!d->visible(item, viewRect)) {
-            hiddenBelow++;
-        }
-        hiddenAbove--;
-    }
+                  else {
+                        while (-newDelta.y() < diff) {
+                              item = d->shiftDownItem(newDelta);
+                              if (!item) {
+                                    break;
+                              }
+                        }
+                  }
 
-    while (hiddenBelow > hiddenAbove + 1) {
-        HbAbstractViewItem *item = d->shiftUpItem(newDelta);
-        if (!item) {
-            break;
-        }
+                  result = newDelta.y();
+                  return QPointF(delta.x(),delta.y()+result);
+            }
+      }
 
-        if (!d->visible( item, viewRect)) {
-            hiddenAbove++;
-        }
-        hiddenBelow--;
-    }
-
-    return newDelta;
+    return delta;
 }
 void HbTumbleViewItemContainer::setLoopingEnabled(bool looped) {
     Q_D(HbTumbleViewItemContainer);
-    d->mIsLooped = looped;
-    if(looped){
-        recycleItems(QPointF());
-    }
-    else{
-        setModelIndexes(d->mItemView->currentIndex());
-    }
+    d->mIsLooped = looped;    
+
+    d->mItemView->scrollTo(d->mItemView->currentIndex(),HbAbstractItemView::PositionAtCenter);
+    recycleItems(QPointF());
 }
 bool HbTumbleViewItemContainer::isLoopingEnabled() const {
     Q_D(const HbTumbleViewItemContainer);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/itemviews/hbtumbleviewitem.cpp
--- a/src/hbwidgets/itemviews/hbtumbleviewitem.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtumbleviewitem.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -23,11 +23,14 @@
 **
 ****************************************************************************/
 #include "hbtumbleviewitem.h"
+#include "hbtapgesture_p.h"
 
 #include "hblistviewitem_p.h"
+#include "hbnamespace_p.h"
 #include <hbstyleoptionlistviewitem_p.h>
 
 #include <QGestureEvent>
+#include <QCoreApplication>
 
 HbTumbleViewItem::HbTumbleViewItem(QGraphicsItem *parent) :
     HbListViewItem(parent)
@@ -53,20 +56,21 @@
 /*!
     \reimp
 */
-HbAbstractViewItem *HbTumbleViewItem::createItem() 
+HbAbstractViewItem *HbTumbleViewItem::createItem()
 {
     HbTumbleViewItem* item = new HbTumbleViewItem(*this);
     item->setFocusPolicy(Qt::NoFocus);
-
+    connect(item,SIGNAL(released(QPointF)),item->itemView(),SLOT(_q_itemSelected(QPointF)));
     return item;
 }
-
 /*!
     \reimp
 */
 void HbTumbleViewItem::updateChildItems()
 {
     Q_D(HbListViewItem);
+    if (d->mIndex.data(Qt::DisplayRole).isNull())
+         return;
     HbListViewItem::updateChildItems();
     if(d->mSelectionItem){
         d->mSelectionItem->hide();
@@ -75,20 +79,62 @@
 
 void HbTumbleViewItem::gestureEvent(QGestureEvent *event)
 {
-    if (event->gesture(Qt::TapGesture)) {
+    HbTapGesture *gesture = static_cast<HbTapGesture *>(event->gesture(Qt::TapGesture));
+    if (gesture) {
         Q_D(HbAbstractViewItem);
         if(itemView()->isScrolling()){
             event->ignore();
             event->ignore(Qt::TapGesture);
             return;
         }
+        if(gesture->state() == Qt::GestureCanceled){
+            d->setPressed(false, false);
+            event->accept();
+            scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
+            return;
+        }
         d->tapTriggered(event);
-
     } else {
         HbWidget::gestureEvent(event);
+   
     }
 }
 
 
+QSizeF HbTumbleViewItem::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
+{
+    HB_SDD(const HbAbstractViewItem);
+    static qreal height=0;
+
+    QSizeF sh=HbListViewItem::sizeHint(which,constraint);
+    if(which == Qt::PreferredSize && sh.height()<=0) {
+        //TODO:remove this check once refresh issue in DTP is solved on removeRows/insertRows
+        if(height<=0) {
+            //Let's create a temporary item and take the height for the size hint
+            HbAbstractViewItem *tempitem = sd->mPrototype->createItem();
+            if(sd->mItemView) {
+                QAbstractItemModel *model = sd->mItemView->model();
+                if(model) {
+                    int rowCount=model->rowCount();
+                    QModelIndex ind=model->index(rowCount,0);
+                    if(ind.isValid()) {
+                        tempitem->setModelIndex(ind);
+                    }
+                }
+            }
+
+
+            //call polish            
+            QEvent polishEvent(QEvent::Polish);
+            QCoreApplication::sendEvent(const_cast<HbAbstractViewItem *>(tempitem), &polishEvent);
+            height=tempitem->effectiveSizeHint(which,constraint).height();
+            delete tempitem;
+        }
+        return QSizeF(sh.width(),height);
+    }
+    return sh;
+}
+
+
 #include "moc_hbtumbleviewitem.cpp"
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/itemviews/hbtumbleviewitem.h
--- a/src/hbwidgets/itemviews/hbtumbleviewitem.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtumbleviewitem.h	Tue Jul 06 14:36:53 2010 +0300
@@ -52,6 +52,7 @@
 
 protected:
     void gestureEvent(QGestureEvent *event);
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;
 
 private:
     Q_DECLARE_PRIVATE_D(d_ptr, HbListViewItem)
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/popups/hbcolordialog.cpp
--- a/src/hbwidgets/popups/hbcolordialog.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/popups/hbcolordialog.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -458,7 +458,7 @@
 
         if ( d->mDefaultColors ) {
             d->addDatatoModel( d->mNoneBlockVisible ?
-                               d->mDefaultColorList.mid(0, d->mDefaultColorList.count() -1 ) :
+                               d->mDefaultColorList.mid(0, (unsigned int)d->mDefaultColorList.count() -1 ) :
                                d->mDefaultColorList );
         }
     }    
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/popups/hbcolorgridviewitem.cpp
--- a/src/hbwidgets/popups/hbcolorgridviewitem.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/popups/hbcolorgridviewitem.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -81,6 +81,7 @@
 
 HbColorGridViewItemPrivate::~HbColorGridViewItemPrivate()
 {
+    delete mFrameBackGround;
 }
 
 bool HbColorGridViewItemPrivate::isChecked() const
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/popups/hbinputdialog.cpp
--- a/src/hbwidgets/popups/hbinputdialog.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/popups/hbinputdialog.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -165,7 +165,7 @@
 /*!
     Sets the prompt text for the user field. This prompt text text can be very descriptive like username,password etc.
 
-    \param text The des
+    \param text The promt text string. Maximum number of lines shown is 2.
     \param row This parameter indicates which row of the user field.0 (by default) means the 
     the first user field and 1 means second user field.
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/popups/hbinputdialog_p.cpp
--- a/src/hbwidgets/popups/hbinputdialog_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/popups/hbinputdialog_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -107,7 +107,6 @@
 {
 }
 
-
 void HbInputDialogPrivate::init()
 {
 #ifdef HBINPUTDIALOG_DEBUG
@@ -171,12 +170,10 @@
         {
             //set the validator
             if(mValid) {
-                // NOTE:This validation is for readability. mValid is being deleted 
-                // when setValidator is called on editor.
-                mValid = 0;
+                delete mValid;
             }
-            mValid = new HbValidator();
-            QValidator *intValidator = new QIntValidator(q);
+            mValid = new HbValidator(q);
+            QValidator *intValidator = new QIntValidator;
             mValid->addField(intValidator, "0");
             pEdit->setValidator(mValid);
 
@@ -188,11 +185,11 @@
         {
             //set the validator
             if(mValid) {
-                mValid = 0;
+                delete mValid;
             }
 
-            mValid = new HbValidator();
-            QValidator *doubleValidator = new QDoubleValidator(q);
+            mValid = new HbValidator(q);
+            QValidator *doubleValidator = new QDoubleValidator(mValid);
             mValid->addField(doubleValidator, "0");
             pEdit->setValidator(mValid);
 
@@ -203,9 +200,12 @@
     case HbInputDialog::IpInput:
         {
             QString text = pEdit->text();
-            mValid = new HbValidator;
+            if(mValid){
+                delete mValid;
+            }
+            mValid = new HbValidator(q);
             mValid->setDefaultSeparator(".");
-            QStringList list = text.split(".");
+            QStringList list = text.split('.');
             if (list.count() != 4 ) {
                     mValid->setDefaultSeparator(".");
                     mValid->addField(new QIntValidator(0, 255, 0), "127");
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/popups/hbinputdialog_p.h
--- a/src/hbwidgets/popups/hbinputdialog_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/popups/hbinputdialog_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -64,7 +64,7 @@
     HbInputCustomButtonBank *mCustomButtonBank;
     HbInputCustomButton *mDotButton;
     HbInputCustomButton *mDashButton;
-    HbValidator *mValid;
+    QPointer<HbValidator> mValid;
     
     HbInputDialog::InputMode mPrimaryMode;
     HbInputDialog::InputMode mSecondaryMode;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/popups/hbinputdialogcontent_p.h
--- a/src/hbwidgets/popups/hbinputdialogcontent_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/popups/hbinputdialogcontent_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -37,7 +37,7 @@
 {
     Q_OBJECT
 public:
-    HbInputDialogContentWidget(HbInputDialogPrivate* priv,QGraphicsItem* parent =0);
+    explicit HbInputDialogContentWidget(HbInputDialogPrivate* priv,QGraphicsItem* parent =0);
 
     enum { Type = HbPrivate::ItemType_HbInputDialogContentWidget };
     int type() const { return Type; }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/popups/hbmessagebox.cpp
--- a/src/hbwidgets/popups/hbmessagebox.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/popups/hbmessagebox.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -23,9 +23,9 @@
 **
 ****************************************************************************/
 
+#include "hbmessagebox_p.h"
 #include "hbnamespace_p.h"
 #include <hbmessagebox.h>
-#include "hbmessagebox_p.h"
 #include <hbstyleoptionmessagebox_p.h>
 #include <hbmainwindow.h>
 #include <hbaction.h>
@@ -37,6 +37,9 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QTimer>
 #include <QTextOption>
+#ifdef Q_OS_SYMBIAN
+#include <systemtoneservice.h>
+#endif
 
 class HbStyle;
 
@@ -67,8 +70,14 @@
     void setHtmlText(const QString &text)
     {
         mText = text;
-        setHtml(text);
-    }
+        if(Qt::mightBeRichText(mText)){
+            setHtml(text);
+        }
+        else {
+             QString htmlString = Qt::convertFromPlainText(mText);
+             setHtml(htmlString);
+        }
+     }
 
     QString htmlText() const
     {
@@ -154,6 +163,34 @@
     }
 
 }
+void HbMessageBoxPrivate::_q_appearEffectEnded(HbEffect::EffectStatus status)
+{
+#ifdef Q_OS_SYMBIAN 
+	
+    	if ( (status.reason == Hb::EffectFinished) ||  ( (status.reason == Hb::EffectCancelled) && (!mStartEffect) ))  {
+	        CSystemToneService *pSystemTone = systemToneService();
+			if(!pSystemTone) {
+				return ;
+			}
+			switch(mMessageBoxType) {
+    		case HbMessageBox::MessageTypeInformation:
+    			pSystemTone->PlayTone(CSystemToneService::EInformationBeep); 
+    			break;
+    		case HbMessageBox::MessageTypeWarning:
+    			pSystemTone->PlayTone(CSystemToneService::EWarningBeep); 
+    			break;
+    		case HbMessageBox::MessageTypeQuestion:
+    			pSystemTone->PlayTone(CSystemToneService::EConfirmationBeep); 
+        	break;
+      	default:
+      		break;        
+    	}
+
+		}
+#else
+	Q_UNUSED(status);
+#endif // Q_OS_SYMBIAN
+}
 
 /*!
     @beta
@@ -346,7 +383,7 @@
 }
 
 /*!
-    Sets the descriptive text for the messagebox.
+    Sets the descriptive text for the messagebox. It can be in plain text format or html format.
     \param text Descriptive text for the MessageBox
     \sa text()
 */
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/popups/hbmessagebox_p.h
--- a/src/hbwidgets/popups/hbmessagebox_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/popups/hbmessagebox_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -41,6 +41,7 @@
     ~HbMessageBoxPrivate();
 
     void init();
+	void _q_appearEffectEnded(HbEffect::EffectStatus status);
     HbIcon mIcon;
     HbMessageBoxContentWidget *mMessageBoxContentWidget;
     HbMessageBox::MessageBoxType mMessageBoxType;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/popups/hbnotificationdialog.cpp
--- a/src/hbwidgets/popups/hbnotificationdialog.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/popups/hbnotificationdialog.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -39,6 +39,7 @@
 #include <hbdevicedialogserverstatus_p.h>
 #include <hbtapgesture.h>
 #include <hbpangesture.h>
+#include <hbwidgetfeedback.h>
 
 #ifdef HB_EFFECTS
 #include "hbeffectinternal_p.h"
@@ -301,7 +302,12 @@
 {
     Q_D(HbNotificationDialog);
     d->checkAndCreateContentWidget();
-    d->content->setText( text );
+    d->content->setText(text);
+    if (text.isEmpty()) {
+        d->titleTextWrapping = Hb::TextWordWrap;
+    } else {
+        d->titleTextWrapping = Hb::TextNoWrap;
+    }
     d->setNotificationDialogContent();
 }
 
@@ -346,7 +352,7 @@
 Hb::TextWrapping HbNotificationDialog::titleTextWrapping() const
 {
     Q_D(const HbNotificationDialog);
-    return d->titleWrapping;
+    return d->titleTextWrapping;
 }
 
 /*!
@@ -358,10 +364,10 @@
 void HbNotificationDialog::setTitleTextWrapping(Hb::TextWrapping wrapping)
 {
     Q_D(HbNotificationDialog);
-    if (d->titleWrapping != wrapping) {
-        d->titleWrapping = wrapping;
+    if (d->titleTextWrapping != wrapping) {
+        d->titleTextWrapping = wrapping;
         if (d->content) {
-            d->content->setTitleTextWrapping(d->titleWrapping);
+            d->content->setTitleTextWrapping(d->titleTextWrapping);
         }
         d->doLayout();
     }
@@ -433,9 +439,11 @@
     Q_D(HbNotificationDialog);
     if(HbTapGesture *tap = qobject_cast<HbTapGesture*>(event->gesture(Qt::TapGesture))) {
         if(tap->state() == Qt::GestureStarted) {
+            HbWidgetFeedback::triggered(this, Hb::InstantPressed);
             d->stopTimeout();
         } else if(tap->state() == Qt::GestureFinished) {
             if (d->isTouchActivating) {
+                HbWidgetFeedback::triggered(this, Hb::InstantReleased);
                 emit activated();
             }
             close();
@@ -507,9 +515,8 @@
 }
 
 HbNotificationDialogPrivate::HbNotificationDialogPrivate() :
-        HbDialogPrivate(), isTouchActivating(false),
-        titleWrapping(Hb::TextWordWrap),
-        content(0), sequentialShow(true)
+    HbDialogPrivate(), isTouchActivating(false), titleTextWrapping(Hb::TextWordWrap),
+    content(0), sequentialShow(true)
 {
 }
 
@@ -527,15 +534,14 @@
 }
 void HbNotificationDialogPrivate::setBackgroundStyle()
 {
-    Q_Q(HbNotificationDialog);
-    q->setBackgroundItem(HbStyle::P_NotificationDialog_frame);
+    setBackgroundItem(HbStyle::P_NotificationDialog_frame);
 }
 
 void HbNotificationDialogPrivate::setNotificationDialogContent()
 {
     Q_Q(HbNotificationDialog);
     content->enableTouchActivation(isTouchActivating);
-    content->setTitleTextWrapping(titleWrapping);
+    content->setTitleTextWrapping(titleTextWrapping);
     if (q->contentWidget() == content) {
         doLayout();
     } else {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/popups/hbnotificationdialog_p.h
--- a/src/hbwidgets/popups/hbnotificationdialog_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/popups/hbnotificationdialog_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -42,7 +42,7 @@
     void setBackgroundStyle();
 
     bool isTouchActivating;
-    Hb::TextWrapping titleWrapping;
+    Hb::TextWrapping titleTextWrapping;
     bool integrationWithIndicatorArea;
     QPointF pointerDownPoint;
     HbNotificationDialogContent* content;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/popups/hbnotificationdialogcontent.cpp
--- a/src/hbwidgets/popups/hbnotificationdialogcontent.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/popups/hbnotificationdialogcontent.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -29,7 +29,7 @@
 #include "hbnotificationdialogcontent_p.h"
 
 HbNotificationDialogContent::HbNotificationDialogContent(QGraphicsWidget *parent) :
-        HbWidget(parent), mTitleWrapping(Hb::TextNoWrap),
+    HbWidget(parent), mTitleTextWrapping(Hb::TextNoWrap),
     mIsTouchActivating(false), mTextItem(0), mTitleItem(0), mIconItem(0)
 {
 }
@@ -39,7 +39,7 @@
     delete mIconItem;
     mIconItem = 0;
 
-    if(!icon.isNull()) {    
+    if (!icon.isNull()) {    
         mIconItem = style()->createPrimitive(
                 HbStyle::P_NotificationDialog_icon, this);
         Q_CHECK_PTR(mIconItem);
@@ -53,7 +53,7 @@
 
 void HbNotificationDialogContent::setText(const QString &text)
 {
-    if(!mTextItem) {
+    if (!mTextItem) {
         mTextItem = style()->createPrimitive(
                 HbStyle::P_NotificationDialog_text, this);
         Q_CHECK_PTR(mTextItem);
@@ -67,7 +67,7 @@
 
 void HbNotificationDialogContent::setTitle(const QString &title)
 {
-    if(!mTitleItem) {
+    if (!mTitleItem) {
         mTitleItem = style()->createPrimitive(
                 HbStyle::P_NotificationDialog_title, this);
         Q_CHECK_PTR(mTitleItem);
@@ -82,8 +82,8 @@
 
 void HbNotificationDialogContent::setTitleTextWrapping(Hb::TextWrapping wrapping)
 {
-    if (mTitleWrapping != wrapping) {
-        mTitleWrapping = wrapping;
+    if (mTitleTextWrapping != wrapping) {
+        mTitleTextWrapping = wrapping;
         updatePrimitives();
         if (isVisible()) {
             polishEvent();
@@ -93,7 +93,7 @@
 
 Hb::TextWrapping HbNotificationDialogContent::titleTextWrapping() const
 {
-    return mTitleWrapping;
+    return mTitleTextWrapping;
 }
 
 void HbNotificationDialogContent::enableTouchActivation(bool enabled)
@@ -136,7 +136,7 @@
     setProperty("icon", iconSet);
     setProperty("textFields", textFields);
     setProperty("link", option.isLink);
-    setProperty("titleWrapping", option.titleWrapping);
+    setProperty("titleWrapping", (option.titleTextWrapping != Hb::TextNoWrap));
     HbWidget::polish(params);
 }
 
@@ -146,17 +146,14 @@
     option->title = mTitle;
     option->text = mText;
     option->icon = mIcon;
-    option->textWrapping = Hb::TextNoWrap;
-    option->titleWrapping = mTitleWrapping;
-    option->wrappingText = Hb::TextNoWrap;
-    option->wrappingTitle = mTitleWrapping;
+    option->textTextWrapping = Hb::TextNoWrap;
+    option->titleTextWrapping = mTitleTextWrapping;
     option->isLink = mIsTouchActivating;
 }
 
-QSizeF HbNotificationDialogContent::sizeHint(
-        Qt::SizeHint which, const QSizeF & constraint) const
+QSizeF HbNotificationDialogContent::sizeHint(Qt::SizeHint which, const QSizeF & constraint) const
 {
-    switch(which) {
+    switch (which) {
     case Qt::PreferredSize: {
         QSizeF preferred = HbWidget::sizeHint(which, constraint);
         HbDeviceProfile dp(HbDeviceProfile::profile(this));
@@ -179,11 +176,11 @@
     HbStyleOptionNotificationDialog option;
     initStyleOption(&option);
 
-    if(mTextItem) {
+    if (mTextItem) {
         style()->updatePrimitive(mTextItem,
             HbStyle::P_NotificationDialog_text, &option);
     }
-    if(mTitleItem) {
+    if (mTitleItem) {
         style()->updatePrimitive(mTitleItem,
             HbStyle::P_NotificationDialog_title, &option);
     }
@@ -203,11 +200,9 @@
     } else {
         if (itemName == "text") {
             return mTextItem;
-        }
-        else if (itemName == "title") {
+        } else if (itemName == "title") {
             return mTitleItem;
-        }
-        else if (itemName == "icon") {
+        } else if (itemName == "icon") {
             return mIconItem;
         } else {
             return 0;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/popups/hbnotificationdialogcontent_p.h
--- a/src/hbwidgets/popups/hbnotificationdialogcontent_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/popups/hbnotificationdialogcontent_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -62,7 +62,7 @@
     void initStyleOption(HbStyleOptionNotificationDialog *option) const;
     QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF()) const;
 private:    
-    Hb::TextWrapping mTitleWrapping;
+    Hb::TextWrapping mTitleTextWrapping;
     QString mText;
     QString mTitle;
     HbIcon mIcon;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/popups/hbselectiondialog.cpp
--- a/src/hbwidgets/popups/hbselectiondialog.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/popups/hbselectiondialog.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -22,9 +22,10 @@
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
+#include "hbselectiondialog_p.h"
 #include "hbselectiondialog.h"
 #include "hbwidget_p.h"
-#include "hbselectiondialog_p.h"
+
 #include "hblabel.h"
 #include "hbaction.h"
 #include "hbabstractviewitem.h"
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/popups/hbselectiondialog_p.cpp
--- a/src/hbwidgets/popups/hbselectiondialog_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/popups/hbselectiondialog_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -33,12 +33,79 @@
 #include <QtDebug>
 #include <hbcheckbox.h>
 #include <hbaction.h>
+#include <hbstyleoption_p.h>
+
+HbSelectionDialogMarkWidget::HbSelectionDialogMarkWidget(QGraphicsItem *parent):HbWidget(parent),mBackgroundItem(0){
+	chkMark = new HbCheckBox(this);
+	chkMark->setText("Mark All");
+	lbCounter = new HbTextItem(this);
+	HbStyle::setItemName(chkMark,"checkbox");
+	HbStyle::setItemName(lbCounter,"counter");
+	createPrimitives();
+}
+
+void HbSelectionDialogMarkWidget::createPrimitives()
+{
+    if ( !mBackgroundItem ) {
+        mBackgroundItem = style( )->createPrimitive( HbStyle::P_TumbleView_background , this );
+        style()->setItemName( mBackgroundItem , "background" );
+    }
+}
+
+void HbSelectionDialogMarkWidget::updatePrimitives()
+{
+    HbStyleOption option;
+    initStyleOption( &option );
+   
+    if ( mBackgroundItem ) {
+            style( )->updatePrimitive( mBackgroundItem , HbStyle::P_TumbleView_background , &option );
+    }       
+}
+
+/*!
+    \reimp
+ */
+QVariant HbSelectionDialogMarkWidget::itemChange( GraphicsItemChange change, const QVariant &value )
+{
+    switch ( change ) {
+        case ItemVisibleHasChanged: {
+			updatePrimitives( );
+            }
+            break;
+
+        case ItemSceneHasChanged: {
+            updatePrimitives();
+            }
+            break;
+        default:
+            break;
+    }
+    return HbWidget::itemChange( change, value );
+}
+/*!
+    Returns the pointer for \a primitive passed.
+    Will return NULL if \a primitive passed is invalid
+*/
+QGraphicsItem* HbSelectionDialogMarkWidget::primitive(HbStyle::Primitive primitive) const
+{
+    switch (primitive) {
+        case HbStyle::P_TumbleView_background:
+            return mBackgroundItem;
+        default:
+            return 0;
+    }
+}
+
+HbSelectionDialogMarkWidget::~HbSelectionDialogMarkWidget()
+{
+}
 
 HbSelectionDialogContentWidget::HbSelectionDialogContentWidget(HbSelectionDialogPrivate *priv):HbWidget(),
-                        mListView(0),d(priv),chkMark(0),lbCounter(0),markWidgetShown(false)
+                        mListView(0),d(priv),markWidget(0)
 {
     
 }
+
 void HbSelectionDialogContentWidget::_q_listWidgetItemSelected(HbListWidgetItem *item)
 {
 	Q_UNUSED(item)
@@ -78,21 +145,21 @@
 {
 	if(!mListView) return;
     if(mListView->selectionMode()!= HbAbstractItemView::MultiSelection) return;
-    if(chkMark && lbCounter){
+    if(markWidget){
         int totalItems = totalItemCount();
         int selectedItems = selectedItemCount();
-
-        lbCounter->setText(QString(QString::number(selectedItems) + "/" + QString::number(totalItems)));
+		markWidget->updatePrimitives();
+        markWidget->lbCounter->setText(QString(QString::number(selectedItems) + "/" + QString::number(totalItems)));
         //update checked state of "MarkAll" checkbox 
         if (totalItems > 0 && (selectedItems == totalItems)){
-            chkMark->blockSignals(true); //should not call _q_checkboxclicked()
-            chkMark->setChecked(true);
-            chkMark->blockSignals(false);
+            markWidget->chkMark->blockSignals(true); //should not call _q_checkboxclicked()
+            markWidget->chkMark->setChecked(true);
+            markWidget->chkMark->blockSignals(false);
         }
         else{
-            chkMark->blockSignals(true); //should not call _q_checkboxclicked()
-            chkMark->setChecked(false);
-            chkMark->blockSignals(false);
+            markWidget->chkMark->blockSignals(true); //should not call _q_checkboxclicked()
+            markWidget->chkMark->setChecked(false);
+            markWidget->chkMark->blockSignals(false);
         }
     }
 }
@@ -125,25 +192,18 @@
 void HbSelectionDialogContentWidget::showMarkWidget(bool bShow)
 {
 	if(bShow){
-		if(!markWidgetShown){
-            chkMark = new HbCheckBox(this);
-            chkMark->setText("Mark All");
-            lbCounter = new HbTextItem(this);
-            HbStyle::setItemName(chkMark,"checkbox");
-            HbStyle::setItemName(lbCounter,"counter");
-            setProperty("multiSelection",true);
-            connect(chkMark,SIGNAL(stateChanged ( int )),this,SLOT(_q_checkboxclicked(int)));
+		if(!markWidget){
+			markWidget = new HbSelectionDialogMarkWidget(this);
+			HbStyle::setItemName(markWidget,"markwidget");
+			setProperty("multiSelection",true);
+            connect(markWidget->chkMark,SIGNAL(stateChanged ( int )),this,SLOT(_q_checkboxclicked(int)));
             updateCounter();
-			markWidgetShown = true;
 		}
     }
     else{
-        delete chkMark;chkMark=0;
-        delete lbCounter;lbCounter=0;
-        HbStyle::setItemName(chkMark,"");
-        HbStyle::setItemName(lbCounter,"");
-        setProperty("multiSelection",false);
-		markWidgetShown = false;
+		delete markWidget; markWidget = 0;
+		HbStyle::setItemName(markWidget,"");
+		setProperty("multiSelection",false);
     }
 }
 
@@ -192,6 +252,7 @@
     :HbDialogPrivate()
 {
     bOwnItems = false;
+	action1 = action2 = 0;
 }
 
 HbSelectionDialogPrivate::~HbSelectionDialogPrivate()
@@ -209,18 +270,30 @@
     HbSelectionDialogContentWidget* contentWidget = new HbSelectionDialogContentWidget(this);
     q->setContentWidget(contentWidget);
 
-    HbAction *action1=new HbAction(hbTrId("txt_common_button_ok"),q);
-    q->addAction(action1);
-    q->connect(action1,SIGNAL(triggered()),q,SLOT(accept()));
-
-    HbAction *action2=new HbAction(hbTrId("txt_common_button_cancel"),q);
-    q->addAction(action2);
-    q->connect(action2,SIGNAL(triggered()),q,SLOT(reject()));
-
-
     q->setDismissPolicy(HbPopup::NoDismiss);
     q->setTimeout(HbPopup::NoTimeout);      
     q->setModal(true);
+	showActions(mSelectionMode);
+}
+
+void HbSelectionDialogPrivate::showActions(HbAbstractItemView::SelectionMode selectionMode)
+{
+	Q_Q(HbSelectionDialog);
+	if(selectionMode == HbAbstractItemView::SingleSelection){
+		delete action1;action1=0;delete action2;action2=0;
+		action1=new HbAction(hbTrId("txt_common_button_cancel"),q);
+		q->addAction(action1);
+		q->connect(action1,SIGNAL(triggered()),q,SLOT(reject()));
+	}
+	else{
+		delete action1;action1=0;delete action2;action2=0;
+		action1=new HbAction(hbTrId("txt_common_button_ok"),q);
+		q->addAction(action1);
+		q->connect(action1,SIGNAL(triggered()),q,SLOT(accept()));
+		action2=new HbAction(hbTrId("txt_common_button_cancel"),q);
+		q->addAction(action2);
+		q->connect(action2,SIGNAL(triggered()),q,SLOT(reject()));
+	}
 }
 
 void HbSelectionDialogPrivate::setSelectionMode(HbAbstractItemView::SelectionMode mode)
@@ -241,6 +314,7 @@
 			else
 				cWidget->showMarkWidget(false);    
 		}
+		showActions(mSelectionMode);
     }
     break;
     case HbAbstractItemView::NoSelection:
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/popups/hbselectiondialog_p.h
--- a/src/hbwidgets/popups/hbselectiondialog_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/popups/hbselectiondialog_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -65,10 +65,29 @@
     QItemSelectionModel* selectionModel() const;
     QModelIndexList selectedModelIndexes() const;
 	void clearItems(bool keepItems);
+	void showActions(HbAbstractItemView::SelectionMode selectionMode);
 public:
     bool bOwnItems;
 	HbAbstractItemView::SelectionMode mSelectionMode;
     void close();
+private:
+	HbAction *action1;
+	HbAction *action2;
+};
+
+class HbSelectionDialogMarkWidget : public HbWidget
+{
+	Q_OBJECT
+public:
+    QGraphicsItem *mBackgroundItem;
+    HbCheckBox* chkMark;
+	HbTextItem* lbCounter;
+	HbSelectionDialogMarkWidget(QGraphicsItem *parent = 0);
+	~HbSelectionDialogMarkWidget();
+	void createPrimitives();
+	void updatePrimitives();
+	QVariant itemChange( GraphicsItemChange change, const QVariant &value );
+	QGraphicsItem* primitive(HbStyle::Primitive primitive) const;
 };
 
 class HB_AUTOTEST_EXPORT HbSelectionDialogContentWidget :public HbWidget
@@ -93,9 +112,7 @@
 	bool bMultiSelection;
 	void updateCounter();
 private:
-    HbCheckBox* chkMark;
-	HbTextItem* lbCounter;
-	bool markWidgetShown;
+	HbSelectionDialogMarkWidget* markWidget;
 private slots:    
 	void _q_listWidgetItemSelected(HbListWidgetItem *item);
 	void _q_listItemSelected(QModelIndex index);
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/popups/hbsliderpopup.cpp
--- a/src/hbwidgets/popups/hbsliderpopup.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/popups/hbsliderpopup.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -98,7 +98,7 @@
     Q_Q( HbSliderPopup);
     mSliderPopupContentWidget = new HbSliderPopupContentWidget( this );
     q->setContentWidget( mSliderPopupContentWidget );
-    q->setBackgroundItem(HbStyle::P_SliderPopup_background);
+    setBackgroundItem(HbStyle::P_SliderPopup_background);
     HbStyle::setItemName(q->backgroundItem(),QLatin1String("sliderpopup_background"));
 
     q->connect(mSliderPopupContentWidget->slider,SIGNAL(valueChanged(int)),q,SLOT(_q_valueChanged(int)));
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/sliders/hbprogressbar.cpp
--- a/src/hbwidgets/sliders/hbprogressbar.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressbar.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -336,7 +336,7 @@
 
 /*!
     @beta
-    Sets the inverted appearence. If this is true progress grows from right to 
+    Sets the inverted Appearance. If this is true progress grows from right to 
     left otherwise left to right.
 
     \param inverted true or false.
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/sliders/hbratingslider.cpp
--- a/src/hbwidgets/sliders/hbratingslider.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/sliders/hbratingslider.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -22,14 +22,14 @@
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
-
+#include "hbratingslider_p.h"
 #include <hbratingslider.h>
-#include "hbratingslider_p.h"
 #include <hbtooltip.h>
 #include <hbstyleoptionratingslider_p.h>
 #include <QGraphicsItem>
 #include <QGraphicsSceneMouseEvent>
 #include <hbtoucharea.h>
+#include <hbwidgetfeedback.h>
 
 #ifdef HB_GESTURE_FW
 #include <hbtapgesture.h>
@@ -566,6 +566,7 @@
                 }
                 QRectF rect = d->mTouchArea->boundingRect();
                 if(rect.contains(xVal,0 )) {
+                    HbWidgetFeedback::triggered(this, Hb::InstantPressed);
                     d->mMousePressed = true;
                     updatePrimitives();
                     rating = d->calculateProgressValue(xVal);
@@ -606,9 +607,11 @@
                     HbToolTip::showText(toolTip(),this);
                 }    
                 setCurrentRating(rating);
+                HbWidgetFeedback::triggered(this, Hb::InstantReleased);
                 if(d->mCurrentValue) {
                     emit ratingDone (d->mCurrentValue);
                 }
+
                 event->accept();
                 d->mMousePressed = false;
                 updatePrimitives();
@@ -661,6 +664,7 @@
                                     HbToolTip::showText(toolTip(),this);
                                 }    
                                 setCurrentRating(rating);
+                                HbWidgetFeedback::continuousTriggered(this, Hb::ContinuousDragged);
                                 emit ratingChanged (d->mCurrentValue);
                                 event->accept();
                             }
@@ -691,6 +695,7 @@
 
                           rating = d->calculateProgressValue(xVal);
                           setCurrentRating(rating);
+                          HbWidgetFeedback::triggered(this, Hb::InstantReleased);
                           if(d->mCurrentValue) {
                              emit ratingDone (d->mCurrentValue);
                            }                       
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/sliders/hbratingslider_p.h
--- a/src/hbwidgets/sliders/hbratingslider_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/sliders/hbratingslider_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -27,7 +27,7 @@
 #define HBRATINGSLIDER_P_H
 
 #include "hbwidget_p.h"
-
+#include <hbratingslider.h>
 class HbRatingSliderPrivate :public HbWidgetPrivate
 {
     Q_DECLARE_PUBLIC( HbRatingSlider )
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/sliders/hbslidercontrol.cpp
--- a/src/hbwidgets/sliders/hbslidercontrol.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/sliders/hbslidercontrol.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -100,8 +100,10 @@
     handle = createHandle();
     if(handle) {
         HbStyle::setItemName( handle, "handle" );
-    } 
+    }
+#if defined( QT_KEYPAD_NAVIGATION ) && !defined( Q_OS_SYMBIAN )    
     q->setFocusPolicy( Qt::FocusPolicy( ( qApp->style( ) )->styleHint( QStyle::SH_Button_FocusPolicy ) ) );
+#endif
     groove = createGroove();
     if(groove) {
         HbStyle::setItemName( groove, "groove" );
@@ -120,7 +122,9 @@
     q->connect( hbInstance->theme( ), SIGNAL( changed( ) ), q, SLOT( updateTheme( ) ) );
     q->connect( q , SIGNAL( actionTriggered( int ) ), q , SLOT( showToolTip( ) ) );
     q->connect( q , SIGNAL( sliderReleased( ) ), q , SLOT( hideToolTip( ) ) );
+#if defined( QT_KEYPAD_NAVIGATION ) && !defined( Q_OS_SYMBIAN )
     q->setFlags( QGraphicsItem::ItemIsFocusable );
+#endif
 }
 
 
@@ -593,7 +597,7 @@
 {
     Q_D( HbSliderControl );
     if ( isSliderDown( ) && d->displayCurrValueToolTip ) {
-        HbToolTip::showText( toolTip( ) , d->handle , d->toolTipAlignment );
+        HbToolTip::showText( toolTip( ) , d->handle->primitive(HbStyle::P_SliderElement_touchhandle) , d->toolTipAlignment );
     }
 }
 
@@ -973,7 +977,6 @@
         }
     }
 
-  //  HbAbstractSliderControl::gestureEvent(event);
 }
 #endif
 
@@ -981,7 +984,7 @@
 bool HbSliderControl::sceneEventFilter(QGraphicsItem *obj,QEvent *event)
 {
     Q_D(HbSliderControl);
-    if( obj == d->grooveTouchArea) {
+    if( obj == d->grooveTouchArea  ) {
         if (!isEnabled() ) {
             return false;
         }
@@ -992,6 +995,12 @@
     }
     else if ( obj == d->handle) {
         event->ignore();
+	    if (event->type() == QEvent::Gesture){
+            QGestureEvent *gestureEvent = static_cast<QGestureEvent *> (event);
+            foreach(QGesture *g, gestureEvent->gestures()) {
+                gestureEvent->ignore(g);
+            }
+        }
     }
 	return false;
 }
@@ -1159,7 +1168,8 @@
             }
         } else {
             if (!d->userDefinedTooltipAlign) {
-                d->toolTipAlignment = ( Qt::AlignTop|Qt::AlignRight );
+                // Bug in tooltip, cannot align it with top right
+                d->toolTipAlignment = ( Qt::AlignTop|Qt::AlignHCenter );
             }
         }
         repolish( );
@@ -1338,7 +1348,6 @@
     Q_D( HbSliderControl );
     return d->trackHandlingEnable ;
 }
-
 /*!
  Gets the size of the handle
  */
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/sliders/hbsliderhandle.cpp
--- a/src/hbwidgets/sliders/hbsliderhandle.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/sliders/hbsliderhandle.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -40,6 +40,7 @@
 #ifdef HB_GESTURE_FW
 #include <hbtapgesture.h>
 #include <hbpangesture.h>
+#include <hbtapandholdgesture.h>
 #endif
 /*!
     This is internal class for HbSlider
@@ -63,6 +64,7 @@
     // create handle icon item
     gItem = slider->style()->createPrimitive(HbStyle::P_Slider_thumb, this); 
     HbStyle::setItemName(gItem , "icon");
+    setFiltersChildEvents(true) ;
 
     // create touch area for handle
     touchItem = slider->style()->createPrimitive(HbStyle::P_SliderElement_touchhandle, this); 
@@ -72,11 +74,12 @@
 #ifdef HB_GESTURE_FW    
     grabGesture(Qt::TapGesture);
     grabGesture(Qt::PanGesture);
+    grabGesture(Qt::TapAndHoldGesture);
     if(touchItem) {
         if(QGraphicsObject *touchArea = touchItem->toGraphicsObject()) {
-            Q_UNUSED(touchArea);
-               touchArea->grabGesture(Qt::PanGesture);
-               touchArea->grabGesture(Qt::TapGesture);
+            touchArea->grabGesture(Qt::PanGesture);
+            touchArea->grabGesture(Qt::TapGesture);
+            touchArea->grabGesture(Qt::TapAndHoldGesture);
         }
     }
 #endif 
@@ -96,6 +99,8 @@
 #endif
 }
 
+
+
 /*!
     Destroys the slider handle.
 */
@@ -162,7 +167,6 @@
         mHandleItem->removeSceneEventFilter(this);
         mHandleItem->installSceneEventFilter(this);
     }
-	mHandleItem->setFlag(QGraphicsItem::ItemIsMovable,true);//required as the press has to be accepted to filter move events.
 
 }
 
@@ -190,18 +194,27 @@
 {
     //TODO: touch area does not work with the current filtering mechanism. find better solution
 	if( obj == mHandleItem) {
-		if(event->type() == QEvent::GraphicsSceneMouseMove){
-			mouseMoveEvent ( (QGraphicsSceneMouseEvent *) event ) ;
-			return true;
-		}
-		else if (event->type() == QEvent::GraphicsSceneMousePress){
-			mousePressEvent((QGraphicsSceneMouseEvent *) event);
-		}
-		else if (event->type() == QEvent::GraphicsSceneMouseRelease){
-			mouseReleaseEvent((QGraphicsSceneMouseEvent *) event);
-		}
+        if(event->type() == QEvent::GraphicsSceneMouseMove){
+            mouseMoveEvent ((QGraphicsSceneMouseEvent *) event) ;
+            return true;
+        } else if (event->type() == QEvent::GraphicsSceneMousePress){
+            mousePressEvent((QGraphicsSceneMouseEvent *) event);
+            return true;
+        } else if (event->type() == QEvent::GraphicsSceneMouseRelease){
+            mouseReleaseEvent((QGraphicsSceneMouseEvent *) event);
+            return true;
+        }
 	} 
-	return false;
+    if( obj == touchItem ) {
+        if (!isEnabled() ) {
+            return false;
+        }
+	    if (event->type() == QEvent::Gesture){
+            gestureEvent( (QGestureEvent *) (event));
+            return true;
+        }
+    }
+    return false;
 }
  
 /*!
@@ -210,6 +223,7 @@
 */
 void HbSliderHandle::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
+#ifndef HB_GESTURE_FW
     qreal span = 0;
     HbWidget::mousePressEvent(event);
     QRectF sliderBounds=sliderControl->boundingRect();
@@ -239,6 +253,9 @@
         updatePrimitives();
     }
     event->accept();
+#else
+    Q_UNUSED(event)
+#endif 
 }
 
 /*!
@@ -247,6 +264,7 @@
 */
 void HbSliderHandle::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
+#ifndef HB_GESTURE_FW
     HbWidget::mouseReleaseEvent(event);
 #ifdef HB_EFFECTS
     if( sliderControl->orientation() == Qt::Horizontal ) {
@@ -270,6 +288,9 @@
         sliderControl->updateSliderPosToTick();
     }
     updatePrimitives();
+#else
+    Q_UNUSED(event)
+#endif 
 }
 
 /*!
@@ -278,6 +299,7 @@
 */
 void HbSliderHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
+#ifndef HB_GESTURE_FW
     qreal span = 0;
     HbWidget::mouseMoveEvent(event);
     QRectF sliderBounds=sliderControl->boundingRect();
@@ -312,6 +334,9 @@
         sliderPos, static_cast<int>(span),opt.upsideDown);
     sliderControl->setSliderPosition(pressValue);
     sliderControl->showToolTip();
+#else
+    Q_UNUSED(event)
+#endif 
 }
 
 /*!
@@ -319,8 +344,123 @@
 
 */
 void HbSliderHandle::gestureEvent(QGestureEvent *event)
-{  
-    Q_UNUSED(event);
+{ 
+    if(HbTapAndHoldGesture *tapandHold= qobject_cast<HbTapAndHoldGesture *>(event->gesture(Qt::TapAndHoldGesture))) {
+        if(tapandHold->state() == Qt::GestureStarted) {
+            sliderControl->showToolTip();
+        }
+    }
+    if(HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
+        switch(tap->state()) {
+        case Qt::GestureStarted: {
+            if (!sliderControl->isSliderDown( ) ) {
+                sliderControl->setSliderDown(true);
+                updatePrimitives();
+            }
+            HbWidgetFeedback::triggered(sliderControl, Hb::InstantPressed, Hb::ModifierSliderHandle);
+            if (scene()){
+                HbStyleOptionSlider opt;
+                sliderControl->initStyleOption(&opt);
+                if (sliderControl->orientation() == Qt::Horizontal) {
+#ifdef HB_EFFECTS
+                    HbEffect::start(gItem, HB_SLIDERHANDLE_TYPE, "h_thumbpress");
+#endif
+                } else {
+#ifdef HB_EFFECTS
+                    HbEffect::start(gItem, HB_SLIDERHANDLE_TYPE, "v_thumbpress");
+#endif
+                }
+                event->accept();
+            }
+        }
+        break;
+        case Qt::GestureFinished:
+         {
+#ifdef HB_EFFECTS
+            if( sliderControl->orientation() == Qt::Horizontal ) {
+                HbEffect::start(gItem, HB_SLIDERHANDLE_TYPE, "h_thumbrelease");
+            }  else {
+                HbEffect::start(gItem, HB_SLIDERHANDLE_TYPE, "v_thumbrelease");
+            }
+#endif
+            HbWidgetFeedback::triggered(sliderControl, Hb::InstantReleased, Hb::ModifierSliderHandle);
+            sliderControl->setSliderDown(false);
+            updatePrimitives();
+            break;
+        }
+        default:
+            break;
+                                  
+        }
+    }
+    if (HbPanGesture *panGesture = qobject_cast<HbPanGesture*>(event->gesture(Qt::PanGesture))) {
+        switch(panGesture->state( )) {
+        case Qt::GestureStarted: 
+        case Qt::GestureUpdated:{
+            QPointF eventScenePos =panGesture->sceneOffset( )+panGesture->sceneStartPos( );
+            QPointF relativePos = mapToParent( mapFromScene(eventScenePos ));
+            qreal span = 0;
+            QRectF sliderBounds=sliderControl->boundingRect();
+            QRectF handleBounds=boundingRect();
+            HbStyleOptionSlider opt;
+            sliderControl->initStyleOption(&opt);
+            int sliderPos;
+            if ( sliderControl->orientation() == Qt::Horizontal ) {
+#ifdef HB_EFFECTS
+                if( sliderBounds.topLeft().x() > relativePos.rx( ) ||
+                    sliderBounds.bottomRight().x() < relativePos.rx()) {
+                    HbEffect::start(gItem, HB_SLIDERHANDLE_TYPE, "h_outofbound");
+                }
+#endif
+                sliderBounds.adjust(0, 0, -handleBounds.width(), 0);
+                span = sliderBounds.width();
+                sliderPos = relativePos.rx();
+                sliderPos-=handleBounds.width()/2;
+            } else {
+#ifdef HB_EFFECTS
+                if( sliderBounds.topLeft().y() > relativePos.ry() ||
+                    sliderBounds.bottomRight().y() < relativePos.ry()) {
+                    HbEffect::start(gItem, HB_SLIDERHANDLE_TYPE, "v_outofbound");
+                }
+#endif
+                sliderBounds.adjust(0, 0, 0, -handleBounds.height());
+                span = sliderBounds.height();
+                sliderPos = relativePos.ry();
+                sliderPos -=  handleBounds.height() / 2;
+                    
+            }
+            int pressValue= QStyle::sliderValueFromPosition(opt.minimum, opt.maximum,
+                sliderPos, static_cast<int>(span),opt.upsideDown);
+            sliderControl->setSliderPosition(pressValue);
+            sliderControl->showToolTip();
+            break;
+        }
+        case Qt::GestureFinished:
+        case Qt::GestureCanceled: {
+#ifdef HB_EFFECTS
+            if( sliderControl->orientation() == Qt::Horizontal ) {
+                HbEffect::start(gItem, HB_SLIDERHANDLE_TYPE, "h_thumbrelease");
+            }  else {
+                HbEffect::start(gItem, HB_SLIDERHANDLE_TYPE, "v_thumbrelease");
+            }
+#endif
+            HbWidgetFeedback::triggered(sliderControl, Hb::InstantReleased, Hb::ModifierSliderHandle);
+            sliderControl->setSliderDown(false);
+            QRectF controlRect = sliderControl->sceneBoundingRect();
+            if(sliderControl->singleStep() != 0) {
+                HbWidgetFeedback::continuousStopped(sliderControl, Hb::ContinuousDragged);
+            }
+            if( sliderControl->snappingMode()!= HbSliderControl::NoSnapping ){
+                sliderControl->updateSliderPosToTick();
+            }
+            updatePrimitives();
+            break;
+            }
+            default:
+                break;
+        }
+    }
+
 }
 
 /*!
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/sliders/hbsliderhandle_p.h
--- a/src/hbwidgets/sliders/hbsliderhandle_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/sliders/hbsliderhandle_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -71,7 +71,6 @@
     virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
     virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
     virtual void gestureEvent(QGestureEvent *event);
-    //void updatePrimitive();
     //virtual void polish( HbStyleParameters& params );
 
 private:
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/sliders/hbslidertickmarkslabel.cpp
--- a/src/hbwidgets/sliders/hbslidertickmarkslabel.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/sliders/hbslidertickmarkslabel.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -297,7 +297,9 @@
     d->q_ptr = this;
     d->slider=dynamic_cast<HbSlider*>( parentItem() );
     d->createTickLabels();
+#if QT_VERSION >= 0x040600
     setFlag(QGraphicsItem::ItemSendsGeometryChanges,true);
+#endif
 }
 
 /*!
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hbcheckbox.cpp
--- a/src/hbwidgets/widgets/hbcheckbox.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbcheckbox.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -55,8 +55,9 @@
 HbCheckBoxSpacer::HbCheckBoxSpacer( QGraphicsItem *parent )
     : HbWidgetBase( parent )
 {
-    // seems to be 4.6 only?
-    //    setFlag( QGraphicsItem::ItemHasNoContents, true );
+#if QT_VERSION >= 0x040600
+    setFlag(QGraphicsItem::ItemHasNoContents, true);
+#endif
 }
 
 QSizeF HbCheckBoxSpacer::sizeHint( Qt::SizeHint which, const QSizeF &constraint ) const
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hbcombobox.cpp
--- a/src/hbwidgets/widgets/hbcombobox.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombobox.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -30,7 +30,9 @@
 #include <hbtoucharea.h>
 #include <hbtextitem.h>
 #include <hbstyleoptioncombobox_p.h>
+#include <hbnamespace_p.h>
 #include <QStandardItemModel>
+#include <QGraphicsScene>
 #include <QDebug>
 
 #include <hbtapgesture.h>
@@ -994,50 +996,53 @@
     }
 }
 
+bool HbComboBox::eventFilter( QObject *obj, QEvent *event )
+{
+    return HbWidget::eventFilter(obj,event);
+}
+
 /*!
     reimplementation. 
 */
-bool HbComboBox::eventFilter( QObject* obj, QEvent* event )
+void HbComboBox::gestureEvent(QGestureEvent *event)
 {
     Q_D( HbComboBox );
-    bool accepted = false;
-    if ( !isEnabled( ) ) {
-        return false ;
+
+    if (!isEnabled()) {
+        return;
     }
-    if( obj == static_cast<HbTouchArea*>( d->mButtonTouchAreaItem ) ) {
-        if( event->type( ) == QEvent::Gesture ) {
-            QGestureEvent *gestureEvent = static_cast<QGestureEvent *>( event );
-            if( gestureEvent->gesture( Qt::TapGesture ) ) {
-                HbTapGesture *tap =
-                    static_cast<HbTapGesture *>( gestureEvent->gesture( Qt::TapGesture ) );
-                switch( tap->state( ) ) {
-                case Qt::GestureStarted:
-                    {
-                        d->touchAreaPressEvent( );
-                        accepted = true;
-                        break;
-                    }
-                case Qt::GestureCanceled:
-                    {
-                        d->mIsDown = false;
-                        updatePrimitives( );
-                        accepted = true;
-                        break;
-                    }
-                case Qt::GestureFinished:
-                    {
-                        d->touchAreaReleaseEvent( );
-                        accepted = true;
-                        break;
-                        //TODO :: move else part here
-                    }
-                default:
-                    break;
+    if(event->gesture(Qt::TapGesture)) {
+        HbTapGesture *tap =
+                static_cast<HbTapGesture *>(event->gesture(Qt::TapGesture));
+        switch(tap->state()) {
+        case Qt::GestureStarted: {
+                scene()->setProperty(HbPrivate::OverridingGesture.latin1(),Qt::TapGesture);
+                if (!tap->property(HbPrivate::ThresholdRect.latin1()).toRect().isValid()) {
+                    tap->setProperty(HbPrivate::ThresholdRect.latin1(), mapRectToScene(boundingRect()).toRect());
                 }
+
+                d->touchAreaPressEvent();
+                break;
             }
+        case Qt::GestureCanceled: {
+                scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
+
+                d->mIsDown = false;
+                updatePrimitives();
+                setProperty( "state", "normal" );
+                break;
+            }
+        case Qt::GestureFinished: {
+                scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
+
+                d->touchAreaReleaseEvent();
+                break;
+                //TODO :: move else part here
+            }
+        default:
+            break;
         }
     }
-    return accepted;
 }
 
 /*!
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hbcombobox.h
--- a/src/hbwidgets/widgets/hbcombobox.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombobox.h	Tue Jul 06 14:36:53 2010 +0300
@@ -136,6 +136,7 @@
     void changeEvent( QEvent *event );
     bool eventFilter( QObject *obj, QEvent *event );
     QVariant itemChange ( GraphicsItemChange change, const QVariant & value );
+    void gestureEvent( QGestureEvent *event );
 
 private:
     Q_DECLARE_PRIVATE_D( d_ptr, HbComboBox )
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hbcombobox_p.cpp
--- a/src/hbwidgets/widgets/hbcombobox_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombobox_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -38,6 +38,8 @@
 #include <QSortFilterProxyModel>
 #include <QCompleter>
 #include <QItemSelectionModel>
+#include <QApplication>
+
 
 #ifdef HB_EFFECTS
 #include <hbeffect.h>
@@ -107,8 +109,6 @@
     HbStyle::setItemName( mButton, "combobox_button" );
 
     mButtonTouchAreaItem = q->style( )->createPrimitive( HbStyle::P_ComboBoxButton_toucharea, q );
-    static_cast<HbTouchArea*>( mButtonTouchAreaItem )->installEventFilter( q );
-    q->setHandlesChildEvents( true );
 
     static_cast<HbTouchArea*>( mButtonTouchAreaItem )->grabGesture( Qt::TapGesture );
 }
@@ -148,6 +148,10 @@
             mDropDown->mList->setModel( mModel );
             q->connect( mDropDown->mList, SIGNAL( activated( QModelIndex ) ), q,
                 SLOT( _q_textChanged( QModelIndex ) ) );
+            //send layout request so that geometries of list view item are updated
+            //and proper height is fetched in calculateListItemHeight
+            QEvent layoutEvent(QEvent::LayoutRequest);
+            QApplication::sendEvent(mDropDown->mList->contentWidget(), &layoutEvent);
         }
         if ( mCurrentIndex.isValid( ) ) {
             if( mDropDown->mList->model( ) != mModel ) {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hbcombobox_p.h
--- a/src/hbwidgets/widgets/hbcombobox_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombobox_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -137,6 +137,14 @@
         VkbLaunched( false ) {
     }
 
+    ~HbCustomLineEdit() {
+        HbEditorInterface editorInterface( this );
+        HbVkbHost *host = editorInterface.vkbHost( );
+        if( host ) {
+            host->disconnect();
+        }
+    }
+
     void setLongPressEnabled( bool enable = true ) {
         if( enable ) {
             scrollArea( )->setLongPressEnabled( true );
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hbcombodropdown_p.cpp
--- a/src/hbwidgets/widgets/hbcombodropdown_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombodropdown_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -25,22 +25,26 @@
 
 #include "hbcombodropdown_p.h"
 #include "hbcombobox_p.h"
+#include "hbwidget_p.h"
 #include <hblistview.h>
 #include <hbwidgetfeedback.h>
 
-#ifdef HB_GESTURE_FW
 #include <hbtapgesture.h>
 #include <hbpangesture.h>
-#endif
+#include <QGestureEvent>
 
+class HbComboDropDownPrivate : public HbWidgetPrivate
+{
+};
 HbComboDropDown::HbComboDropDown( HbComboBoxPrivate *comboBoxPrivate, QGraphicsItem *parent )
-    :HbWidget( parent ),
+    :HbWidget( *new HbComboDropDownPrivate(), parent ),
      mList( 0 ),
      comboPrivate( comboBoxPrivate ),
      vkbOpened( false ),
      backgroundPressed( false )
 {
-    setBackgroundItem( HbStyle::P_ComboBoxPopup_background );
+    Q_D(HbComboDropDown);
+    d->setBackgroundItem(HbStyle::P_ComboBoxPopup_background);
     #if QT_VERSION >= 0x040600
     //this is to keep the focus in the previous widget.
     setFlag( QGraphicsItem::ItemIsPanel, true );
@@ -100,10 +104,13 @@
             {
                 if( !this->isUnderMouse( ) ) {
                     //if its a pan gesture then don't accept the event so that list can be scrolled
-                    //even if mouse is outside drop down area
-                    if( QGestureEvent *gestureEvent = static_cast<QGestureEvent *>( event ) ) {
+                    //even if mouse is outside drop down area. Also tap might finish outside the
+                    //dropdown area
+                    if( QGestureEvent *gestureEvent = static_cast<QGestureEvent *>( event ) ) {                        
+                        HbTapGesture *tapGesture = qobject_cast<HbTapGesture *>(gestureEvent->gesture(Qt::TapGesture));
                         if( !qobject_cast<HbPanGesture *>( 
-                                gestureEvent->gesture( Qt::PanGesture ) ) ) {
+                                gestureEvent->gesture( Qt::PanGesture ) ) &&
+                            !(tapGesture && tapGesture->state() != Qt::GestureStarted)) {
                             accepted = true;
                         }
                     }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hbcombodropdown_p.h
--- a/src/hbwidgets/widgets/hbcombodropdown_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombodropdown_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -30,6 +30,7 @@
 
 class HbListView;
 class HbComboBoxPrivate;
+class HbComboDropDownPrivate;
 class  HbComboDropDown : public HbWidget
 {
     Q_OBJECT
@@ -46,6 +47,7 @@
 
 protected:
     bool eventFilter( QObject *obj, QEvent *event );
+    Q_DECLARE_PRIVATE_D(d_ptr, HbComboDropDown)
 
 public:
     bool vkbOpened;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hbdatetimepicker.cpp
--- a/src/hbwidgets/widgets/hbdatetimepicker.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbdatetimepicker.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -23,8 +23,8 @@
 **
 ****************************************************************************/
 
+#include "hbdatetimepicker.h"
 #include "hbdatetimepicker_p.h"
-#include "hbdatetimepicker.h"
 #include "hbstyleoption_p.h"
 
 /*!
@@ -215,7 +215,7 @@
             a minus sign is prepended in addition.</i></TD></TR>
     </TABLE>
 
-    NOTE:setDisplayFormat works only when the seperators are mentioned in the format like 'dd.mm.yy' or 'dd mm yy', this
+    NOTE:setDisplayFormat works only when the separators are mentioned in the format like 'dd.mm.yy' or 'dd mm yy', this
          will be fixed in the future versions.
 
     \param format is the display format, for datetime picker widget, in QString format.
@@ -678,23 +678,27 @@
 
     d->mIntervals[section] = interval;
 
-    if((section == QDateTimeEdit::MinuteSection) && (d->mMinuteModel)){
-
-        d->mMinuteModel->removeRows(0, d->mMinuteModel->rowCount());
-
-        int newStart = d->mMinimumDate.time().minute();
-        if(interval <= newStart && !d->isMinimumHour()){
-            int i = 0;
-            for(i = newStart; i > 0; i -= interval){
-
+    //trigger minute range change
+    int start=0,end=0;
+    if(d->mMinutePicker) {
+        start=d->mMinuteOffset;
+        end=start+d->mMinuteModel->rowCount()-1;
+        if(d->isMinimumHour() )  {
+            start = d->mMinimumDate.time().minute();
+        } else {               
+            if((d->mIntervals[QDateTimeEdit::MinuteSection]!=1) && (d->mIntervals[section]>0)) {
+                start = d->mMinimumDate.time().minute()%d->mIntervals[section];
+            } else {
+                start = 0;
             }
-
-            newStart = i;
-
+        }
+        if(d->isMaximumHour()) {
+            end = d->mMaximumDate.time().minute();
+        } else {
+            end = 59;
         }
 
-        d->resizeModel(d->mMinuteModel, newStart, d->isMaximumHour()?d->mMaximumDate.time().minute():59,
-            newStart, d->isMaximumHour()?d->mMaximumDate.time().minute():59,&HbDateTimePickerPrivate::localeMinute, d->mIntervals[section]);
+        d->setMinuteRange(start,end);
     }
 }
 
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hbdatetimepicker_p.cpp
--- a/src/hbwidgets/widgets/hbdatetimepicker_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbdatetimepicker_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -36,11 +36,12 @@
 #include <QModelIndex>
 #include <QDate>
 #include <QLocale>
-#include <QDebug>
-#include <QStringListModel>
 #include <QPointer>
 
-#define HBDATETIMEPICKER_DEBUG
+//#define HBDATETIMEPICKER_DEBUG
+#ifdef HBDATETIMEPICKER_DEBUG
+#include <QDebug>
+#endif
 
 //////////HbDateTimeParser - Implementaion may change in future.//////////////
 
@@ -346,6 +347,7 @@
     q->style()->setItemName(mContent,"content");
 
     mDateTimeMode = dateTimeMode;
+    mIntervals[QDateTimeEdit::MinuteSection]=1;
 
     //read the format from locale
     mFormat = localeDateTimeFormat(dateTimeMode);
@@ -446,21 +448,36 @@
 {                  
     Q_Q(HbDateTimePicker);
 
-    deleteAndNull(mYearPicker);
-    deleteAndNull(mMonthPicker);
-    deleteAndNull(mDayPicker);
-    deleteAndNull(mHourPicker);
-    deleteAndNull(mMinutePicker);
-    deleteAndNull(mSecondPicker);
-    deleteAndNull(mAmPmPicker);
-
-    deleteAndNull(mYearModel);
-    deleteAndNull(mDayModel);
-    deleteAndNull(mMonthModel);
-    deleteAndNull(mHourModel);
-    deleteAndNull(mMinuteModel);
-    deleteAndNull(mSecondModel);
-    deleteAndNull(mAmPmModel);
+    if(!(mParser.mDisplaySections & (HbDateTimeParser::YearSection|
+				     HbDateTimeParser::YearSection2Digits))) {
+      deleteAndNull(mYearPicker);
+      mYearModel = 0;
+    }
+    if(!(mParser.mDisplaySections & HbDateTimeParser::MonthSection)) {
+      deleteAndNull(mMonthPicker);
+      mMonthModel = 0;
+    }
+    if(!(mParser.mDisplaySections & HbDateTimeParser::DaySection)) {
+      deleteAndNull(mDayPicker);
+      mDayModel = 0;
+    }
+    if(!(mParser.mDisplaySections & (HbDateTimeParser::Hour12Section|
+				     HbDateTimeParser::Hour24Section))) {
+      deleteAndNull(mHourPicker);
+      mHourModel = 0;
+    }
+    if(!(mParser.mDisplaySections & HbDateTimeParser::MinuteSection)) {
+      deleteAndNull(mMinutePicker);
+      mMinuteModel = 0;
+    }
+    if(!(mParser.mDisplaySections & HbDateTimeParser::SecondSection)) {
+      deleteAndNull(mSecondPicker);
+      mSecondModel = 0;
+    }
+    if(!(mParser.mDisplaySections & HbDateTimeParser::AmPmSection)) {
+      deleteAndNull(mAmPmPicker);
+      mAmPmModel = 0;
+    }
 
     mYearOffset = -1;
     mMonthOffset = -1;
@@ -469,81 +486,83 @@
     mMinuteOffset = -1;
     mSecondOffset = -1;
 
-    QPointer<HbTumbleView> lastAdded;
+    while(mLayout->count()) {
+      mLayout->removeAt(0);
+    }
+
+    QPointer<VIEWER> lastAdded;
 
     for(int i=0;i<mParser.mSectionNodes.count();i++) {
         switch(mParser.mSectionNodes[i].type) {
             case HbDateTimeParser::AmPmSection:
-                mAmPmPicker = new HbTumbleView(q);
-                mAmPmModel = new QStringListModel(q);
-                mAmPmPicker->setModel(mAmPmModel);
-                mAmPmPicker->setLoopingEnabled(true);
+                if(!mAmPmPicker) {
+                    mAmPmPicker = new VIEWER(q);
+                    mAmPmModel = static_cast<QStringListModel*>(mAmPmPicker->model());
+                }
                 mLayout->addItem(mAmPmPicker);
-                mAmPmPicker->primitive("highlight")->hide();
-                mAmPmPicker->primitive("separator")->show();
                 lastAdded = mAmPmPicker;
                 break;
 
             case HbDateTimeParser::DaySection:
             case HbDateTimeParser::DayOfWeekSection:
-                mDayPicker = new HbTumbleView(q);
-                mDayModel = new QStringListModel(q);
-                mDayPicker->setModel(mDayModel);
-                mDayPicker->setLoopingEnabled(true);
+                if(!mDayPicker) {
+                    mDayPicker = new VIEWER(q);
+                    mDayModel = static_cast<QStringListModel*>(mDayPicker->model());
+                    mDayPicker->setLoopingEnabled(true);
+                }
                 mLayout->addItem(mDayPicker);
-                mDayPicker->primitive("separator")->show();
                 lastAdded = mDayPicker;
                 break;
 
             case HbDateTimeParser::MonthSection:
-                mMonthPicker = new HbTumbleView(q);
-                mMonthModel = new QStringListModel(q);
-                mMonthPicker->setModel(mMonthModel);
-                mMonthPicker->setLoopingEnabled(true);
+                if(!mMonthPicker) {
+                    mMonthPicker = new VIEWER(q);
+                    mMonthModel = static_cast<QStringListModel*>(mMonthPicker->model());
+                    mMonthPicker->setLoopingEnabled(true);
+                }
                 mLayout->addItem(mMonthPicker);
-                mMonthPicker->primitive("separator")->show();
                 lastAdded = mMonthPicker;
                 break;
 
             case HbDateTimeParser::YearSection:
             case HbDateTimeParser::YearSection2Digits:
-                mYearPicker = new HbTumbleView(q);
-                mYearModel = new QStringListModel(q);
-                mYearPicker->setModel(mYearModel);
-                mYearPicker->setLoopingEnabled(true);
+                if(!mYearPicker) {
+                    mYearPicker = new VIEWER(q);
+                    mYearModel = static_cast<QStringListModel*>(mYearPicker->model());
+                    mYearPicker->setLoopingEnabled(true);
+                }
                 mLayout->addItem(mYearPicker);
-                mYearPicker->primitive("separator")->show();
                 lastAdded = mYearPicker;
                 break;
 
             case HbDateTimeParser::SecondSection:
-                mSecondPicker = new HbTumbleView(q);
-                mSecondModel = new QStringListModel(q);
-                mSecondPicker->setModel(mSecondModel);
-                mSecondPicker->setLoopingEnabled(true);
+                if(!mSecondPicker) {
+                    mSecondPicker = new VIEWER(q);
+                    mSecondModel = static_cast<QStringListModel*>(mSecondPicker->model());
+                    mSecondPicker->setLoopingEnabled(true);
+                }
                 mLayout->addItem(mSecondPicker);
-                mSecondPicker->primitive("separator")->show();
                 lastAdded = mSecondPicker;
                 break;
 
             case HbDateTimeParser::MinuteSection:
-                mMinutePicker = new HbTumbleView(q);
-                mMinuteModel = new QStringListModel(q);
-                mMinutePicker->setModel(mMinuteModel);
-                mMinutePicker->setLoopingEnabled(true);
+                if(!mMinutePicker) {
+                    mMinutePicker = new VIEWER(q);
+                    mMinuteModel = static_cast<QStringListModel*>(mMinutePicker->model());
+                    mMinutePicker->setLoopingEnabled(true);
+                }
                 mLayout->addItem(mMinutePicker);
-                mMinutePicker->primitive("separator")->show();
                 lastAdded = mMinutePicker;
                 break;
 
             case HbDateTimeParser::Hour12Section:
             case HbDateTimeParser::Hour24Section:
-                mHourPicker = new HbTumbleView(q);
-                mHourModel = new QStringListModel(q);
-                mHourPicker->setModel(mHourModel);
-                mHourPicker->setLoopingEnabled(true);
+                if(!mHourPicker) {
+                    mHourPicker = new VIEWER(q);
+                    mHourModel = static_cast<QStringListModel*>(mHourPicker->model());
+                    mHourPicker->setLoopingEnabled(true);
+                }
                 mLayout->addItem(mHourPicker);
-                mHourPicker->primitive("separator")->show();
                 lastAdded = mHourPicker;
                 break;
 
@@ -632,6 +651,9 @@
 
 void HbDateTimePickerPrivate::setRanges() 
 {
+    //clear all data before inserting
+    if(mYearModel) mYearModel->removeRows(0,mYearModel->rowCount());    
+    //insert data
     if(mIsTwoDigitYearFormat) {
         mYearOffset = mMinimumDate.date().year()%100;
         setYearRange(mMinimumDate.date().year()%100,mMaximumDate.date().year()%100); 
@@ -640,21 +662,27 @@
         setYearRange(mMinimumDate.date().year(),mMaximumDate.date().year()); 
     }
 
+    if(mMonthModel) mMonthModel->removeRows(0,mMonthModel->rowCount());
     mMonthOffset = 1;
     setMonthRange(1,12);//default all months
 
+    if(mDayModel) mDayModel->removeRows(0,mDayModel->rowCount());
     mDayOffset = 1;
     setDayRange(1,31);//default all days
 
+    if(mHourModel) mHourModel->removeRows(0,mHourModel->rowCount());
     mHourOffset = 0;
     setHourRange(0,23);
 
+    if(mMinuteModel) mMinuteModel->removeRows(0,mMinuteModel->rowCount());
     mMinuteOffset = 0;
     setMinuteRange(0,59);
 
+    if(mSecondModel) mSecondModel->removeRows(0,mSecondModel->rowCount());
     mSecondOffset = 0;
     setSecondRange(0,59);
 
+    if(mAmPmModel) mAmPmModel->removeRows(0,mAmPmModel->rowCount());
     setAmPm();
 }
 
@@ -837,6 +865,9 @@
             else{
                 index = newDateTime.time().minute()-mMinuteOffset;
             }
+#ifdef HBDATETIMEPICKER_DEBUG
+    qDebug() << "setMinuteRange:selecting= " << index;
+#endif
             mMinutePicker->setSelected(index);
         }
 
@@ -1020,11 +1051,12 @@
     }
 #ifdef HBDATETIMEPICKER_DEBUG
     qDebug() << "setMinuteRange: " << start << " ," << end;
+    qDebug() << "setMinuteRange:interval=" << mIntervals[QDateTimeEdit::MinuteSection];
 #endif
     //calculate the index it should be after resize
     //the currentIndex gets reset after the resize and gets set to 0
     //to work around that issue this is added
-    int newIndex = mMinutePicker->selected()-(start-mMinuteOffset);
+    int newIndex = mMinuteModel->index(mMinutePicker->selected(),0).data().toInt();
     if(newIndex < 0) {
         newIndex = 0;
     }
@@ -1032,42 +1064,22 @@
         newIndex = end-start;
     }
 
-    //Store the value before resizing the model.
-    int value = mMinuteModel->index(mMinutePicker->selected()).data().toInt();
-
-    if(mIntervals[QDateTimeEdit::MinuteSection] > 1){ 
-        if((mIntervals[QDateTimeEdit::MinuteSection] <= mMinimumDate.time().minute()) &&
-            !isMinimumHour()){
-                int i = 0;
-                for(i = start; i > 0; i -= mIntervals[QDateTimeEdit::MinuteSection]){
-
-                }
-
-                start = i;
-        }
-        else{
-            start = mMinimumDate.time().minute();
-        }
-    }
-
-    resizeModel(mMinuteModel, mMinuteOffset,mMinuteModel->index(mMinuteModel->rowCount() - 1).data().toInt()/*mMinuteOffset+mMinuteModel->mMinuteModel->rowCount()-1*/,
-        start,end,
-        &HbDateTimePickerPrivate::localeMinute, mIntervals[QDateTimeEdit::MinuteSection]);
+    resizeModel(mMinuteModel, 
+		mMinuteOffset,mMinuteModel->index(mMinuteModel->rowCount() - 1).data().toInt(),
+		start,end,
+		&HbDateTimePickerPrivate::localeMinute, 
+		mIntervals[QDateTimeEdit::MinuteSection]);
     mMinuteOffset = start;
 
     //Select the nearest value when the range is set.
-    int index = newIndex;
-    if(mIntervals[QDateTimeEdit::MinuteSection] > 1){
-        for(int i = 0; i < mMinuteModel->rowCount(); i++){
+    int index = 0;
 
-            if(mMinuteModel->index(i,0).data().toInt() <= value){
-                index = i;
-            }
-            else{
-                break;
-            }
-        }
+    for(int i=start;i<newIndex;i+=mIntervals[QDateTimeEdit::MinuteSection]) {
+      index++;
     }
+#ifdef HBDATETIMEPICKER_DEBUG
+    qDebug() << "initMinute:selecting= " << index;
+#endif
     mMinutePicker->setSelected(index);
 
     mDateTime.setTime(QTime(mDateTime.time().hour(), localeMinute(mMinuteModel->index(index,0).data().toInt()).toInt(), mDateTime.time().second()));
@@ -1154,7 +1166,7 @@
     } 
 
     QString hourStr=mLocale.toString(QTime(hour,0,0),QString("%1:%2").arg(mHourFormat).arg("ap"));
-    QStringList hourAm=hourStr.split(":");
+    QStringList hourAm=hourStr.split(':');
     if(hourAm.count() > 1) {
         return hourAm.at(0);
     }
@@ -1189,170 +1201,154 @@
    to each of the models to resize them its the same logic. but to populate the
    data need the appropriate locale and format converted data. which is passed
    as a function pointer instead of creating seven different QStringListModel derived
-   model classes with one interface/virtual fuction specialization.
+   model classes with one interface/virtual function specialization.
 */
 void HbDateTimePickerPrivate::resizeModel(QStringListModel *model,
             int oldStart, int oldEnd,
             int newStart, int newEnd,
             QString (HbDateTimePickerPrivate::*localeFunc)(int), int interval)
 {
-    if((model->rowCount() == 0) && (newEnd-newStart>=0)) {
-        //initialize condition
-        int previous = newStart;
-        for(int i=0;i<=newEnd-newStart;i++) {
-            QString text;
-
-            if(interval > 1){
+    class ConnectionRemover {
+    public:
+        ConnectionRemover(HbDateTimePickerPrivate *priv){
+            this->priv = priv;
+            priv->removeConnections();
+        }
+        ~ConnectionRemover() {
+            priv->makeConnections();
+        }
+        HbDateTimePickerPrivate *priv;
+    }Obj(this);
 
-                if(previous <= newEnd){
-                    model->insertRow(i);
-                    text = (this->*localeFunc)(previous);
-                }
-                else{
-                    break;
+#ifdef HBDATETIMEPICKER_DEBUG
+            qDebug() << "resizeModel: oldStart=" << oldStart
+                     << " oldEnd=" << oldEnd << " newStart=" 
+                     << newStart << " newEnd=" << newEnd
+                     << " interval=" << interval;
+#endif
+	    bool b1=false,b2=false;
+            int oldinterval=model->rowCount()>1 ? (model->index(1,0).data().toInt(&b1)-model->index(0,0).data().toInt(&b2)):0; 
+#ifdef HBDATETIMEPICKER_DEBUG
+            qDebug() << "resizeModel:sameoldInterval=" << oldinterval;
+#endif
+            if(b1 && b2 && (oldinterval == interval) && (newStart == oldStart)) {
+                if(newEnd>oldEnd) {
+                    int rowCount=model->rowCount();
+#ifdef HBDATETIMEPICKER_DEBUG
+                    qDebug() << "resizeModel:sameinserting(" << rowCount << "," <<(newEnd-oldEnd)/interval << ")";
+#endif
+                    model->insertRows(rowCount,(newEnd-oldEnd)/interval);
+                    for(int i=0;i<((newEnd-oldEnd)/interval);++i) {
+                        QModelIndex index=model->index(i+rowCount,0);
+                        if(index.isValid()) {
+                            model->setData(index,(this->*localeFunc)(((i+1)*interval)+oldEnd));
+#ifdef HBDATETIMEPICKER_DEBUG
+                            qDebug() << "resizeModel:samesetData(" << ((i+1)*interval)+oldEnd << "," << (this->*localeFunc)((i+1)*interval+oldEnd) << ")";
+#endif
+                        }
+                    }
                 }
-
-                previous += interval;
-            }
-            else{
-                model->insertRow(i);
-                text = (this->*localeFunc)(i+newStart);
+                if(oldEnd>newEnd) {
+                    //if the start offset is preset more items can fit at end
+                    int stay=((newEnd-newStart)/interval)+1;
+                    int count=model->rowCount()-stay;
+#ifdef HBDATETIMEPICKER_DEBUG
+                    qDebug() << "resizeModel:removing(" <<model->rowCount()-count << "," << count << ")"
+                             << " data=" << model->index((model->rowCount()-count),0).data().toString();
+#endif
+                    model->removeRows((model->rowCount()-count),count);
+                }
+                return;//optimizing inserts when interval is set
+            } else {
+	        if(b1 && b2) {		
+		    model->removeRows(0,model->rowCount());
+                    oldStart = oldEnd = 0;
+	        }
             }
 
+        if((model->rowCount() == 0) && (newEnd-newStart>=0)) {
+#ifdef HBDATETIMEPICKER_DEBUG
+            qDebug() << "resizeModel:default addition inserting(0," << (newEnd-newStart+1)/interval << ")";
+#endif
+
+            model->insertRows(0,((newEnd-newStart)/interval)+1);
+            for(int i=0;i<=((newEnd-newStart)/interval);++i) {
+                QString text=(this->*localeFunc)((i*interval)+newStart);
 #ifdef HB_TEXT_MEASUREMENT_UTILITY
-            if ( localeFunc == &HbDateTimePickerPrivate::localeMonth &&
-                HbFeatureManager::instance()->featureStatus( HbFeatureManager::TextMeasurement ) ) {
+                if ( localeFunc == &HbDateTimePickerPrivate::localeMonth &&
+                        HbFeatureManager::instance()->featureStatus( HbFeatureManager::TextMeasurement ) ) {
                     text.append(QChar(LOC_TEST_START));
                     text.append("qtl_datetimepicker_popup_month_sec");
                     text.append(QChar(LOC_TEST_END));
-            }
+                }
 #endif
-            QModelIndex index=model->index(i,0);
-            if(index.isValid()) {
-                model->setData(index,text);//TODO:add a readable typedef
+                QModelIndex index=model->index(i,0);
+                if(index.isValid()) {
+                    model->setData(index,text);
+#ifdef HBDATETIMEPICKER_DEBUG
+                    qDebug() << "resizeModel:setData(" << i << "," << text << ")";
+#endif
+                }
             }
-
+            return;
         }
-        return;
-    }
-
-    if(newStart < oldStart) {
-        int previous = newStart;
-
-        for(int i=0;i<oldStart-newStart;++i) {
-            QString text;
-
-            if(interval > 1){
 
-                if(previous < oldStart){
-                    model->insertRow(i);
-                    text = (this->*localeFunc)(previous);
-                }
-                else{
-                    break;
+        if(newStart<oldStart) {
+#ifdef HBDATETIMEPICKER_DEBUG
+            qDebug() << "resizeModel:inserting(0," << (oldStart-newStart)/interval << ")";
+#endif
+            model->insertRows(0,(oldStart-newStart)/interval);
+            for(int i=0;i<((oldStart-newStart)/interval);++i) {
+                QModelIndex index=model->index(i,0);
+                if(index.isValid()) {
+                    model->setData(index,(this->*localeFunc)((i*interval)+newStart));
+#ifdef HBDATETIMEPICKER_DEBUG
+                    qDebug() << "resizeModel:setData(" << i << "," << (this->*localeFunc)((i*interval)+newStart) << ")";
+#endif
                 }
-
-                previous += interval;
-            }
-            else{
-                model->insertRow(i);
-                text = (this->*localeFunc)(i+newStart);
-            }
-
-            QModelIndex index=model->index(i,0);
-            if(index.isValid()) {
-                model->setData(index,text);
             }
         }
-    }
-    if(newEnd > oldEnd) {
 
-        int rowCount = model->rowCount(); 
-        int previous = oldEnd+interval;
-        for(int i=0;i<newEnd-oldEnd;++i) {
-            QString text;
-
-            if(interval > 1){
-
-                if(previous <= newEnd){
-                    model->insertRows(rowCount+i,1);
-                    text = (this->*localeFunc)(previous);
-                }
-                else{
-                    break;
+        if(newEnd>oldEnd) {
+            int rowCount=model->rowCount();
+#ifdef HBDATETIMEPICKER_DEBUG
+            qDebug() << "resizeModel:inserting(" << rowCount << "," <<(newEnd-oldEnd)/interval << ")";
+#endif
+            model->insertRows(rowCount,(newEnd-oldEnd)/interval);
+            for(int i=0;i<((newEnd-oldEnd)/interval);++i) {
+                QModelIndex index=model->index(i+rowCount,0);
+                if(index.isValid()) {
+                    model->setData(index,(this->*localeFunc)(((i+1)*interval)+oldEnd));
+#ifdef HBDATETIMEPICKER_DEBUG
+                    qDebug() << "resizeModel:setData(" << i << "," << (this->*localeFunc)((i+1)*interval+oldEnd) << ")";
+#endif
                 }
-
-                previous += interval;
-            }
-            else{
-                model->insertRows(rowCount+i,1);
-                text = (this->*localeFunc)(oldEnd+i+1);
-            }
-
-            QModelIndex index=model->index(rowCount+i,0);
-            if(index.isValid()) {
-                model->setData(index,text);
-            }
-        }
-    }
-
-    if(newStart > oldStart) {
-        if(interval > 1){
-            for(int i = oldStart; i < newStart; i += interval){
-                model->removeRows(0, 1);
             }
         }
-        else{
-            model->removeRows(0,newStart-oldStart);
-        }
-    }
-
-    if(oldEnd > newEnd) {
-        if(interval > 1){
-            for(int i = oldEnd; i > newEnd; i -= interval){
-                model->removeRows(model->rowCount()-1, 1);
-            }
-        }
-        else{
-            model->removeRows((model->rowCount()-(oldEnd-newEnd)),oldEnd-newEnd);
-        }
-    }
-
-    if(interval > 1){
-        //Check if there's any mismatch between actual rows in the model and the supposed rows.
-        int previous = newStart;
-        int actualRowCount = 0;
-        for(actualRowCount=0;actualRowCount<=newEnd-newStart;actualRowCount++) {
-            if(previous <= newEnd){
-            }
-            else{
-                break;
-            }
-
-            previous += interval;
+        if(newStart>oldStart) {
+#ifdef HBDATETIMEPICKER_DEBUG
+            qDebug() << "resizeModel:removing(0," << (newStart-oldStart)/interval << ")"
+                             << " data=" << model->index((newStart-oldStart)/interval,0).data().toString();
+#endif
+            model->removeRows(0,(newStart-oldStart)/interval);
         }
 
-        if(actualRowCount > model->rowCount()){
-            model->insertRows(model->rowCount(), actualRowCount - model->rowCount());
+        if(oldEnd>newEnd) {
+//#ifdef HBDATETIMEPICKER_DEBUG
+//            qDebug() << "resizeModel:removing(" <<model->rowCount()-((oldEnd-newEnd)/interval)<<"," << (oldEnd-newEnd)/interval << ")";
+//#endif
+//            model->removeRows((model->rowCount()-((oldEnd-newEnd)/interval)),(oldEnd-newEnd)/interval);
+                    //if the start offset is preset more items can fit at end
+                    int stay=((newEnd-newStart)/interval)+1;
+                    int count=model->rowCount()-stay;
+#ifdef HBDATETIMEPICKER_DEBUG
+                    qDebug() << "resizeModel:removing(" <<model->rowCount()-count << "," << count << ")"
+                             << " data=" << model->index((model->rowCount()-count),0).data().toString();
+#endif
+                    model->removeRows((model->rowCount()-count),count);
         }
-        else if( actualRowCount < model->rowCount()){
-            model->removeRows(model->rowCount()-1, model->rowCount() - actualRowCount);
-        }
+}  
 
-        //Populate the data in the model.
-        previous = newStart;
-        for(int i = 0; i < model->rowCount(); i++)
-        {
-            if(previous <= newEnd){
-                model->setData(model->index(i), (this->*localeFunc)(previous));
-            }
-            else{
-                break;
-            }
-            previous += interval;
-        }
-    }
-}
 
 void HbDateTimePickerPrivate::createPrimitives()
 {
@@ -1460,7 +1456,9 @@
 
 void HbDateTimePickerPrivate::_q_yearChanged(int index)
 {
+#ifdef HBDATETIMEPICKER_DEBUG
     qDebug() << "_q_yearChanged:" << index;
+#endif
     //Q_Q(HbDateTimePicker);
     QDate newDate(mDateTime.date());
     if(mIsTwoDigitYearFormat) {
@@ -1559,10 +1557,14 @@
     if(mMinutePicker) {
         start=mMinuteOffset;
         end=start+mMinuteModel->rowCount()-1;
-        if(isMinimumHour())  {
+        if(isMinimumHour() )  {
             start = mMinimumDate.time().minute();
-        } else {
-            start = 0;
+        } else {               
+            if(mIntervals[QDateTimeEdit::MinuteSection]!=1 && (mIntervals[QDateTimeEdit::MinuteSection]>0)) {
+                start = mMinimumDate.time().minute()%mIntervals[QDateTimeEdit::MinuteSection];
+            } else {
+                start = 0;
+            }
         }
         if(isMaximumHour()) {
             end = mMaximumDate.time().minute();
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hbdatetimepicker_p.h
--- a/src/hbwidgets/widgets/hbdatetimepicker_p.h	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbdatetimepicker_p.h	Tue Jul 06 14:36:53 2010 +0300
@@ -39,6 +39,8 @@
 #include <QList>
 #include <QHash>
 
+#define VIEWER HbTumbleView
+
 
 #define HBDATETIMEPICKER_TIME_MIN QTime(0, 0, 0, 0)
 #define HBDATETIMEPICKER_TIME_MAX QTime(23, 59, 59, 999)
@@ -164,7 +166,7 @@
         QString (HbDateTimePickerPrivate::*localeFuncPtr)(int), int interval = 1);
 
     void createPrimitives();
-    void deleteAndNull(HbTumbleView*& t) {
+    void deleteAndNull(VIEWER*& t) {
         delete t;t=0;
     }
     void deleteAndNull(QStringListModel*& t) {
@@ -181,13 +183,13 @@
     void _q_ampmChanged(int index);
 
 public:
-    HbTumbleView *mDayPicker;
-    HbTumbleView *mMonthPicker;
-    HbTumbleView *mYearPicker;
-    HbTumbleView *mHourPicker;
-    HbTumbleView *mMinutePicker;
-    HbTumbleView *mSecondPicker;
-    HbTumbleView *mAmPmPicker;
+    VIEWER *mDayPicker;
+    VIEWER *mMonthPicker;
+    VIEWER *mYearPicker;
+    VIEWER *mHourPicker;
+    VIEWER *mMinutePicker;
+    VIEWER *mSecondPicker;
+    VIEWER *mAmPmPicker;
 
     QStringListModel *mDayModel;
     QStringListModel *mMonthModel;
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hbgroupbox.cpp
--- a/src/hbwidgets/widgets/hbgroupbox.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbgroupbox.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -424,7 +424,7 @@
                 #ifdef HB_EFFECTS
                 HbEffect::start( d->mContentWidget, HB_GROUPBOX_TYPE, "collapse");  
                 #endif
-                HbStyle::setItemName( d->mContentWidget , "");
+                HbStyle::setItemName( d->mContentWidget , QString());
                 d->mContentWidget->setVisible(false);
             }
             else {
@@ -433,11 +433,11 @@
                 #endif
                 HbStyle::setItemName( d->mContentWidget , "contentwidget");
                 d->mContentWidget->setVisible(true);
+                repolish();
             }
             d->mHeadingWidget->updatePrimitives();
             emit toggled( d->collapsed );
         }
-        repolish();
     }    
 }
 
@@ -531,13 +531,8 @@
         d->mContentWidget->setContentWidget(widget);
         if(d->mHeadingWidget){
             d->setGroupBoxType(GroupBoxCollapsingContainer);
-        }else
+        }else{
             d->setGroupBoxType(GroupBoxRichLabel);
-
-        // collapsed property is set before setContentWidget
-        if ( d->mGroupBoxType == GroupBoxCollapsingContainer && d->collapsed ) {	
-            d->mContentWidget->setVisible(false);
-            HbStyle::setItemName( d->mContentWidget , "");
         }
         // update content widget primitve
         d->mContentWidget->updatePrimitives();
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hbgroupboxcontentwidget_p.cpp
--- a/src/hbwidgets/widgets/hbgroupboxcontentwidget_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbgroupboxcontentwidget_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -32,7 +32,8 @@
 #include <hbtapgesture.h>
 #include <hbtapandholdgesture.h>
 #include <QGesture>
-#endif 
+#include <QGraphicsScene>
+#endif
 
 /*
     internal
@@ -123,11 +124,13 @@
     if( groupBoxType != type ){
         groupBoxType = type;
         // set dynamic properties for type
-        if(groupBoxType == GroupBoxCollapsingContainer)
+        if(groupBoxType == GroupBoxCollapsingContainer){
             setProperty("groupBoxType",3);
-        else if(groupBoxType == GroupBoxRichLabel)
+        }
+        else if(groupBoxType == GroupBoxRichLabel){
+            contentPressed = false;
             setProperty("groupBoxType",2);
-
+        }
         if(groupBoxType != GroupBoxSimpleLabel){
            createPrimitives();
            //createConnection();
@@ -142,26 +145,15 @@
 */
 void HbGroupBoxContentWidget::setContentWidget( HbWidget *widget )
 {
-    if ( widget == mContent ) {
-        return;
-    }
-
-    // delete old content set
-    if ( mContent ) {
-        delete mContent; 
-        mContent = 0;
-    }
-     // if NULL widget is passed don't do anything
-    if ( !widget   ) {
-        return;
-    }
-
-    mContent = widget;
-    style()->setItemName( mContent , "content" );
-    mContent->setParentItem( this);
-
-    if(groupBoxType == GroupBoxRichLabel){
-        contentPressed = false;
+    if ( widget != mContent ) {      
+        // delete old content set
+        if ( mContent ) {
+            delete mContent; 
+            mContent = 0;
+        }
+        mContent = widget;
+        style()->setItemName( mContent , "content" );
+        mContent->setParentItem( this);
     }
 }
 
@@ -203,7 +195,8 @@
         case ItemChildRemovedChange:
             repolish();
              break;
-        case ItemSceneHasChanged:		
+        case ItemSceneHasChanged:
+        case ItemVisibleChange:
             updatePrimitives();
             break;
         default:
@@ -276,10 +269,17 @@
     if(HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
         switch(tap->state()) {
         case Qt::GestureStarted:  //
+            scene()->setProperty(HbPrivate::OverridingGesture.latin1(),Qt::TapGesture);
+            if (!tap->property(HbPrivate::ThresholdRect.latin1()).toRect().isValid()) {
+                tap->setProperty(HbPrivate::ThresholdRect.latin1(), mapRectToScene(boundingRect()).toRect());
+            }
+
             contentPressed=true;
             updatePrimitives();
             break;
         case Qt::GestureCanceled: // Reset state
+            scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
+
             contentPressed=false;
             updatePrimitives();
             break;
@@ -289,6 +289,7 @@
             }
             break;
         case Qt::GestureFinished: // emit clicked
+            scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
             contentPressed=false;
             updatePrimitives();
             if(tap->tapStyleHint() == HbTapGesture::Tap) {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hbgroupboxheadingwidget_p.cpp
--- a/src/hbwidgets/widgets/hbgroupboxheadingwidget_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbgroupboxheadingwidget_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -35,7 +35,9 @@
 #endif
 #ifdef HB_GESTURE_FW
 #include <hbtapgesture.h>
+#include <hbnamespace_p.h>
 #include <QGesture>
+#include <QGraphicsScene>
 #endif 
 
 #include <QGraphicsSceneMouseEvent>
@@ -79,9 +81,6 @@
 void HbGroupBoxHeadingWidget::init( )
 {
     createPrimitives( );
-    if ( groupBoxType == GroupBoxCollapsingContainer ){
-        createConnection( );    
-    }
 #ifdef HB_GESTURE_FW
     grabGesture( Qt::TapGesture );
 #endif 
@@ -197,18 +196,17 @@
 */
 void HbGroupBoxHeadingWidget::setHeading( const QString &text )
 {
-    if( headingText == text ) 
-        return;
-
-    headingText = text;
+    if( headingText != text ){
+        headingText = text;
 
-    HbStyleOptionGroupBox groupBoxOption;
-    initStyleOption( &groupBoxOption );
-    if ( groupBoxType == GroupBoxCollapsingContainer ) {
-        style( )->updatePrimitive( mTextItem , HbStyle::P_GroupBoxHeading_text , &groupBoxOption );
-    }
-    else {
-       style( )->updatePrimitive( mTextItem , HbStyle::P_GroupBoxMarquee_text , &groupBoxOption );
+        HbStyleOptionGroupBox groupBoxOption;
+        initStyleOption( &groupBoxOption );
+        if ( groupBoxType == GroupBoxCollapsingContainer ) {
+            style( )->updatePrimitive( mTextItem , HbStyle::P_GroupBoxHeading_text , &groupBoxOption );
+        }
+        else {
+           style( )->updatePrimitive( mTextItem , HbStyle::P_GroupBoxMarquee_text , &groupBoxOption );
+        }
     }
 }
 
@@ -218,14 +216,13 @@
 */
 void HbGroupBoxHeadingWidget::setMarqueeHeading( bool marquee )
 {
-    if( marqueeEnabled == marquee )
-        return;
+    if( marqueeEnabled != marquee ){
+        marqueeEnabled  = marquee;
 
-    marqueeEnabled  = marquee;
-
-    HbStyleOptionGroupBox groupBoxOption;
-    initStyleOption( &groupBoxOption );
-    style()->updatePrimitive( mTextItem, HbStyle::P_GroupBoxMarquee_text, &groupBoxOption);
+        HbStyleOptionGroupBox groupBoxOption;
+        initStyleOption( &groupBoxOption );
+        style()->updatePrimitive( mTextItem, HbStyle::P_GroupBoxMarquee_text, &groupBoxOption);
+    }
 }
 
 /*!
@@ -282,25 +279,10 @@
 QVariant HbGroupBoxHeadingWidget::itemChange( GraphicsItemChange change, const QVariant &value )
 {
     switch ( change ) {
-        case ItemVisibleHasChanged: {
-            /*if (value.toBool() == true){
-                if (mTextItem) {
-                    HbStyleOptionGroupBox groupBoxOption;
-                    initStyleOption(&groupBoxOption);
-                    style()->updatePrimitive( mTextItem, HbStyle::P_GroupBoxHeading_text, &groupBoxOption);
-                }
-            }*/
-            }
+        case ItemVisibleChange: 
+        case ItemSceneHasChanged: 
+            updatePrimitives();
             break;
-
-        case ItemSceneHasChanged: {
-            if(!value.isNull())
-
-
-            updatePrimitives();
-            }
-            break;
-
         case ItemChildAddedChange:
         case ItemChildRemovedChange:
             repolish();
@@ -387,6 +369,11 @@
         switch( tap->state() ) {
         case Qt::GestureStarted:  //
             {
+                scene()->setProperty(HbPrivate::OverridingGesture.latin1(),Qt::TapGesture);
+                if (!tap->property(HbPrivate::ThresholdRect.latin1()).toRect().isValid()) {
+                    tap->setProperty(HbPrivate::ThresholdRect.latin1(), mapRectToScene(boundingRect()).toRect());
+                }
+
                 if ( !(groupBox->isCollapsable( )) ){
                     event->ignore( tap );
                     return;
@@ -411,6 +398,8 @@
             break;
         case Qt::GestureCanceled: // Reset state
             {
+                scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
+
                 headingPressed = false;
 
                 HbStyleOptionGroupBox groupBoxOption;
@@ -422,6 +411,8 @@
             }
         case Qt::GestureFinished: // emit clicked
             {
+                scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
+
                 if ( groupBox->isCollapsable( ) ) {
                     HbWidgetFeedback::triggered( this, Hb::InstantReleased, Hb::ModifierCollapsedItem );
                 } else {
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hblabel.cpp
--- a/src/hbwidgets/widgets/hblabel.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hblabel.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -160,7 +160,7 @@
         if (mActivePrimitive != primitiveId) {
             mActivePrimitive = primitiveId;
             createPrimitives();
-            q->repolish(); // reconecting new primitive to HbMeshLayout so it is really needed!
+            q->repolish(); // reconecting new primitive to HbAnchorLayout so it is really needed!
         }
         q->updatePrimitives();
     }
@@ -185,7 +185,7 @@
         if (mActivePrimitive != HbStyle::P_Label_icon) {
             mActivePrimitive = HbStyle::P_Label_icon;
             createPrimitives();
-            q->repolish(); // reconecting new primitive to HbMeshLayout so it is really needed!
+            q->repolish(); // reconecting new primitive to HbAnchorLayout so it is really needed!
         }
         q->updatePrimitives();
     }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hbpushbutton.cpp
--- a/src/hbwidgets/widgets/hbpushbutton.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbpushbutton.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -417,6 +417,9 @@
             HbStyleOptionPushButton buttonOption;
             initStyleOption( &buttonOption );
             style( )->updatePrimitive( d->additionalTextItem, HbStyle::P_PushButton_additionaltext, &buttonOption);
+            if ( isEnabled() ) {
+                setProperty("state", "normal");
+            }
         }
         if( doPolish ) {
             repolish();
@@ -449,7 +452,8 @@
     Q_D(HbPushButton);
 
     if ( d->icon != icon ) {
-        bool doPolish = icon.isNull( ) || d->icon.isNull();
+        //checking for d->polished to avoid extra polish loop
+        bool doPolish = (icon.isNull( ) || d->icon.isNull()) && d->polished;
         d->icon = icon;
         d->createPrimitives( );
         //updatePrimitives();
@@ -463,13 +467,7 @@
 
         }
         if( doPolish ) {
-            //Instead of posting an event we are directly sending polish and layout request
-            //event because during runtime if icon is set for the first time some
-            //flickering was coming. That was coming because icon was getting painted
-            //before polish.
-            QEvent* polishEvent = new QEvent( QEvent::Polish );
-            QCoreApplication::sendEvent(this, polishEvent);
-            QApplication::sendPostedEvents(this, QEvent::LayoutRequest);
+            repolish();
         }
     }
 }
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hbsearchpanel_p.cpp
--- a/src/hbwidgets/widgets/hbsearchpanel_p.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbsearchpanel_p.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -65,7 +65,6 @@
     constructUi();
 
     //set default values
-    q->setAttribute(Hb::InputMethodNeutral);
     q->setFlag(QGraphicsItem::ItemIsFocusable);
 
     // connect initial state signals
diff -r c3690ec91ef8 -r 923ff622b8b9 src/hbwidgets/widgets/hbtransparentwindow.cpp
--- a/src/hbwidgets/widgets/hbtransparentwindow.cpp	Wed Jun 23 18:33:25 2010 +0300
+++ b/src/hbwidgets/widgets/hbtransparentwindow.cpp	Tue Jul 06 14:36:53 2010 +0300
@@ -60,7 +60,7 @@
 HbTransparentWindow::HbTransparentWindow(QGraphicsItem *parent) :
     HbWidget(parent)
 {
-    setFlag(QGraphicsItem::ItemHasNoContents, false);	
+    setFlag(QGraphicsItem::ItemUsesExtendedStyleOption, true);
 }